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

# Conflicts:
#	modules/mogo-module-v2x/src/main/res/layout/view_event_panel_history_count.xml

modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/SpacesItemDecoration.java

@@ -20,13 +20,6 @@ public class SpacesItemDecoration extends RecyclerView.ItemDecoration {
     @Override
     public void getItemOffsets(Rect outRect, View view,
                                RecyclerView parent, RecyclerView.State state) {
-        outRect.left = space;
-        outRect.right = space;
         outRect.bottom = space;
-
-        // Add top margin only for the first item to avoid double space between items
-        if (parent.getChildPosition(view) == 0) {
-            outRect.top = space;
-        }
     }
 }

modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XSurroundingAdapter.java

@@ -191,10 +191,10 @@ public class V2XSurroundingAdapter extends RecyclerView.Adapter<V2XSurroundingVi
                 typeName = "封路";
                 break;
             case MarkerPoiTypeEnum.FOURS_ICE:
-                typeName = "路面结冰";
+                typeName = "道路结冰";
                 break;
             case MarkerPoiTypeEnum.FOURS_FOG:
-                typeName = "出现浓雾";
+                typeName = "浓雾";
                 break;
             case MarkerPoiTypeEnum.TRAFFIC_CHECK:
                 typeName = "交通检查";
@@ -203,10 +203,10 @@ public class V2XSurroundingAdapter extends RecyclerView.Adapter<V2XSurroundingVi
                 typeName = "交通事故";
                 break;
             case MarkerPoiTypeEnum.FOURS_BLOCK_UP:
-                typeName = "道路拥堵";
+                typeName = "拥堵";
                 break;
             case MarkerPoiTypeEnum.FOURS_ROAD_WORK:
-                typeName = "道路施工";
+                typeName = "施工";
                 break;
             case MarkerPoiTypeEnum.FOURS_PONDING:
                 typeName = "道路积水";

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

@@ -1,6 +1,7 @@
 package com.mogo.module.v2x.fragment
 
 import android.content.Intent
+import android.graphics.Typeface
 import android.view.View
 import android.widget.ImageView
 import android.widget.RadioButton
@@ -123,14 +124,29 @@ class V2XEventPanelFragment : MvpFragment<V2XEventPanelFragment, EventPanelPrese
             mRgTabSelect?.setOnCheckedChangeListener { group, checkedId ->
                 when (checkedId) {
                     R.id.rbScenarioHistory -> {
+                        // 更改选中是否加粗
+                        mRbScenarioHistory?.typeface = Typeface.defaultFromStyle(Typeface.BOLD)
+                        mRbSurroundingEvent?.typeface = Typeface.defaultFromStyle(Typeface.NORMAL)
+                        mRbShareEvents?.typeface = Typeface.defaultFromStyle(Typeface.NORMAL)
+
                         TrackUtils.trackV2xHistoryEvent(2)
                         mVpEventPanel?.setCurrentItem(0, false)
                     }
                     R.id.rbSurroundingEvent -> {
+                        // 更改选中是否加粗
+                        mRbScenarioHistory?.typeface = Typeface.defaultFromStyle(Typeface.NORMAL)
+                        mRbSurroundingEvent?.typeface = Typeface.defaultFromStyle(Typeface.BOLD)
+                        mRbShareEvents?.typeface = Typeface.defaultFromStyle(Typeface.NORMAL)
+
                         TrackUtils.trackV2xHistoryEvent(3)
                         mVpEventPanel?.setCurrentItem(1, false)
                     }
                     R.id.rbShareEvents -> {
+                        // 更改选中是否加粗
+                        mRbScenarioHistory?.typeface = Typeface.defaultFromStyle(Typeface.NORMAL)
+                        mRbSurroundingEvent?.typeface = Typeface.defaultFromStyle(Typeface.NORMAL)
+                        mRbShareEvents?.typeface = Typeface.defaultFromStyle(Typeface.BOLD)
+
                         TrackUtils.trackV2xHistoryEvent(4)
                         mVpEventPanel?.setCurrentItem(2, false)
                     }

modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/animation/AnimationResources.java

@@ -5,32 +5,32 @@ import com.mogo.module.v2x.R;
 
 public class AnimationResources {
     public static final int loadingRes[] = {
-            R.drawable.v_to_x_loading_car0000,
-            R.drawable.v_to_x_loading_car0002,
-            R.drawable.v_to_x_loading_car0004,
-            R.drawable.v_to_x_loading_car0006,
-            R.drawable.v_to_x_loading_car0008,
-            R.drawable.v_to_x_loading_car0010,
-            R.drawable.v_to_x_loading_car0012,
-            R.drawable.v_to_x_loading_car0014,
-            R.drawable.v_to_x_loading_car0016,
-            R.drawable.v_to_x_loading_car0018,
-            R.drawable.v_to_x_loading_car0020,
-            R.drawable.v_to_x_loading_car0022,
-            R.drawable.v_to_x_loading_car0024,
-            R.drawable.v_to_x_loading_car0025,
-            R.drawable.v_to_x_loading_car0027,
-            R.drawable.v_to_x_loading_car0029,
-            R.drawable.v_to_x_loading_car0031,
-            R.drawable.v_to_x_loading_car0033,
-            R.drawable.v_to_x_loading_car0035,
-            R.drawable.v_to_x_loading_car0037,
-            R.drawable.v_to_x_loading_car0039,
-            R.drawable.v_to_x_loading_car0041,
-            R.drawable.v_to_x_loading_car0043,
-            R.drawable.v_to_x_loading_car0045,
-            R.drawable.v_to_x_loading_car0047,
-            R.drawable.v_to_x_loading_car0048,
+//            R.drawable.v_to_x_loading_car0000,
+//            R.drawable.v_to_x_loading_car0002,
+//            R.drawable.v_to_x_loading_car0004,
+//            R.drawable.v_to_x_loading_car0006,
+//            R.drawable.v_to_x_loading_car0008,
+//            R.drawable.v_to_x_loading_car0010,
+//            R.drawable.v_to_x_loading_car0012,
+//            R.drawable.v_to_x_loading_car0014,
+//            R.drawable.v_to_x_loading_car0016,
+//            R.drawable.v_to_x_loading_car0018,
+//            R.drawable.v_to_x_loading_car0020,
+//            R.drawable.v_to_x_loading_car0022,
+//            R.drawable.v_to_x_loading_car0024,
+//            R.drawable.v_to_x_loading_car0025,
+//            R.drawable.v_to_x_loading_car0027,
+//            R.drawable.v_to_x_loading_car0029,
+//            R.drawable.v_to_x_loading_car0031,
+//            R.drawable.v_to_x_loading_car0033,
+//            R.drawable.v_to_x_loading_car0035,
+//            R.drawable.v_to_x_loading_car0037,
+//            R.drawable.v_to_x_loading_car0039,
+//            R.drawable.v_to_x_loading_car0041,
+//            R.drawable.v_to_x_loading_car0043,
+//            R.drawable.v_to_x_loading_car0045,
+//            R.drawable.v_to_x_loading_car0047,
+//            R.drawable.v_to_x_loading_car0048,
     };
 
 }

modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/animation/V2XAnimationManager.java

@@ -1,63 +1,65 @@
 package com.mogo.module.v2x.utils.animation;
 
-import android.graphics.drawable.AnimationDrawable;
-import android.util.Log;
+import android.os.Handler;
+import android.os.Looper;
+import android.os.Message;
 import android.view.View;
 import android.widget.ImageView;
-
-import com.mogo.utils.ThreadPoolService;
-import com.mogo.utils.UiThreadHandler;
+import android.widget.ProgressBar;
 
 public class V2XAnimationManager implements Animation {
 
     private static final String TAG = "V2XAnimationManager";
-    private ImageView targetImageView;
-    private Animation delegate;
+    private ProgressBar targetImageView;
     private boolean isStarted = false;
 
-    public void animationWithTarget(ImageView imageView, int[] resources, int duration) {
-        targetImageView = imageView;
-        ThreadPoolService.execute(() -> {
-            final AnimationDrawable drawable = new AnimationDrawable();
-            for (int i = 0; i < resources.length; i++) {
-                drawable.setOneShot(false);
-                drawable.addFrame(targetImageView.getResources().getDrawable(resources[i]), duration);
+    private int mStartIndex = 0;
+
+    private final static int MSG_LOOP = 3004;
+    private long INTERVAL = 100L;
+
+    private Handler mHandler = new Handler( Looper.getMainLooper() ) {
+        @Override
+        public void handleMessage( Message msg ) {
+            super.handleMessage( msg );
+            switch ( msg.what ) {
+                case MSG_LOOP:
+                    if ( isStarted ) {
+//                        targetImageView.setImageResource( AnimationResources.loadingRes[mStartIndex++ % AnimationResources.loadingRes.length] );
+                        mHandler.sendEmptyMessageDelayed( MSG_LOOP, INTERVAL );
+                    }
+                    break;
             }
-            UiThreadHandler.post(() -> {
-                targetImageView.setBackground(drawable);
-                delegate = new DelegateDrawable(drawable);
-                start();
-            });
-        });
+        }
+    };
+
+    public void animationWithTarget(ProgressBar imageView, int[] resources, int duration) {
+        targetImageView = imageView;
+        INTERVAL = duration;
+        start();
 
     }
 
     @Override
     synchronized public void start() {
-        if (delegate != null && !isStarted) {
-            targetImageView.setVisibility(View.VISIBLE);
-            isStarted = true;
-            delegate.start();
-        }
+        isStarted = true;
+        mHandler.sendEmptyMessage( MSG_LOOP );
+        targetImageView.setVisibility(View.VISIBLE);
     }
 
     @Override
     synchronized public void stop() {
-        if (delegate != null && isStarted) {
-            isStarted = false;
-            delegate.stop();
-            targetImageView.setVisibility(View.INVISIBLE);
-        }
+        isStarted = false;
+        mHandler.removeMessages( MSG_LOOP );
+        targetImageView.setVisibility(View.INVISIBLE);
     }
 
     public void soptWithError(){
-        if (delegate != null && isStarted) {
-            isStarted = false;
-            delegate.stop();
-        }
+        stop();
+        targetImageView.setVisibility(View.VISIBLE);
     }
 
     public void release() {
-        delegate = null;
+        stop();
     }
 }

modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/V2XNetworkLoadingView.java

@@ -6,6 +6,7 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.Button;
 import android.widget.ImageView;
+import android.widget.ProgressBar;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
@@ -17,7 +18,7 @@ import com.mogo.module.v2x.utils.animation.V2XAnimationManager;
 
 public class V2XNetworkLoadingView extends RelativeLayout {
 
-    private ImageView loadView;
+    private ProgressBar loadView;
     private TextView textView;
     private V2XAnimationManager v2XAnimationManager;
     public Button refresButton;
@@ -32,6 +33,9 @@ public class V2XNetworkLoadingView extends RelativeLayout {
         super(context, attrs);
         LayoutInflater.from(context).inflate(R.layout.v2x_network_loading_item, this);
         initView();
+        /*
+         添加动画图片资源
+         */
         setLoadingImage(AnimationResources.loadingRes);
     }
 

modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_event_description.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <corners android:radius="@dimen/dp_11"/>
+    <corners android:radius="@dimen/dp_24"/>
     <gradient
         android:startColor="#5E6079"
         android:endColor="#3F4057"

modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_event_list_item.xml

@@ -2,6 +2,5 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
     <solid android:color="#1F2131"/>
-    <corners android:radius="@dimen/dp_24"/>
-
+    <corners android:radius="@dimen/dp_30"/>
 </shape>

modules/mogo-module-v2x/src/main/res/drawable/v2x_alert_window_bg.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <corners android:radius="@dimen/dp_40" />
+    <corners android:radius="@dimen/dp_30" />
     <gradient
         android:angle="135"
         android:endColor="#3F4057"

modules/mogo-module-v2x/src/main/res/drawable/v2x_panel_color_bg.xml

@@ -3,5 +3,5 @@
     <gradient
         android:startColor="#10121E"
         android:endColor="#10121E"/>
-    <corners android:radius="28.8px"/>
+    <corners android:radius="@dimen/dp_40"/>
 </shape>

modules/mogo-module-v2x/src/main/res/drawable/v2x_shadow_shape_view.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <corners android:radius="12px"/>
+    <corners android:radius="@dimen/dp_28"/>
     <gradient
         android:angle="270"
         android:startColor="@android:color/transparent"

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

@@ -8,7 +8,7 @@
     android:paddingStart="@dimen/dp_15"
     android:paddingTop="@dimen/dp_15"
     android:paddingBottom="@dimen/dp_15"
-    app:roundLayoutRadius="@dimen/dp_40">
+    app:roundLayoutRadius="@dimen/dp_30">
 
     <com.mogo.module.v2x.view.RoundLayout
         android:id="@+id/rlRoadEventImg"
@@ -18,7 +18,7 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:roundLayoutRadius="@dimen/dp_40">
+        app:roundLayoutRadius="@dimen/dp_30">
 
         <com.mogo.service.imageloader.MogoImageView
             android:id="@+id/ivEventImg"

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

@@ -2,17 +2,18 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:paddingBottom="40px"
-    android:paddingTop="40px">
+    android:paddingTop="@dimen/dp_40"
+    android:paddingBottom="@dimen/dp_40">
 
     <Button
         android:id="@+id/event_share_load_status"
         android:layout_width="@dimen/v2x_share_btn_width"
         android:layout_height="wrap_content"
-        android:paddingTop="12px"
-        android:paddingBottom="12px"
         android:layout_centerInParent="true"
         android:background="@drawable/v2xt_dw_common_corner_bkg_light"
+        android:gravity="center"
+        android:paddingTop="@dimen/dp_12"
+        android:paddingBottom="@dimen/dp_12"
         android:text="查看更早记录"
         android:textColor="#FFFFFF"
         android:textSize="@dimen/dp_34" />

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

@@ -14,7 +14,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:roundLayoutRadius="@dimen/dp_40" />
+        app:roundLayoutRadius="@dimen/dp_30" />
 
     <com.mogo.service.imageloader.MogoImageView
         android:id="@+id/ivReportHead"

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

@@ -13,7 +13,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:roundLayoutRadius="@dimen/dp_40">
+        app:roundLayoutRadius="@dimen/dp_30">
 
         <com.mogo.service.imageloader.MogoImageView
             android:id="@+id/ivImg"

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

@@ -5,9 +5,6 @@
     android:id="@+id/rlContent"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginLeft="10px"
-    android:layout_marginRight="10px"
-    android:layout_marginBottom="14px"
     android:background="@drawable/bg_v2x_event_list_item">
 
     <TextView

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

@@ -4,9 +4,6 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginLeft="10px"
-    android:layout_marginRight="10px"
-    android:layout_marginBottom="14px"
     android:background="@drawable/bg_v2x_event_list_item">
 
     <TextView
@@ -86,11 +83,11 @@
         android:id="@+id/tvFaultHelpEventTime"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
+        android:layout_marginBottom="@dimen/dp_24"
         android:alpha="0.59"
         android:textColor="@color/v2x_FFF_999"
         android:textSize="@dimen/dp_29"
         app:layout_constraintBottom_toBottomOf="parent"
-        android:layout_marginBottom="@dimen/dp_24"
         app:layout_constraintStart_toStartOf="@+id/tvFaultHelpName"
         app:layout_constraintTop_toBottomOf="@id/tvFaultHelpName"
         tools:text="15:30发布求助信息" />

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

@@ -22,14 +22,16 @@
                 android:layout_marginLeft="@dimen/module_v2x_surrounding_margin_left"
                 android:text="周围5公里，共15条交通信息"
                 android:textColor="@color/v2x_white"
+                android:layout_marginBottom="2px"
                 android:textSize="@dimen/module_v2x_surrounding_top_textsize" />
 
+<!--            android:layout_centerInParent="true"-->
             <TextView
                 android:id="@+id/tv_top_refresh"
                 android:layout_width="@dimen/module_v2x_surrounding_top_bt_width"
                 android:layout_height="@dimen/module_v2x_surrounding_top_bt_height"
                 android:layout_alignParentRight="true"
-                android:layout_centerInParent="true"
+                android:layout_alignParentBottom="true"
                 android:layout_marginRight="@dimen/module_v2x_surrounding_margin_left"
                 android:background="@drawable/bg_v2x_refresh"
                 android:gravity="center"

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

@@ -9,11 +9,11 @@
         android:scaleType="fitXY"
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
-<!--    android:src="@drawable/mogo_image_nongwu_nor"-->
+<!--    android:src="@drawable/mogo_image_nongwu_nor" bg_v2x_event_surrounding_item_bottom-->
 
     <RelativeLayout
         android:layout_alignParentBottom="true"
-        android:background="@drawable/bg_v2x_event_surrounding_item_bottom"
+        android:background="@drawable/v2x_surrounding_bottom_bg"
         android:layout_width="match_parent"
         android:layout_height="@dimen/module_v2x_surrounding_item_bottom">
 

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

@@ -13,10 +13,11 @@
     <RadioGroup
         android:id="@+id/rgTabSelect"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/dp_125"
+        android:layout_height="@dimen/module_v2x_panel_tab_height"
         android:gravity="center_vertical"
         android:orientation="horizontal"
         app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent">
 
@@ -27,17 +28,17 @@
             android:button="@null"
             android:checked="true"
             android:gravity="center"
-            android:paddingStart="@dimen/dp_40"
-            android:paddingEnd="@dimen/dp_40"
+            android:paddingStart="@dimen/dp_48"
+            android:paddingEnd="@dimen/dp_35"
             android:text="出行动态"
             android:textColor="@color/radiobutton_textcolor"
-            android:textSize="@dimen/dp_40"
+            android:textSize="@dimen/dp_36"
             android:textStyle="bold" />
 
         <View
-            android:layout_width="0.5px"
+            android:layout_width="1px"
             android:layout_height="@dimen/dp_42"
-            android:background="#757575" />
+            android:background="#CE757575" />
 
         <RadioButton
             android:id="@+id/rbSurroundingEvent"
@@ -45,17 +46,16 @@
             android:layout_height="match_parent"
             android:button="@null"
             android:gravity="center"
-            android:paddingStart="@dimen/dp_40"
-            android:paddingEnd="@dimen/dp_40"
+            android:paddingStart="@dimen/dp_35"
+            android:paddingEnd="@dimen/dp_35"
             android:text="周边事件"
             android:textColor="@color/radiobutton_textcolor"
-            android:textSize="@dimen/dp_40"
-            android:textStyle="bold" />
+            android:textSize="@dimen/dp_36" />
 
         <View
-            android:layout_width="0.5px"
+            android:layout_width="1px"
             android:layout_height="@dimen/dp_42"
-            android:background="#757575" />
+            android:background="#CE757575" />
 
         <RadioButton
             android:id="@+id/rbShareEvents"
@@ -63,12 +63,11 @@
             android:layout_height="match_parent"
             android:button="@null"
             android:gravity="center"
-            android:paddingStart="@dimen/dp_40"
-            android:paddingEnd="@dimen/dp_40"
+            android:paddingStart="@dimen/dp_35"
+            android:paddingEnd="@dimen/dp_35"
             android:text="我的分享"
             android:textColor="@color/radiobutton_textcolor"
-            android:textSize="@dimen/dp_40"
-            android:textStyle="bold" />
+            android:textSize="@dimen/dp_36" />
     </RadioGroup>
 
     <androidx.viewpager2.widget.ViewPager2
@@ -85,18 +84,18 @@
 
     <ImageView
         android:id="@+id/btnHidePanels"
-        android:layout_width="@dimen/dp_88"
-        android:layout_height="@dimen/dp_88"
-        android:layout_marginRight="28px"
+        android:layout_width="@dimen/dp_79"
+        android:layout_height="@dimen/dp_79"
+        android:layout_marginRight="@dimen/dp_50"
         android:background="@drawable/v2x_panel_close"
         app:layout_constraintBottom_toBottomOf="@+id/rgTabSelect"
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toTopOf="@+id/rgTabSelect" />
 
-    <!--    <View-->
-    <!--        android:layout_width="match_parent"-->
-    <!--        android:layout_height="58px"-->
-    <!--        android:background="@drawable/v2x_shadow_shape_view"-->
-    <!--        app:layout_constraintBottom_toBottomOf="parent" />-->
+<!--        <View-->
+<!--            android:layout_width="match_parent"-->
+<!--            android:layout_height="58px"-->
+<!--            android:background="@drawable/v2x_shadow_shape_view"-->
+<!--            app:layout_constraintBottom_toBottomOf="parent" />-->
 
 </androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -13,27 +13,27 @@
         tools:visibility="visible" />
 
     <LinearLayout
-        android:orientation="vertical"
         android:id="@+id/clHistoryList"
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        android:paddingStart="@dimen/dp_48"
+        android:paddingEnd="@dimen/dp_48">
 
         <TextView
             android:id="@+id/tvMessage"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:paddingStart="@dimen/dp_60"
-            android:paddingBottom="@dimen/dp_27"
             android:text="今日出行遇到的交通事件"
             android:textColor="@color/v2x_FFF_333"
             android:textSize="@dimen/dp_36"
-            android:textStyle="bold"
             app:layout_scrollFlags="scroll|enterAlways" />
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/recyclerView"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
+            android:layout_marginTop="@dimen/dp_27"
             android:overScrollMode="never"
             app:layout_behavior="@string/appbar_scrolling_view_behavior"
             tools:listitem="@layout/item_v2x_illegal_parking" />

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

@@ -27,8 +27,9 @@
 
     <RelativeLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_marginTop="@dimen/share_empty_btn_padding">
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/share_empty_btn_padding"
+        android:paddingBottom="@dimen/dp_10">
 
         <Button
             android:id="@+id/share_event_button"
@@ -38,6 +39,7 @@
             android:layout_toLeftOf="@id/center"
             android:background="@drawable/v2x_bkg_dark_light_same"
             android:clickable="true"
+            android:gravity="center"
             android:onClick="shareEventAction"
             android:text="去分享"
             android:textColor="@color/v2x_FFF_333"
@@ -55,6 +57,7 @@
             android:layout_height="@dimen/v2x_share_btn_height"
             android:layout_toRightOf="@id/center"
             android:background="@drawable/v2xt_dw_common_corner_bkg_light"
+            android:gravity="center"
             android:text="刷新"
             android:textColor="#FFFFFF"
             android:textSize="@dimen/dp_32" />

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

@@ -13,7 +13,7 @@
         android:id="@+id/road_case_style"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="20px"
+        android:layout_marginLeft="@dimen/dp_20"
         android:layout_marginTop="@dimen/dp_24"
         android:background="@drawable/bg_v2x_event_type_read"
         android:gravity="center"
@@ -76,7 +76,7 @@
         android:layout_toLeftOf="@id/road_case_uselful"
         android:ellipsize="end"
         android:gravity="left"
-        android:layout_marginTop="@dimen/dp_24"
+        android:layout_marginTop="@dimen/dp_12"
         android:lines="1"
         android:text="东城区北三环附近维多欧美"
         android:textColor="@color/v2x_FFF_333"
@@ -88,7 +88,7 @@
         android:layout_height="wrap_content"
         android:layout_below="@id/road_case_address"
         android:layout_alignLeft="@id/road_case_style"
-        android:layout_marginTop="@dimen/dp_10"
+        android:layout_marginTop="@dimen/dp_3"
         android:layout_marginBottom="@dimen/dp_24"
         android:alpha="0.5"
         android:gravity="left"

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

@@ -2,24 +2,23 @@
 
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/loading_liner_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <ImageView
+    <ProgressBar
         android:id="@+id/loading_imageview"
         android:layout_width="@dimen/v2x_loading_ani_width"
         android:layout_height="@dimen/v2x_loading_ani_width"
         android:layout_alignParentTop="true"
         android:layout_centerHorizontal="true"
         android:layout_marginTop="60px"
-        android:background="@drawable/v_to_x_loading_car0000"
+        android:indeterminateTint="#256BFF"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintVertical_bias="0.5"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.5" />
 
     <TextView
         android:id="@+id/loading_text"
@@ -29,9 +28,9 @@
         android:layout_centerHorizontal="true"
         android:layout_gravity="top|center"
         android:alpha="0.7"
-        android:paddingTop="14px"
+        android:paddingTop="@dimen/dp_14"
         android:text="正在获取信息…"
-        android:textColor="#FFFFFF"
+        android:textColor="@color/v2x_FFF_666"
         android:textSize="@dimen/dp_34"
         app:layout_constraintBottom_toBottomOf="@+id/loading_imageview"
         app:layout_constraintEnd_toEndOf="parent"
@@ -46,6 +45,7 @@
         android:layout_gravity="top|center"
         android:layout_marginTop="@dimen/shaer_refresh_padding"
         android:background="@drawable/v2xt_dw_common_corner_bkg_light"
+        android:gravity="center"
         android:text="刷新"
         android:textColor="#FFFFFF"
         android:textSize="@dimen/dp_32"

modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml

@@ -39,10 +39,10 @@
     <dimen name="module_v2x_surrounding_empty_bt_width">150px</dimen>
     <dimen name="module_v2x_surrounding_empty_bt_height">48px</dimen>
     <dimen name="module_v2x_surrounding_empty_bt_margin_top">32px</dimen>
-    <dimen name="module_v2x_surrounding_root_margin_left">10px</dimen>
-    <dimen name="module_v2x_surrounding_margin_left">10px</dimen>
+    <dimen name="module_v2x_surrounding_root_margin_left">28px</dimen>
+    <dimen name="module_v2x_surrounding_margin_left">28px</dimen>
     <dimen name="module_v2x_surrounding_empty_image_height">190px</dimen>
-    <dimen name="module_v2x_surrounding_item_height">173px</dimen>
+    <dimen name="module_v2x_surrounding_item_height">170px</dimen>
     <dimen name="module_v2x_surrounding_item_bottom">43px</dimen>
     <dimen name="module_v2x_surrounding_item_bottom_image_height">26px</dimen>
     <dimen name="module_v2x_surrounding_item_marigin_left">12px</dimen>
@@ -60,7 +60,7 @@
     <dimen name="module_v2x_panel_width">82px</dimen>
     <dimen name="module_v2x_panel_icon_cor">16px</dimen>
     <dimen name="share_empty_icon_width">117px</dimen>
-    <dimen name="v2x_loading_ani_width">200px</dimen>
+    <dimen name="v2x_loading_ani_width">100px</dimen>
     <dimen name="v2x_share_btn_width">150px</dimen>
     <dimen name="v2x_share_btn_height">48px</dimen>
     <dimen name="v2x_index_rating_top">17px</dimen>
@@ -73,5 +73,7 @@
     <dimen name="share_btn_middle_padding">29px</dimen>
     <dimen name="v2x_panel_btn_translationY">-8px</dimen>
 
+    <dimen name="module_v2x_panel_tab_height">84px</dimen>
+
 
 </resources>

modules/mogo-module-v2x/src/main/res/values-xhdpi-1920x1000/dimens.xml

@@ -23,7 +23,7 @@
 
     <dimen name="module_v2x_history_event_icon_size">80px</dimen>
 
-    <dimen name="module_v2x_surrounding_item_bottom_size">10px</dimen>
+    <dimen name="module_v2x_surrounding_item_bottom_size">15px</dimen>
     <dimen name="module_v2x_map_left">550px</dimen>
     <dimen name="module_v2x_map_top">200px</dimen>
     <dimen name="module_v2x_map_right">200px</dimen>
@@ -36,8 +36,8 @@
     <dimen name="module_v2x_surrounding_empty_bt_width">270px</dimen>
     <dimen name="module_v2x_surrounding_empty_bt_height">86px</dimen>
     <dimen name="module_v2x_surrounding_empty_bt_margin_top">58px</dimen>
-    <dimen name="module_v2x_surrounding_root_margin_left">10px</dimen>
-    <dimen name="module_v2x_surrounding_margin_left">10px</dimen>
+    <dimen name="module_v2x_surrounding_root_margin_left">48px</dimen>
+    <dimen name="module_v2x_surrounding_margin_left">48px</dimen>
     <dimen name="module_v2x_surrounding_empty_image_height">349px</dimen>
     <dimen name="module_v2x_surrounding_item_height">306px</dimen>
     <dimen name="module_v2x_surrounding_item_bottom">77px</dimen>
@@ -54,7 +54,8 @@
     <dimen name="module_v2x_surrounding_item_bottom_right_textsize">28px</dimen>
     <dimen name="module_v2x_des_index_width">16px</dimen>
     <dimen name="module_v2x_des_index_height">42px</dimen>
-    <dimen name="module_v2x_panel_cor">16px</dimen>
     <dimen name="module_v2x_panel_width">120px</dimen>
 
+    <dimen name="module_v2x_panel_tab_height">158px</dimen>
+
 </resources>

modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml

@@ -24,7 +24,7 @@
 
     <dimen name="module_v2x_history_event_icon_size">80px</dimen>
 
-    <dimen name="module_v2x_surrounding_item_bottom_size">10px</dimen>
+    <dimen name="module_v2x_surrounding_item_bottom_size">15px</dimen>
     <dimen name="module_v2x_map_left">550px</dimen>
     <dimen name="module_v2x_map_top">200px</dimen>
     <dimen name="module_v2x_map_right">200px</dimen>
@@ -37,8 +37,8 @@
     <dimen name="module_v2x_surrounding_empty_bt_width">270px</dimen>
     <dimen name="module_v2x_surrounding_empty_bt_height">86px</dimen>
     <dimen name="module_v2x_surrounding_empty_bt_margin_top">58px</dimen>
-    <dimen name="module_v2x_surrounding_root_margin_left">10px</dimen>
-    <dimen name="module_v2x_surrounding_margin_left">10px</dimen>
+    <dimen name="module_v2x_surrounding_root_margin_left">48px</dimen>
+    <dimen name="module_v2x_surrounding_margin_left">48px</dimen>
     <dimen name="module_v2x_surrounding_empty_image_height">349px</dimen>
     <dimen name="module_v2x_surrounding_item_height">306px</dimen>
     <dimen name="module_v2x_surrounding_item_bottom">77px</dimen>
@@ -58,7 +58,7 @@
     <dimen name="module_v2x_panel_icon_cor">30px</dimen>
     <dimen name="module_v2x_panel_width">140px</dimen>
     <dimen name="share_empty_icon_width">219px</dimen>
-    <dimen name="v2x_loading_ani_width">400px</dimen>
+    <dimen name="v2x_loading_ani_width">200px</dimen>
     <dimen name="v2x_share_btn_width">281px</dimen>
     <dimen name="v2x_share_btn_height">90px</dimen>
     <dimen name="v2x_index_rating_top">28px</dimen>
@@ -72,5 +72,7 @@
     <dimen name="v2x_panel_btn_translationY">-10px</dimen>
     <dimen name="v2x_panel_btn_image_width">114px</dimen>
 
+    <dimen name="module_v2x_panel_tab_height">158px</dimen>
+
 
 </resources>

modules/mogo-module-v2x/src/main/res/values/colors.xml

@@ -9,7 +9,7 @@
     <color name="transparent_white_30">#B3FFFFFF</color>
     <color name="surrounding_item_bottom_color">#1F2131</color>
     <color name="panel_shadow_shape_color">#10121E</color>
-    <color name="share_event_no_more_color">#99FFFFFF</color>
+    <color name="share_event_no_more_color">#4BFFFFFF</color>
     <color name="v2x_FFF_999">#FFFFFF</color>
     <color name="v2x_FFF_333">#FFFFFF</color>
     <color name="v2x_ff6163_333">#ff616381</color>
@@ -18,5 +18,4 @@
     <color name="v2x_000_FFF">#000000</color>
     <color name="v2x_FFF_2896FF">#FFF</color>
 
-
 </resources>

modules/mogo-module-v2x/src/main/res/values/dimens.xml

@@ -39,10 +39,10 @@
     <dimen name="module_v2x_surrounding_empty_bt_width">150px</dimen>
     <dimen name="module_v2x_surrounding_empty_bt_height">48px</dimen>
     <dimen name="module_v2x_surrounding_empty_bt_margin_top">32px</dimen>
-    <dimen name="module_v2x_surrounding_root_margin_left">10px</dimen>
-    <dimen name="module_v2x_surrounding_margin_left">10px</dimen>
+    <dimen name="module_v2x_surrounding_root_margin_left">28px</dimen>
+    <dimen name="module_v2x_surrounding_margin_left">28px</dimen>
     <dimen name="module_v2x_surrounding_empty_image_height">190px</dimen>
-    <dimen name="module_v2x_surrounding_item_height">173px</dimen>
+    <dimen name="module_v2x_surrounding_item_height">170px</dimen>
     <dimen name="module_v2x_surrounding_item_bottom">43px</dimen>
     <dimen name="module_v2x_surrounding_item_bottom_image_height">26px</dimen>
     <dimen name="module_v2x_surrounding_item_marigin_left">12px</dimen>
@@ -60,7 +60,7 @@
     <dimen name="module_v2x_panel_width">82px</dimen>
     <dimen name="module_v2x_panel_icon_cor">16px</dimen>
     <dimen name="share_empty_icon_width">117px</dimen>
-    <dimen name="v2x_loading_ani_width">200px</dimen>
+    <dimen name="v2x_loading_ani_width">100px</dimen>
     <dimen name="v2x_share_btn_width">150px</dimen>
     <dimen name="v2x_share_btn_height">48px</dimen>
     <dimen name="v2x_index_rating_top">17px</dimen>
@@ -74,5 +74,7 @@
     <dimen name="v2x_panel_btn_translationY">-8px</dimen>
 
 
+    <dimen name="module_v2x_panel_tab_height">84px</dimen>
+
 
 </resources>