From 91fdea895ad3e755fe941424417b71209e055dd9 Mon Sep 17 00:00:00 2001
From: liujing <liujing@zhidaoauto.com>
Date: Thu, 17 Sep 2020 13:16:05 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=BA=E5=BA=8F=E6=89=A7=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../v2x/network/V2XShareNetworkModel.java     | 27 +++++++++----------
 1 file changed, 12 insertions(+), 15 deletions(-)

diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/network/V2XShareNetworkModel.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/network/V2XShareNetworkModel.java
index c706acbe91..8d6bb0e529 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/network/V2XShareNetworkModel.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/network/V2XShareNetworkModel.java
@@ -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("网络异常，点击刷新重试");
                         }
                     }