Skip to content

Commit 5c47663

Browse files
AriesHoo@126.comAriesHoo@126.com
AriesHoo@126.com
authored and
AriesHoo@126.com
committed
将部分三方库使用compileOnly方式引入由开发者决定是否使用相关功能减小包大小
1 parent 3904080 commit 5c47663

24 files changed

+183
-202
lines changed

‎app/build.gradle

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ android {
1515
buildConfigField "String", "BASE_URL", "\"https://api.douban.com/\""
1616
buildConfigField "String", "BASE__UPDATE_URL", "\"https://raw.githubusercontent.com/AriesHoo/FastLib/dev/apk/\""
1717
manifestPlaceholders = [
18-
app_channel : "FastLib",
19-
bugly_id : "a66ee7eb32",
20-
PGYER_ID : "b88a08387635b27ea95dcf2d6b887a33"
18+
app_channel: "FastLib",
19+
bugly_id : "a66ee7eb32",
20+
PGYER_ID : "b88a08387635b27ea95dcf2d6b887a33"
2121
]
2222
}
2323

@@ -86,12 +86,14 @@ dependencies {
8686
implementation 'com.google.android.material:material:'.concat(supportVersion)
8787
implementation 'androidx.appcompat:appcompat:'.concat(supportVersion)
8888
implementation 'androidx.recyclerview:recyclerview:'.concat(supportVersion)
89+
//快速Tab库-继承FastMainActivity使用
90+
implementation "com.github.AriesHoo.UIWidget:tab-layout:$rootProject.widgetVersion"
8991
//万能适配器--一般都需要吧
9092
implementation 'com.github.CymChad:BaseRecyclerViewAdapterHelper:2.9.49-androidx'
9193
//webView库 继承FastWebActivity需要,不需要内置WebView可以不implementation
9294
implementation 'com.just.agentweb:agentweb:4.1.2'
9395
//webView提供下载功能
94-
implementation'com.download.library:Downloader:4.1.2'
96+
implementation 'com.download.library:Downloader:4.1.2'
9597
//下拉刷新库注意刷新头SmartRefreshHeader版本最好对应尤其头版本不要低于SmartRefreshLayout版本
9698
implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0-andx-14'
9799
//Glide图片加载
@@ -110,14 +112,13 @@ dependencies {
110112
//Bugly
111113
implementation 'com.tencent.bugly:crashreport:2.8.6.0'
112114
//哆啦A梦
113-
implementation 'com.didichuxing.doraemonkit:doraemonkit:1.2.0'
114-
// debugImplementation 'com.didichuxing.doraemonkit:doraemonkit:1.2.0'
115-
// releaseImplementation 'com.didichuxing.doraemonkit:doraemonkit-no-op:1.2.0'
115+
implementation 'com.didichuxing.doraemonkit:doraemonkit:1.2.1'
116+
// debugImplementation 'com.didichuxing.doraemonkit:doraemonkit:1.2.1'
117+
// releaseImplementation 'com.didichuxing.doraemonkit:doraemonkit-no-op:1.2.1'
116118
//Multidex 5.0以下
117119
implementation 'androidx.multidex:multidex:2.0.0'
118120
//蒲公英
119121
implementation 'com.pgyersdk:sdk:3.0.5'
120-
//
121-
// //保活组件
122+
//保活组件
122123
// implementation 'com.fanjun:keeplive:1.1.18'
123124
}

‎app/src/main/AndroidManifest.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
android:icon="@drawable/ic_launcher"
2424
android:label="@string/app_name"
2525
android:supportsRtl="true"
26-
2726
android:theme="@style/AppTheme">
2827
<!-- 配置APP渠道号 -->
2928
<meta-data

‎app/src/main/java/com/aries/library/fast/demo/App.java

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
import com.aries.library.fast.demo.impl.ActivityControlImpl;
1919
import com.aries.library.fast.demo.impl.AppImpl;
2020
import com.aries.library.fast.demo.impl.HttpRequestControlImpl;
21-
import com.aries.library.fast.demo.impl.SwipeBackControlImpl;
2221
import com.aries.library.fast.demo.module.WebViewActivity;
2322
import com.aries.library.fast.demo.module.main.MainActivity;
2423
import com.aries.library.fast.demo.util.NotificationUtil;
@@ -85,7 +84,7 @@ public void onCreate() {
8584
//设置全局TitleBarView相关配置
8685
.setTitleBarViewControl(impl)
8786
//设置Activity滑动返回控制-默认开启滑动返回功能不需要设置透明主题
88-
.setSwipeBackControl(new SwipeBackControlImpl())
87+
// .setSwipeBackControl(new SwipeBackControlImpl())
8988
//设置Activity/Fragment相关配置(横竖屏+背景+虚拟导航栏+状态栏+生命周期)
9089
.setActivityFragmentControl(activityControl)
9190
//设置BasisActivity 子类按键监听
@@ -125,10 +124,10 @@ public void onCreate() {
125124

126125
//方式二 通过 Service 里添加特定header设置
127126
//step1
128-
FastRetrofit.getInstance()
129-
//设置Header模式优先-默认Method方式优先
130-
.setHeaderPriorityEnable(true)
131-
.putHeaderBaseUrl(ApiConstant.API_UPDATE_APP_KEY, BuildConfig.BASE__UPDATE_URL);
127+
// FastRetrofit.getInstance()
128+
// //设置Header模式优先-默认Method方式优先
129+
// .setHeaderPriorityEnable(true)
130+
// .putHeaderBaseUrl(ApiConstant.API_UPDATE_APP_KEY, BuildConfig.BASE__UPDATE_URL);
132131
//step2
133132
// 需要step1中baseUrl的方法需要在对应service里增加
134133
// @Headers({FastRetrofit.BASE_URL_NAME_HEADER + ApiConstant.API_UPDATE_APP_KEY})

‎app/src/main/java/com/aries/library/fast/demo/base/BaseHelper.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44

55
import com.aries.ui.util.ResourceUtil;
66

7-
import org.simple.eventbus.EventBus;
8-
97
import butterknife.Unbinder;
108

119
/**
@@ -28,7 +26,7 @@ public BaseHelper(Activity context) {
2826
* Activity 关闭onDestroy调用
2927
*/
3028
public void onDestroy() {
31-
EventBus.getDefault().unregister(this);
29+
// EventBus.getDefault().unregister(this);
3230
if (mUnBinder != null) {
3331
mUnBinder.unbind();
3432
mUnBinder = null;

‎app/src/main/java/com/aries/library/fast/demo/impl/ActivityControlImpl.java

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ public boolean setStatusBar(Activity activity, StatusViewHelper helper, View top
189189
helper.setTransEnable(isSupportStatusBarFont || isLeak(activity))
190190
.setPlusStatusViewEnable(!isLeak(activity))
191191
.setStatusBarLightMode(isSupportStatusBarFont)
192-
.setStatusViewColor(Color.argb(isSupportStatusBarFont?0:102,0,0,0))
192+
.setStatusViewColor(Color.argb(isSupportStatusBarFont ? 0 : 102, 0, 0, 0))
193193
.setStatusLayoutColor(Color.WHITE);
194194
setStatusBarActivity(activity);
195195
return true;
@@ -286,16 +286,6 @@ public void setActivityOrientation(Activity activity) {
286286
@Override
287287
public Application.ActivityLifecycleCallbacks getActivityLifecycleCallbacks() {
288288
return new FastActivityLifecycleCallbacks() {
289-
290-
// @Override
291-
// public void onActivityStarted(Activity activity) {
292-
// super.onActivityStarted(activity);
293-
// if (activity instanceof SplashActivity || activity instanceof IFastTitleView) {
294-
// return;
295-
// }
296-
// StatusBarUtil.setStatusBarLightMode(activity);
297-
// }
298-
299289
@Override
300290
public void onActivityCreated(Activity activity, Bundle savedInstanceState) {
301291
super.onActivityCreated(activity, savedInstanceState);
@@ -341,7 +331,7 @@ public void onActivityPaused(Activity activity) {
341331
public void onActivityStopped(Activity activity) {
342332
//统一于滑动返回动画
343333
if (activity.isFinishing()) {
344-
activity.overridePendingTransition(0, R.anim.bga_sbl_activity_swipeback_exit);
334+
// activity.overridePendingTransition(0, R.anim.bga_sbl_activity_swipeback_exit);
345335
}
346336
}
347337
};

‎app/src/main/java/com/aries/library/fast/demo/impl/SwipeBackControlImpl.java

Lines changed: 0 additions & 65 deletions
This file was deleted.

‎app/src/main/java/com/aries/library/fast/demo/module/SplashActivity.java

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
import android.view.WindowManager;
77
import android.widget.TextView;
88

9+
import androidx.core.content.ContextCompat;
10+
911
import com.aries.library.fast.demo.R;
1012
import com.aries.library.fast.demo.module.main.MainActivity;
1113
import com.aries.library.fast.manager.LoggerManager;
@@ -19,7 +21,6 @@
1921
import com.aries.ui.view.title.TitleBarView;
2022
import com.trello.rxlifecycle3.android.ActivityEvent;
2123

22-
import androidx.core.content.ContextCompat;
2324
import butterknife.BindView;
2425

2526
/**
@@ -78,11 +79,6 @@ public void initView(Bundle savedInstanceState) {
7879
.subscribe(new FastObserver<Long>() {
7980
@Override
8081
public void _onNext(Long entity) {
81-
}
82-
83-
@Override
84-
public void onComplete() {
85-
super.onComplete();
8682
FastUtil.startActivity(mContext, MainActivity.class);
8783
finish();
8884
}

‎app/src/main/java/com/aries/library/fast/demo/module/activity/ActivityFragment.java

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,11 @@
66
import android.view.ViewGroup;
77
import android.widget.LinearLayout;
88

9+
import androidx.fragment.app.Fragment;
10+
import androidx.viewpager.widget.ViewPager;
11+
912
import com.aries.library.fast.demo.R;
1013
import com.aries.library.fast.demo.constant.ApiConstant;
11-
import com.aries.library.fast.demo.constant.EventConstant;
1214
import com.aries.library.fast.demo.constant.SPConstant;
1315
import com.aries.library.fast.manager.LoggerManager;
1416
import com.aries.library.fast.manager.TabLayoutManager;
@@ -19,15 +21,10 @@
1921
import com.aries.ui.view.tab.SlidingTabLayout;
2022
import com.aries.ui.view.title.TitleBarView;
2123

22-
import org.simple.eventbus.Subscriber;
23-
import org.simple.eventbus.ThreadMode;
24-
2524
import java.util.ArrayList;
2625
import java.util.Arrays;
2726
import java.util.List;
2827

29-
import androidx.fragment.app.Fragment;
30-
import androidx.viewpager.widget.ViewPager;
3128
import butterknife.BindView;
3229

3330
/**
@@ -155,11 +152,11 @@ protected void onVisibleChanged(boolean isVisibleToUser) {
155152
}
156153
}
157154

158-
@Subscriber(mode = ThreadMode.MAIN, tag = EventConstant.EVENT_KEY_REFRESH_ACTIVITY_TAB)
159-
public void refreshActivityTab(boolean isSliding) {
160-
mIsFirstShow = true;
161-
setTitleBar(mTitleBar);
162-
setTab();
163-
}
155+
// @Subscriber(mode = ThreadMode.MAIN, tag = EventConstant.EVENT_KEY_REFRESH_ACTIVITY_TAB)
156+
// public void refreshActivityTab(boolean isSliding) {
157+
// mIsFirstShow = true;
158+
// setTitleBar(mTitleBar);
159+
// setTab();
160+
// }
164161

165162
}

‎app/src/main/java/com/aries/library/fast/demo/module/activity/MovieBaseFragment.java

Lines changed: 23 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,20 @@
11
package com.aries.library.fast.demo.module.activity;
22

3-
import android.annotation.SuppressLint;
43
import android.os.Bundle;
54
import android.view.View;
65

6+
import androidx.annotation.NonNull;
7+
import androidx.recyclerview.widget.ItemTouchHelper;
8+
import androidx.recyclerview.widget.LinearLayoutManager;
9+
import androidx.recyclerview.widget.RecyclerView;
10+
711
import com.aries.library.fast.FastManager;
812
import com.aries.library.fast.demo.R;
913
import com.aries.library.fast.demo.adapter.SubjectMovieAdapter;
1014
import com.aries.library.fast.demo.base.BaseItemTouchQuickAdapter;
1115
import com.aries.library.fast.demo.base.BaseMovieEntity;
1216
import com.aries.library.fast.demo.constant.ApiConstant;
13-
import com.aries.library.fast.demo.constant.EventConstant;
1417
import com.aries.library.fast.demo.constant.GlobalConstant;
15-
import com.aries.library.fast.demo.constant.SPConstant;
1618
import com.aries.library.fast.demo.entity.SubjectsEntity;
1719
import com.aries.library.fast.demo.module.WebViewActivity;
1820
import com.aries.library.fast.demo.retrofit.repository.ApiRepository;
@@ -21,21 +23,13 @@
2123
import com.aries.library.fast.manager.LoggerManager;
2224
import com.aries.library.fast.module.fragment.FastRefreshLoadFragment;
2325
import com.aries.library.fast.retrofit.FastObserver;
24-
import com.aries.library.fast.util.SPUtil;
2526
import com.aries.library.fast.util.ToastUtil;
2627
import com.chad.library.adapter.base.BaseQuickAdapter;
2728
import com.chad.library.adapter.base.BaseViewHolder;
2829
import com.trello.rxlifecycle3.android.FragmentEvent;
2930

30-
import org.simple.eventbus.Subscriber;
31-
import org.simple.eventbus.ThreadMode;
32-
3331
import java.util.ArrayList;
3432

35-
import androidx.annotation.NonNull;
36-
import androidx.recyclerview.widget.ItemTouchHelper;
37-
import androidx.recyclerview.widget.LinearLayoutManager;
38-
import androidx.recyclerview.widget.RecyclerView;
3933
import me.bakumon.statuslayoutmanager.library.StatusLayoutManager;
4034

4135
/**
@@ -68,8 +62,8 @@ public void beforeSetContentView() {
6862
@Override
6963
public BaseQuickAdapter<SubjectsEntity, BaseViewHolder> getAdapter() {
7064
mAdapter = new SubjectMovieAdapter(ApiConstant.API_MOVIE_TOP.equals(mUrl));
71-
changeAdapterAnimation(0);
72-
changeAdapterAnimationAlways(true);
65+
// changeAdapterAnimation(0);
66+
// changeAdapterAnimationAlways(true);
7367
return mAdapter;
7468
}
7569

@@ -181,20 +175,20 @@ public void setMultiStatusView(StatusLayoutManager.Builder statusView) {
181175
// };
182176
// }
183177

184-
@SuppressLint("WrongConstant")
185-
@Subscriber(mode = ThreadMode.MAIN, tag = EventConstant.EVENT_KEY_CHANGE_ADAPTER_ANIMATION)
186-
public void changeAdapterAnimation(int index) {
187-
if (mAdapter != null) {
188-
animationIndex = (int) SPUtil.get(mContext, SPConstant.SP_KEY_ACTIVITY_ANIMATION_INDEX, animationIndex - 1) + 1;
189-
mAdapter.openLoadAnimation(animationIndex);
190-
}
191-
}
192-
193-
@Subscriber(mode = ThreadMode.MAIN, tag = EventConstant.EVENT_KEY_CHANGE_ADAPTER_ANIMATION_ALWAYS)
194-
public void changeAdapterAnimationAlways(boolean always) {
195-
if (mAdapter != null) {
196-
animationAlways = (Boolean) SPUtil.get(mContext, SPConstant.SP_KEY_ACTIVITY_ANIMATION_ALWAYS, true);
197-
mAdapter.isFirstOnly(!animationAlways);
198-
}
199-
}
178+
// @SuppressLint("WrongConstant")
179+
// @Subscriber(mode = ThreadMode.MAIN, tag = EventConstant.EVENT_KEY_CHANGE_ADAPTER_ANIMATION)
180+
// public void changeAdapterAnimation(int index) {
181+
// if (mAdapter != null) {
182+
// animationIndex = (int) SPUtil.get(mContext, SPConstant.SP_KEY_ACTIVITY_ANIMATION_INDEX, animationIndex - 1) + 1;
183+
// mAdapter.openLoadAnimation(animationIndex);
184+
// }
185+
// }
186+
//
187+
// @Subscriber(mode = ThreadMode.MAIN, tag = EventConstant.EVENT_KEY_CHANGE_ADAPTER_ANIMATION_ALWAYS)
188+
// public void changeAdapterAnimationAlways(boolean always) {
189+
// if (mAdapter != null) {
190+
// animationAlways = (Boolean) SPUtil.get(mContext, SPConstant.SP_KEY_ACTIVITY_ANIMATION_ALWAYS, true);
191+
// mAdapter.isFirstOnly(!animationAlways);
192+
// }
193+
// }
200194
}

0 commit comments

Comments
 (0)