Skip to content

Commit 4bdb222

Browse files
committed
1、增加项目全局设置参数(title、刷新头等)配置类FastConfig
2、根据FastConfig配置删除demo里多种Base
1 parent 6b76550 commit 4bdb222

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+461
-266
lines changed

app/build.gradle

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,16 @@ def releaseTime() {
66
return new Date().format("yyyy-MM-dd_HH-mm", TimeZone.getTimeZone("GMT+8"))
77
}
88

9+
def ext = rootProject.ext
910
android {
10-
def ext = rootProject.ext
1111
compileSdkVersion ext.compileSdkVersion
1212
buildToolsVersion ext.buildToolsVersion
1313
defaultConfig {
1414
applicationId "com.aries.library.fast.demo"
1515
minSdkVersion ext.minSdkVersion
1616
targetSdkVersion ext.targetSdkVersion
17-
versionCode 211
18-
versionName "2.1.1"
17+
versionCode 212
18+
versionName "2.1.5-alpha"
1919
multiDexEnabled true
2020
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
2121
buildConfigField "String", "BASE_URL", "\"https://api.douban.com/\""
@@ -63,11 +63,10 @@ android {
6363
}
6464

6565
dependencies {
66-
def supportVersion = "25.3.1"
6766
compile fileTree(include: ['*.jar'], dir: 'libs')
68-
//compile project(':library')
67+
compile project(':library')
6968
//compile 'com.github.AriesHoo:FastLib:+'
70-
compile 'com.github.AriesHoo:FastLib:2.1.1'
69+
//compile 'com.github.AriesHoo:FastLib:2.1.1'
7170
apt 'com.jakewharton:butterknife-compiler:8.8.1'
7271
compile 'cn.bingoogolapple:bga-banner:2.1.7@aar'
7372
compile 'com.scwang.smartrefresh:SmartRefreshHeader:1.0.3'
@@ -76,9 +75,9 @@ dependencies {
7675
compile 'com.flyco.labelview:FlycoLabelView_Lib:1.0.2@aar'
7776

7877
//以下库library里使用provided只是编译使用时需根据项目选择相应版本
79-
compile 'com.android.support:design:'.concat(supportVersion)
80-
compile 'com.android.support:appcompat-v7:'.concat(supportVersion)
81-
compile 'com.android.support:recyclerview-v7:'.concat(supportVersion)
78+
compile 'com.android.support:design:'.concat(ext.supportVersion)
79+
compile 'com.android.support:appcompat-v7:'.concat(ext.supportVersion)
80+
compile 'com.android.support:recyclerview-v7:'.concat(ext.supportVersion)
8281
//万能适配器--一般都需要吧
8382
compile 'com.github.CymChad:BaseRecyclerViewAdapterHelper:2.9.28'
8483
//webView库 继承FastWebActivity需要,不需要内置WebView可以不compile

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

Lines changed: 33 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,19 @@
11
package com.aries.library.fast.demo;
22

33
import android.content.Context;
4+
import android.support.annotation.NonNull;
45

56
import com.aries.library.fast.FastApplication;
7+
import com.aries.library.fast.FastConfig;
8+
import com.aries.library.fast.demo.helper.RefreshHeaderHelper;
69
import com.aries.library.fast.manager.LoggerManager;
710
import com.aries.library.fast.retrofit.FastRetrofit;
811
import com.aries.library.fast.util.SizeUtil;
912
import com.aries.library.fast.util.ToastUtil;
10-
11-
import java.util.HashMap;
12-
import java.util.Map;
13+
import com.chad.library.adapter.base.animation.SlideInRightAnimation;
14+
import com.scwang.smartrefresh.layout.api.DefaultRefreshHeaderCreater;
15+
import com.scwang.smartrefresh.layout.api.RefreshHeader;
16+
import com.scwang.smartrefresh.layout.api.RefreshLayout;
1317

1418

1519
/**
@@ -25,32 +29,49 @@ public class App extends FastApplication {
2529
@Override
2630
public void onCreate() {
2731
super.onCreate();
28-
mContext = getApplicationContext();
29-
//测试关键header
30-
Map<String, Object> header = new HashMap<>();
31-
header.put("head", "head");
32-
header.put("time", System.currentTimeMillis());
32+
mContext = this;
33+
34+
//初始化Logger日志打印
3335
LoggerManager.init(TAG, BuildConfig.DEBUG);
36+
//初始化toast工具
3437
ToastUtil.init(mContext, true);
35-
38+
//初始化Retrofit配置
3639
FastRetrofit.getInstance()
3740
.setBaseUrl(BuildConfig.BASE_URL)
3841
.trustAllSSL()//信任所有证书--也可设置useSingleSignedSSL(单向认证)或useBothSignedSSL(双向验证)
39-
// .setHeaders(header)//设置统一请求头
42+
//.setHeaders(header)//设置统一请求头
4043
.setLogEnable(BuildConfig.DEBUG)//设置请求全局log-可设置tag及Level类型
41-
// .setLogEnable(BuildConfig.DEBUG, TAG, HttpLoggingInterceptor.Level.BASIC)
44+
//.setLogEnable(BuildConfig.DEBUG, TAG, HttpLoggingInterceptor.Level.BASIC)
4245
.setTimeout(30);//设置统一超时--也可单独调用read/write/connect超时(可以设置时间单位TimeUnit)
4346

4447
//以下为配置多BaseUrl
4548
//step1
4649
//FastMultiUrl.getInstance().putBaseUrl("test", "http://www.baidu.com");
47-
4850
//step2
4951
// 需要step1中baseUrl的方法需要在对应service里增加
5052
// @Headers({FastMultiUrl.BASE_URL_NAME_HEADER + "test"})
5153
//增加一个Header配置注意FastMultiUrl.BASE_URL_NAME_HEADER是必须后面"test"作为标记
5254
// FastMultiUrl里增加的拦截器才找得到对应的BaseUrl
5355

56+
LoggerManager.d("context:" + this);
57+
//全局配置参数
58+
FastConfig.getInstance(mContext)
59+
.setTitleBackgroundResource(R.color.colorTitleBackground)//设置TitleBarView背景资源
60+
.setContentViewBackgroundResource(R.color.colorBackground)//设置Activity或Fragment根布局背景资源
61+
.setTitleTextColor(mContext.getResources().getColor(R.color.colorTitleText))//设置TitleBarView 所有TextView颜色
62+
.setLightStatusBarEnable(true)//设置是否状态栏浅色模式(深色状态栏文字及图标)
63+
.setSwipeBackEnable(true)//设置Activity是否支持滑动返回
64+
.setAdapterAnimationEnable(true) //是否设置Adapter加载动画
65+
.setDefaultAdapterAnimation(new SlideInRightAnimation())//设置全局Adapter加载动画--设置该方法内部同步调用setAdapterAnimationEnable(true)
66+
.setDefaultRefreshHeader(new DefaultRefreshHeaderCreater() {//设置SmartRefreshLayout刷新头-自定加载使用BaseRecyclerViewAdapterHelper
67+
@NonNull
68+
@Override
69+
public RefreshHeader createRefreshHeader(Context context, RefreshLayout layout) {
70+
layout.setEnableHeaderTranslationContent(false);
71+
return RefreshHeaderHelper.getInstance().getRefreshHeader(mContext);
72+
}
73+
})
74+
.setTitleElevation(mContext.getResources().getDimension(R.dimen.dp_elevation));
5475
}
5576

5677
/**

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

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

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

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

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

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

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

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

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

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

app/src/main/java/com/aries/library/fast/demo/helper/TitleBarHelper.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ public void onClick(View v) {
5050
}
5151
})
5252
.setBackgroundResource(R.color.colorWhite);
53-
int elevation = mActivity.getResources().
54-
getDimensionPixelSize(R.dimen.dp_elevation);
53+
float elevation = mActivity.getResources().
54+
getDimension(R.dimen.dp_elevation);
5555
ViewCompat.setElevation(titleBar, elevation);
5656
LoggerManager.d("elevation:" + elevation);
5757
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
import android.widget.TextView;
88

99
import com.aries.library.fast.demo.R;
10-
import com.aries.library.fast.demo.base.BaseTitleActivity;
1110
import com.aries.library.fast.demo.module.main.MainActivity;
1211
import com.aries.library.fast.manager.RxJavaManager;
12+
import com.aries.library.fast.module.activity.FastTitleActivity;
1313
import com.aries.library.fast.util.FastUtil;
1414
import com.aries.ui.util.StatusBarUtil;
1515
import com.aries.ui.view.title.TitleBarView;
@@ -21,7 +21,7 @@
2121
* Function:
2222
* Desc:
2323
*/
24-
public class SplashActivity extends BaseTitleActivity {
24+
public class SplashActivity extends FastTitleActivity {
2525
@BindView(R.id.tv_versionSplash) TextView tvVersion;
2626

2727
@Override

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,6 @@ public static void start(Activity mActivity, String url, boolean isShowTitle) {
3232
start(mActivity, WebViewActivity.class, url);
3333
}
3434

35-
@Override
36-
protected boolean isSwipeBackEnable() {
37-
return true;
38-
}
39-
4035
@Override
4136
public boolean isLightStatusBarEnable() {
4237
return mIsShowTitle;

0 commit comments

Comments
 (0)