From 1da529ca4dcf5796e66066dec058e17d6fe26d46 Mon Sep 17 00:00:00 2001
From: liujing <liujing@zhidaoauto.com>
Date: Thu, 13 Aug 2020 19:14:04 +0800
Subject: [PATCH] =?UTF-8?q?error=E7=95=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../v2x/fragment/V2XShareEventsFragment.java  | 25 +++++++------------
 .../utils/animation/V2XAnimationManager.java  |  7 ++++++
 .../v2x/view/V2XNetworkLoadingView.java       |  8 ++++--
 .../res/layout/v2x_network_loading_item.xml   |  3 ++-
 4 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XShareEventsFragment.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XShareEventsFragment.java
index a623c41835..2c59af2622 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XShareEventsFragment.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XShareEventsFragment.java
@@ -32,7 +32,8 @@ public class V2XShareEventsFragment extends MvpFragment implements AdapterCallba
     private static final String TAG = "ShareEventsFragment";
     private RecyclerView recyclerView;
     private V2XShareEventAdapter adapter;
-    private ArrayList dataArrayList;
+    private ArrayList dataArrayList = new ArrayList();
+    ;
     private int pageNum = 1;
     private V2XShareNetworkModel v2XShareNetworkModel;
 
@@ -77,19 +78,6 @@ public class V2XShareEventsFragment extends MvpFragment implements AdapterCallba
      * 获取热心指数,分享列表等分享内容
      * */
     private void getShareEventResponse() {
-        animatioonAcction(View.VISIBLE);
-        dataArrayList = new ArrayList();
-
-//        if (CheckUtils.isNetworkConnected(getContext()) == false) {
-//            loadingView.networkError("获取失败");
-//            loadingView.refresButton.setOnClickListener(new View.OnClickListener() {
-//                @Override
-//                public void onClick(View v) {
-//                    getShareEventResponse();
-//                }
-//            });
-//            return;
-//        }
 
         v2XShareNetworkModel.getShareEventResponse(pageNum, 10, new V2XRefreshCallback() {
             @Override
@@ -109,10 +97,15 @@ public class V2XShareEventsFragment extends MvpFragment implements AdapterCallba
 
             @Override
             public void onFail(String msg) {
-
+                loadingView.stopWithError(msg);
+                loadingView.refresButton.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        getShareEventResponse();
+                    }
+                });
             }
 
-
         });
 
     }
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/animation/V2XAnimationManager.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/animation/V2XAnimationManager.java
index ad0c6401ca..c77bea6db8 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/animation/V2XAnimationManager.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/animation/V2XAnimationManager.java
@@ -50,6 +50,13 @@ public class V2XAnimationManager implements Animation {
         }
     }
 
+    public void soptWithError(){
+        if (delegate != null && isStarted) {
+            isStarted = false;
+            delegate.stop();
+        }
+    }
+
     public void release() {
         delegate = null;
     }
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/V2XNetworkLoadingView.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/V2XNetworkLoadingView.java
index 99712f12bd..b8c1e9beea 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/V2XNetworkLoadingView.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/V2XNetworkLoadingView.java
@@ -21,6 +21,7 @@ public class V2XNetworkLoadingView extends RelativeLayout {
     private TextView textView;
     private V2XAnimationManager v2XAnimationManager;
     public Button refresButton;
+    private String loadingText = "正在获取信息…";
 
     public V2XNetworkLoadingView(Context context) {
 
@@ -63,6 +64,9 @@ public class V2XNetworkLoadingView extends RelativeLayout {
         if (refresButton != null) {
             refresButton.setVisibility(GONE);
         }
+        if (textView != null) {
+            textView.setText(loadingText);
+        }
     }
 
     public void stop() {
@@ -72,9 +76,9 @@ public class V2XNetworkLoadingView extends RelativeLayout {
         }
     }
 
-    public void networkError(String errormsg) {
+    public void stopWithError(String errormsg) {
         if (v2XAnimationManager != null) {
-            v2XAnimationManager.stop();
+            v2XAnimationManager.soptWithError();
         }
         if (textView != null) {
             textView.setText(errormsg);
diff --git a/modules/mogo-module-v2x/src/main/res/layout/v2x_network_loading_item.xml b/modules/mogo-module-v2x/src/main/res/layout/v2x_network_loading_item.xml
index ca32b5f1d9..c48b3bc1f5 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/v2x_network_loading_item.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/v2x_network_loading_item.xml
@@ -9,8 +9,9 @@
         android:id="@+id/loading_imageview"
         android:layout_width="200px"
         android:layout_height="200px"
+        android:layout_alignParentTop="true"
         android:layout_centerHorizontal="true"
-        android:layout_marginTop="133px"
+        android:layout_marginTop="100px"
         android:background="@drawable/v_to_x_loading_car0000" />
 
     <TextView