Merge branch 'anim' into dev_1.1.2

modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/entity/panel/V2XShareEventDescription.java

@@ -75,10 +75,10 @@ public class V2XShareEventDescription extends BaseData implements Serializable {
             private int id;
             private String sn;
             private int score;
-            private int shareNum;
-            private int likeNum;
-            private int notLikeNum;
-            private double enthusiasmIndex;
+            private int shareNum = 0;
+            private int likeNum = 0;
+            private int notLikeNum =  0;
+            private double enthusiasmIndex = 10;
             private String createTime;
             private String updateTime;
 

modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XShareEventsFragment.java

@@ -98,7 +98,7 @@ public class V2XShareEventsFragment extends MvpFragment implements AdapterCallba
 
             @Override
             public void onFail(String msg) {
-//                loadingError(true);
+
             }
 
 

modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/network/V2XShareNetworkModel.java

@@ -132,6 +132,13 @@ public class V2XShareNetworkModel {
                         }
                     }
 
+                    @Override
+                    public void onError(Throwable e) {
+                        super.onError(e);
+                        if (callback != null){
+                            callback.onFail("当前服务不可以, 请稍后重试");
+                        }
+                    }
                 });
 
     }
@@ -168,6 +175,14 @@ public class V2XShareNetworkModel {
                             callback.onFail(message);
                         }
                     }
+
+                    @Override
+                    public void onError(Throwable e) {
+                        super.onError(e);
+                        if (callback != null){
+                            callback.onFail("当前服务不可以, 请稍后重试");
+                        }
+                    }
                 });
     }
 }

modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_empty.xml

@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content">
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:gravity="center">
 
     <ImageView
         android:id="@+id/no_share_image"
-        android:layout_width="116.4px"
-        android:layout_height="116.4px"
+        android:layout_width="117px"
+        android:layout_height="117px"
         android:layout_marginTop="30px"
-        android:layout_centerHorizontal="true"
         android:src="@drawable/icon_share_empty" />
 
     <TextView
@@ -19,12 +20,14 @@
         android:layout_centerHorizontal="true"
         android:gravity="bottom"
         android:alpha="0.7"
+        android:textColor="#FFFFFF"
         android:layout_marginTop="12.6px"
+        android:textSize="18px"
         android:text="你还没有分享过道路事件，快去试试吧" />
 
     <Button
         android:id="@+id/share_event_button"
-        android:layout_width="220px"
+        android:layout_width="150px"
         android:layout_height="48px"
         android:layout_below="@+id/share_event_null_des"
         android:layout_centerHorizontal="true"
@@ -36,4 +39,4 @@
         android:textColor="#FFFFFF"
         android:textSize="25sp" />
 
-</RelativeLayout>
+</LinearLayout>

modules/mogo-module-v2x/src/main/res/layout/v2x_network_loading_item.xml

@@ -25,7 +25,6 @@
             android:layout_below="@+id/loading_text"
             android:layout_centerHorizontal="true"
             android:layout_gravity="top|center"
-            android:paddingTop="25px"
             android:alpha="0.7"
             android:text="正在获取信息…"
             android:textColor="#FFFFFF"