Merge remote-tracking branch 'origin/qa_light' into qa_light

This commit is contained in:
董宏宇
2020-09-17 13:32:35 +08:00

View File

@@ -47,11 +47,6 @@ public class V2XShareNetworkModel {
@Override
public void subscribe(ObservableEmitter<String> emitter) throws Exception {
try {
getShareIndex(callback);
} catch (Exception e) {
e.printStackTrace();
}
emitter.onNext("1");
emitter.onComplete();
}
@@ -60,16 +55,10 @@ public class V2XShareNetworkModel {
Observable<String> listObservable = Observable.create(new ObservableOnSubscribe<String>() {
@Override
public void subscribe(ObservableEmitter<String> emitter) throws Exception {
try {
getShareEventList(page, size, callback);
} catch (Exception e) {
e.printStackTrace();
}
emitter.onNext("2");
emitter.onComplete();
}
});
indexObservable.flatMap(new Function<String, ObservableSource<?>>() {
@Override
public ObservableSource<?> apply(String s) throws Exception {
@@ -82,12 +71,20 @@ public class V2XShareNetworkModel {
@Override
public void onSubscribe(Disposable d) {
try {
getShareIndex(callback);
} catch (Exception e) {
e.printStackTrace();
}
}
@Override
public void onNext(Object o) {
try {
getShareEventList(page, size, callback);
} catch (Exception e) {
e.printStackTrace();
}
}
@Override
@@ -135,7 +132,7 @@ public class V2XShareNetworkModel {
@Override
public void onError(Throwable e) {
super.onError(e);
if (callback != null){
if (callback != null) {
callback.onFail("网络异常,点击刷新重试");
}
}
@@ -179,7 +176,7 @@ public class V2XShareNetworkModel {
@Override
public void onError(Throwable e) {
super.onError(e);
if (callback != null){
if (callback != null) {
callback.onFail("网络异常,点击刷新重试");
}
}