Skip to content

Commit cada136

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方法兼容
1 parent d0e734d commit cada136

File tree

3 files changed

+21
-4
lines changed

3 files changed

+21
-4
lines changed

app/src/main/java/com/aries/library/fast/demo/retrofit/repository/ApiRepository.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
package com.aries.library.fast.demo.retrofit.repository;
22

3+
import com.aries.library.fast.demo.App;
34
import com.aries.library.fast.demo.base.BaseMovieEntity;
45
import com.aries.library.fast.demo.entity.UpdateEntity;
56
import com.aries.library.fast.demo.retrofit.service.ApiService;
67
import com.aries.library.fast.retrofit.FastRetrofit;
78
import com.aries.library.fast.retrofit.FastTransformer;
9+
import com.aries.library.fast.util.FastUtil;
810

911
import java.util.HashMap;
1012
import java.util.Map;
@@ -63,6 +65,9 @@ public Observable<BaseMovieEntity> getMovie(String url, int start, int count) {
6365
}
6466

6567
public Observable<UpdateEntity> updateApp() {
66-
return FastTransformer.switchSchedulers(getApiService().updateApp());
68+
Map<String, Object> params = new HashMap<>();
69+
params.put("versionCode", FastUtil.getVersionCode(App.getContext()));
70+
params.put("versionName", FastUtil.getVersionName(App.getContext()));
71+
return FastTransformer.switchSchedulers(getApiService().updateApp(params));
6772
}
6873
}

app/src/main/java/com/aries/library/fast/demo/retrofit/service/ApiService.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
import retrofit2.http.HeaderMap;
1515
import retrofit2.http.POST;
1616
import retrofit2.http.Path;
17+
import retrofit2.http.QueryMap;
1718

1819
/**
1920
* Created: AriesHoo on 2017/8/23 13:53
@@ -28,5 +29,5 @@ public interface ApiService {
2829

2930
@GET(ApiConstant.API_UPDATE_APP)
3031
// @Headers({FastRetrofit.BASE_URL_NAME_HEADER + ApiConstant.API_UPDATE_APP_KEY})
31-
Observable<UpdateEntity> updateApp();
32+
Observable<UpdateEntity> updateApp(@QueryMap Map<String, Object> map);
3233
}

library/src/main/java/com/aries/library/fast/retrofit/FastMultiUrl.java

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
* 2、2018-7-2 15:15:46 修改设置BaseUrl逻辑解决随时切换问题
2828
* 3、2018-7-2 16:58:01 删除BaseUrl变更监听相关代码
2929
* 4、2018-7-3 12:24:24 新增单独method 方法设置请求BaseUrl方法
30+
* 5、2018-7-9 15:13:45 修改解析method方法增加对get方法兼容
3031
*/
3132
class FastMultiUrl {
3233

@@ -84,8 +85,18 @@ public HttpUrl parseUrl(HttpUrl domainUrl, HttpUrl url) {
8485
}
8586
//解析得到service里的方法名(即@POST或@GET里的内容)
8687
String method = !TextUtils.isEmpty(mBaseUrl) ? url.toString().replace(mBaseUrl.toString(), "") : "";
87-
LoggerManager.d(TAG, "Base Url is { " + mBaseUrl + " }" + ";Old Url is{" + url.newBuilder().toString() + "};Method is <<" + method + ">>");
88-
return checkUrl((!mHeaderPriorityEnable && mBaseUrlMap.containsKey(method) ? getBaseUrl(method).toString() : domainUrl.toString()) + method);
88+
89+
String methodKey = method;
90+
//包含? 很大可能是get请求增加了参数需过滤掉
91+
if (methodKey.contains("?")) {
92+
methodKey = methodKey.substring(0, methodKey.indexOf("?"));
93+
}
94+
LoggerManager.d(TAG, "Base Url is { " + mBaseUrl + " }" + ";Old Url is{" + url.newBuilder().toString() + "};Method is <<" + methodKey + ">>");
95+
//如果
96+
if (!mHeaderPriorityEnable && mBaseUrlMap.containsKey(methodKey)) {
97+
return checkUrl(getBaseUrl(methodKey).toString() + method);
98+
}
99+
return checkUrl(domainUrl.toString() + method);
89100
}
90101
});
91102
this.mInterceptor = new Interceptor() {

0 commit comments

Comments
 (0)