Skip to content

Commit c044d37

Browse files
author
ghc
committed
merge develop to master with no-ff
2 parents 6d0bdef + 8a6f99e commit c044d37

3 files changed

Lines changed: 12 additions & 1 deletion

File tree

‎EvolvingNet/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ android {
1111
minSdkVersion 14
1212
targetSdkVersion 27
1313
versionCode 1
14-
versionName "1.1.0-alpha-3"
14+
versionName "1.1.0-alpha-5"
1515

1616
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
1717

‎EvolvingNet/src/main/java/com/codingcoderscode/lib/net/request/base/CCRequest.java‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,11 @@ public abstract class CCRequest<T, R extends CCRequest> {
119119
*/
120120
protected abstract Flowable<CCBaseResponse<T>> getDiskQueryFlowable();
121121

122+
/**
123+
* 获取网络数据查询请求Flowable对象
124+
*
125+
* @return
126+
*/
122127
protected abstract Flowable<CCBaseResponse<T>> getRequestFlowable();
123128

124129
public abstract int getCacheQueryMode();

‎EvolvingNet/src/main/java/com/codingcoderscode/lib/net/request/base/CCSimpleRequest.java‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ public CCSimpleRequest(String url, CCNetApiService apiService) {
7979
*
8080
* @return 磁盘缓存查询Flowable对象
8181
*/
82+
@Override
8283
protected Flowable<CCBaseResponse<T>> getDiskQueryFlowable() {
8384
//磁盘缓存获取,包括任何形式的磁盘缓存
8485
return Flowable.create(new FlowableOnSubscribe<CCBaseResponse<T>>() {
@@ -113,6 +114,11 @@ public void subscribe(@NonNull FlowableEmitter<CCBaseResponse<T>> e) throws Exce
113114
}, BackpressureStrategy.LATEST)/*.subscribeOn(Schedulers.io())*/;
114115
}
115116

117+
/**
118+
* 获取网络数据查询请求Flowable对象
119+
*
120+
* @return
121+
*/
116122
@Override
117123
protected Flowable<CCBaseResponse<T>> getRequestFlowable() {
118124
return Flowable.create(new FlowableOnSubscribe<Call<ResponseBody>>() {

0 commit comments

Comments
 (0)