Skip to content

Commit 29e2466

Browse files
AriesHooAriesHoo
authored andcommitted
重大变更:重构大部分代码及实现方式删除许多类及实现方法包括三方库慎重升级与之前版本有很大差异
优化:BasisFragment 控制是否为单Fragment 方法 优化:调整ActivityFragmentControl 将状态栏及导航栏控制增加 优化:多状态管理StatusLayoutManager调整完成 优化:滑动返回控制swipeBack功能新增各种回调功能 优化:将原默认配置方法调整到最终实现类功能 新增:增加友盟统计功能演示 新增:新增首页演示其它三方库状态栏及导航栏功能控制 新增:个人MineFragment中选择头像功能三方库状态栏及导航栏控制示例 优化:UI全局控制相关回调并调整三方库Activity控制 优化:新增FastRetrofit 下载/上传功能 优化:新增FastRetrofit 控制多BaseUrl方式 新增:新增Demo检查版本功能试验下载文件功能 删除:删除原多状态布局相关配置 修复:修改FastRefreshActivity 设置Adapter错误BUG 升级:升级部分三方库版本 修复:删除IHttpRequestControl判断避免http错误时无法全局控制BUG 优化:修改解析method方法增加对get方法兼容 优化:修改ToastUtil 增加子线程调用自动切换主线程操作 优化:优化下载功能新增FastDownloadRetrofit并新增格式化文件方法FastFormatUtil#formatDataSize 修复:修复FastRetrofit无法删除单个header问题 优化:优化上传文件并通过新增的FastUploadRequestBody及FastUploadRequestListener实现单个/多个文件 上传进度监听 可参看 MineFragment 示例 优化:FastFileUtil 安装App在Android 7.0以下版本兼容性 新增:新增IMultiStatusView 用于设置StatusLayoutManager 属性 优化:调整setMultiStatusView位置并抽离设置StatusLayoutManager相关属性 优化:注释及代码规范调整
1 parent 02ec533 commit 29e2466

File tree

63 files changed

+680
-309
lines changed

Some content is hidden

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

63 files changed

+680
-309
lines changed

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,12 +68,11 @@ public void onCreate() {
6868
// .addHeader(header)
6969
// .addHeader(key,value)
7070
//设置请求全局log-可设置tag及Level类型
71-
.setLogEnable(false)
71+
.setLogEnable(true)
7272
// .setLogEnable(BuildConfig.DEBUG, TAG, HttpLoggingInterceptor.Level.BODY)
7373
//设置统一超时--也可单独调用read/write/connect超时(可以设置时间单位TimeUnit)
7474
//默认20 s
7575
.setTimeout(30);
76-
7776
//注意设置baseUrl要以/ 结尾 service 里的方法不要以/打头不然拦截到的url会有问题
7877
//以下为配置多BaseUrl--默认方式一优先级高 可通过FastRetrofit.getInstance().setHeaderPriorityEnable(true);设置方式二优先级
7978
//方式一 通过Service 里的method-(如:) 设置 推荐 使用该方式不需设置如方式二的额外Header

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

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@
2727
import io.reactivex.annotations.NonNull;
2828

2929
/**
30-
* Created: AriesHoo on 2018/5/28 11:05
31-
* E-Mail: AriesHoo@126.com
32-
* Function:检查版本升级的工具类
30+
* @Author: AriesHoo on 2018/7/23 16:06
31+
* @E-Mail: AriesHoo@126.com
32+
* Function: 检查版本升级的工具类
3333
* Description:
3434
*/
3535
public class CheckVersionHelper {
@@ -73,8 +73,9 @@ public void _onNext(@NonNull UpdateEntity entity) {
7373

7474
@Override
7575
public void onError(Throwable e) {
76-
if (mIsLoading)
76+
if (mIsLoading) {
7777
super.onError(e);
78+
}
7879
}
7980
} :
8081
new FastObserver<UpdateEntity>() {
@@ -89,8 +90,9 @@ public void _onNext(@NonNull UpdateEntity entity) {
8990

9091
@Override
9192
public void onError(Throwable e) {
92-
if (mIsLoading)
93+
if (mIsLoading) {
9394
super.onError(e);
95+
}
9496
}
9597
});
9698
}

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

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import com.aries.library.fast.demo.module.main.MainActivity;
1212
import com.aries.library.fast.manager.RxJavaManager;
1313
import com.aries.library.fast.module.activity.FastTitleActivity;
14+
import com.aries.library.fast.retrofit.FastObserver;
1415
import com.aries.library.fast.util.FastUtil;
1516
import com.aries.ui.util.StatusBarUtil;
1617
import com.aries.ui.view.title.TitleBarView;
@@ -60,7 +61,8 @@ public void initView(Bundle savedInstanceState) {
6061
return;
6162
}
6263
if (!StatusBarUtil.isSupportStatusBarFontChange()) {
63-
getWindow().addFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN); //隐藏状态栏
64+
//隐藏状态栏
65+
getWindow().addFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN);
6466
}
6567
Drawable drawable = getResources().getDrawable(R.drawable.ic_launcher);
6668
FastUtil.getTintDrawable(drawable, Color.WHITE);
@@ -69,12 +71,19 @@ public void initView(Bundle savedInstanceState) {
6971
tvVersion.setText("V" + FastUtil.getVersionName(mContext));
7072
tvVersion.setTextColor(Color.WHITE);
7173
tvCopyRight.setTextColor(Color.WHITE);
72-
RxJavaManager.getInstance().setTimer(2000, new RxJavaManager.TimerListener() {
73-
@Override
74-
public void timeEnd() {
75-
FastUtil.startActivity(mContext, MainActivity.class);
76-
finish();
77-
}
78-
}).compose(bindUntilEvent(ActivityEvent.DESTROY));
74+
RxJavaManager.getInstance().setTimer(2000)
75+
.compose(bindUntilEvent(ActivityEvent.DESTROY))
76+
.subscribe(new FastObserver<String>() {
77+
@Override
78+
public void _onNext(String entity) {
79+
}
80+
81+
@Override
82+
public void onComplete() {
83+
super.onComplete();
84+
FastUtil.startActivity(mContext, MainActivity.class);
85+
finish();
86+
}
87+
});
7988
}
8089
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,8 @@ public void loadData(int page) {
8484
// .addHeader(map)
8585
// .addHeader("ht", "ht");
8686
// }
87-
DEFAULT_PAGE_SIZE = 15;//接口最大支持单页100
88-
ApiRepository.getInstance().getMovie(mUrl, page * DEFAULT_PAGE_SIZE, DEFAULT_PAGE_SIZE)
87+
mDefaultPageSize = 15;//接口最大支持单页100
88+
ApiRepository.getInstance().getMovie(mUrl, page * mDefaultPage, mDefaultPageSize)
8989
.compose(bindUntilEvent(FragmentEvent.DESTROY))
9090
.subscribe(new FastObserver<BaseMovieEntity>(getIHttpRequestControl()) {
9191
@Override

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@
1717

1818
import butterknife.BindView;
1919

20-
2120
/**
22-
* Created: AriesHoo on 2017/9/7 10:59
21+
* @Author: AriesHoo on 2018/7/23 10:00
22+
* @E-Mail: AriesHoo@126.com
2323
* Function: 示例主页面
24-
* Desc:
24+
* Description:
2525
*/
2626
public class MainActivity extends FastMainActivity {
2727

app/src/main/java/com/aries/library/fast/demo/module/main/sample/ali/ALiPayMainActivity.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,10 @@
1313
import butterknife.BindView;
1414

1515
/**
16-
* Created: AriesHoo on 2017/8/5 20:48
16+
* @Author: AriesHoo on 2018/7/23 10:00
17+
* @E-Mail: AriesHoo@126.com
1718
* Function: 快速实现支付宝主页
18-
* Desc:
19+
* Description:
1920
*/
2021
public class ALiPayMainActivity extends FastMainActivity {
2122

app/src/main/java/com/aries/library/fast/demo/module/main/sample/news/NewsMainActivity.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@
1111
import java.util.List;
1212

1313
/**
14-
* Created: AriesHoo on 2017/8/6 23:27
14+
* @Author: AriesHoo on 2018/7/23 10:01
15+
* @E-Mail: AriesHoo@126.com
1516
* Function: 腾讯新闻
16-
* Desc:
17+
* Description:
1718
*/
18-
1919
public class NewsMainActivity extends FastMainActivity {
2020
String[] titles;
2121

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ public void setTitleBar(TitleBarView titleBar) {
7777
public void initView(Bundle savedInstanceState) {
7878
mImagePickerHelper = new ImagePickerHelper(mContext);
7979
mIvHead = mStvInfo.getLeftIconIV();
80-
GlideManager.loadCircleImg("https://avatars3.githubusercontent.com/u/19605922?v=4&s=460", mIvHead);
80+
GlideManager.loadCircleImg("https://t11.baidu.com/it/u=4171704310,3895276209&fm=173&app=25&f=JPG?w=550&h=393&s=8B64F517E6825EE1685CECDC0300E022", mIvHead);
8181
LoggerManager.d("imageHeight:" + mIvHead.getLayoutParams().height + ";screenWidth:" + SizeUtil.getScreenWidth());
8282
SpanTool.getBuilder(mStvInfo.getLeftString())
8383
.append("https://github.com/AriesHoo")

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,5 +33,5 @@ ext{
3333
targetSdkVersion = 27
3434
supportVersion = "27.0.2"
3535
versionCode = 230
36-
versionName = "2.2.10-beta6"
36+
versionName = "2.2.10-beta4"
3737
}

library/src/main/java/com/aries/library/fast/FastConstant.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package com.aries.library.fast;
22

3-
43
/**
5-
* Created: AriesHoo on 2017/8/5 14:38
4+
* @Author: AriesHoo on 2018/7/23 14:39
5+
* @E-Mail: AriesHoo@126.com
66
* Function: 全局常量
7-
* Desc:
7+
* Description:
88
*/
99
public class FastConstant {
1010

0 commit comments

Comments
 (0)