Merge branch 'feature/v2.0.0' of gitlab.zhidaoauto.com:ecos/yycp-service/Launcher into feature/v2.0.0

modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/TopViewAnimHelper.java

@@ -208,6 +208,9 @@ public class TopViewAnimHelper {
                 // 顶部view还没有内容，需要整体下移
                 currentAnimatingView = view;
                 viewCaches.add(view);
+//                if (naviBg.getVisibility() == View.VISIBLE) {
+//                    tvNextRoad.setTextSize(getDimen(R.dimen.dp_34));
+//                }
                 topContainer.addView(view, params);
 
                 topContainer.setChildAddedListener(child -> {
@@ -219,7 +222,8 @@ public class TopViewAnimHelper {
 
                     constraintSet.clone(topMotionLayout);
 
-                    constraintSet.clear(R.id.module_entrance_id_top_container, ConstraintSet.BOTTOM);
+                    constraintSet.clear(R.id.module_entrance_id_top_container,
+                            ConstraintSet.BOTTOM);
                     constraintSet.connect(R.id.module_entrance_id_top_container, ConstraintSet.TOP,
                             R.id.module_entrance_id_top_motion_layout, ConstraintSet.TOP);
 //                if (CarSeries.getSeries() == CarSeries.CAR_SERIES_F80X) {
@@ -237,6 +241,10 @@ public class TopViewAnimHelper {
                         constraintSet.connect(tvNextRoad.getId(), ConstraintSet.LEFT,
                                 R.id.module_map_id_navi_next_info_turn_info, ConstraintSet.RIGHT,
                                 (int) topMotionLayout.getContext().getResources().getDimension(R.dimen.dp_46));
+
+                        constraintSet.connect(naviBg.getId(), ConstraintSet.TOP,
+                                R.id.module_entrance_id_top_motion_layout, ConstraintSet.TOP,
+                                (int) getDimen(R.dimen.dp_316));
                     }
                     constraintSet.applyTo(topMotionLayout);
                     ivTurnIcon.getLayoutParams().height =
@@ -312,6 +320,10 @@ public class TopViewAnimHelper {
                 // 顶部view仅剩一个view，需要整体上移
                 currentAnimatingView = view;
                 isTopViewOut = true;
+//                if (naviBg.getVisibility() == View.VISIBLE) {
+//                    tvNextRoad.setTextSize(getDimen(R.dimen
+//                    .module_ext_navi_info_panel_next_info_road_textSize));
+//                }
                 if (naviBg.getVisibility() == View.VISIBLE) {
                     remainDistanceGroup.setVisibility(View.VISIBLE);
                     remainTimeGroup.setVisibility(View.VISIBLE);
@@ -336,6 +348,8 @@ public class TopViewAnimHelper {
                     constraintSet.connect(tvNextRoad.getId(), ConstraintSet.LEFT,
                             tvNextDistance.getId(), ConstraintSet.LEFT,
                             0);
+                    constraintSet.connect(naviBg.getId(), ConstraintSet.TOP,
+                            R.id.module_entrance_id_top_motion_layout, ConstraintSet.TOP, 0);
                 }
                 constraintSet.applyTo(topMotionLayout);
 
@@ -381,6 +395,9 @@ public class TopViewAnimHelper {
 //            naviBg.getLayoutParams().height =
 //                    (int) topMotionLayout.getContext().getResources().getDimension(R.dimen
 //                    .module_ext_navi_info_panel_height);
+            constraintSet.connect(naviBg.getId(), ConstraintSet.TOP,
+                    R.id.module_entrance_id_top_motion_layout, ConstraintSet.TOP,
+                    0);
             constraintSet.applyTo(topMotionLayout);
             scene = Scene.NAVI_WITH_ROAD_EVENT;
         } else {
@@ -397,6 +414,9 @@ public class TopViewAnimHelper {
             constraintSet.connect(tvNextRoad.getId(), ConstraintSet.LEFT,
                     R.id.module_map_id_navi_next_info_turn_info, ConstraintSet.RIGHT,
                     (int) topMotionLayout.getContext().getResources().getDimension(R.dimen.dp_46));
+            constraintSet.connect(naviBg.getId(), ConstraintSet.TOP,
+                    R.id.module_entrance_id_top_motion_layout, ConstraintSet.TOP,
+                    (int) getDimen(R.dimen.dp_316));
 //            ivTurnIcon.getLayoutParams().height =
 //                    (int) getDimen(R.dimen.module_ext_navi_info_panel_turn_icon_small_height);
 //            ivTurnIcon.getLayoutParams().width =

modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml

@@ -33,7 +33,7 @@
         app:layout_constraintHorizontal_bias="0.501"
         app:layout_constraintLeft_toLeftOf="@id/module_entrance_id_top_container"
         app:layout_constraintRight_toRightOf="@id/module_entrance_id_top_container"
-        app:layout_constraintTop_toBottomOf="@id/module_entrance_id_top_container" />
+        app:layout_constraintTop_toTopOf="@id/module_entrance_id_top_motion_layout" />
 
     <ImageView
         android:id="@+id/module_map_id_navi_next_info_road_turn_icon"

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

@@ -89,7 +89,7 @@
     <dimen name="module_ext_navi_info_panel_next_info_distance_unit_marginLeft">12px</dimen>
     <dimen name="module_ext_navi_info_panel_next_info_distance_unit_marginBottom">10px</dimen>
     <dimen name="module_ext_navi_info_panel_next_info_distance_unit_textSize">40px</dimen>
-    <dimen name="module_ext_navi_info_panel_next_info_road_textSize">28px</dimen>
+    <dimen name="module_ext_navi_info_panel_next_info_road_textSize">34px</dimen>
     <dimen name="module_ext_navi_info_panel__arrive_destination_estimate_info_marginTop">24px</dimen>
     <dimen name="module_ext_navi_info_panel__arrive_destination_estimate_info_textSize">28px</dimen>
 

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

@@ -86,7 +86,7 @@
     <dimen name="module_ext_navi_info_panel_next_info_distance_unit_marginLeft">12px</dimen>
     <dimen name="module_ext_navi_info_panel_next_info_distance_unit_marginBottom">10px</dimen>
     <dimen name="module_ext_navi_info_panel_next_info_distance_unit_textSize">40px</dimen>
-    <dimen name="module_ext_navi_info_panel_next_info_road_textSize">28px</dimen>
+    <dimen name="module_ext_navi_info_panel_next_info_road_textSize">34px</dimen>
     <dimen name="module_ext_navi_info_panel__arrive_destination_estimate_info_marginTop">24px</dimen>
     <dimen name="module_ext_navi_info_panel__arrive_destination_estimate_info_textSize">28px</dimen>
 

modules/mogo-module-share/src/main/java/com/mogo/module/share/dialog/LaucherShareDialog.java

@@ -45,17 +45,17 @@ public class LaucherShareDialog implements View.OnClickListener {
 
     private boolean isShown = false;
 
-    private ImageView ivBlock;
-    private ImageView ivTrafficCheck;
-    private ImageView ivClosure;
-    private ImageView ivNeedHelp;
+    private TextView tvBlock;
+    private TextView tvTrafficCheck;
+    private TextView tvClosure;
+    private TextView tvNeedHelp;
 
-    private ImageView ivAccident;
-    private ImageView ivRealTimeTraffic;
-    private ImageView ivStagnantWater;
-    private ImageView ivRoadIcy;
-    private ImageView ivDenseFog;
-    private ImageView ivConstruction;
+    private TextView tvAccident;
+    private TextView tvRealTimeTraffic;
+    private TextView tvStagnantWater;
+    private TextView tvRoadIcy;
+    private TextView tvDenseFog;
+    private TextView tvConstruction;
 
     private Context mContext;
     private IMogoAnalytics mAnalytics;
@@ -83,89 +83,89 @@ public class LaucherShareDialog implements View.OnClickListener {
         });
 
 
-        ivBlock = body.findViewById(R.id.ivBlock);
-        ivTrafficCheck = body.findViewById(R.id.ivTrafficCheck);
-        ivClosure = body.findViewById(R.id.ivClosure);
-        ivNeedHelp = body.findViewById(R.id.ivSeekHelp);
+        tvBlock = body.findViewById(R.id.tvBlock);
+        tvTrafficCheck = body.findViewById(R.id.tvTrafficCheck);
+        tvClosure = body.findViewById(R.id.tvClosure);
+        tvNeedHelp = body.findViewById(R.id.tvSeekHelp);
 
-        ivAccident = body.findViewById(R.id.ivAccident);
-        ivRealTimeTraffic = body.findViewById(R.id.ivRealTimeTraffic);
-        ivStagnantWater = body.findViewById(R.id.ivStagnantWater);
-        ivRoadIcy = body.findViewById(R.id.ivRoadIcy);
-        ivDenseFog = body.findViewById(R.id.ivDenseFog);
-        ivConstruction = body.findViewById(R.id.ivConstruction);
+        tvAccident = body.findViewById(R.id.tvAccident);
+        tvRealTimeTraffic = body.findViewById(R.id.tvRealTimeTraffic);
+        tvStagnantWater = body.findViewById(R.id.tvStagnantWater);
+        tvRoadIcy = body.findViewById(R.id.tvRoadIcy);
+        tvDenseFog = body.findViewById(R.id.tvDenseFog);
+        tvConstruction = body.findViewById(R.id.tvConstruction);
     }
 
 
     private void initListener() {
-        ivBlock.setOnClickListener(this);
-        ivNeedHelp.setOnClickListener(this);
-        ivTrafficCheck.setOnClickListener(this);
-        ivClosure.setOnClickListener(this);
+        tvBlock.setOnClickListener(this);
+        tvNeedHelp.setOnClickListener(this);
+        tvTrafficCheck.setOnClickListener(this);
+        tvClosure.setOnClickListener(this);
 
-        ivAccident.setOnClickListener(this);
-        ivRealTimeTraffic.setOnClickListener(this);
-        ivStagnantWater.setOnClickListener(this);
-        ivRoadIcy.setOnClickListener(this);
-        ivDenseFog.setOnClickListener(this);
-        ivConstruction.setOnClickListener(this);
+        tvAccident.setOnClickListener(this);
+        tvRealTimeTraffic.setOnClickListener(this);
+        tvStagnantWater.setOnClickListener(this);
+        tvRoadIcy.setOnClickListener(this);
+        tvDenseFog.setOnClickListener(this);
+        tvConstruction.setOnClickListener(this);
     }
 
     @Override
     public void onClick(View view) {
         int id = view.getId();
-        if (id == R.id.ivBlock) {
+        if (id == R.id.tvBlock) {
             //拥堵
             Logger.d(TAG,"点击拥堵");
             traceTanluData("1");
             sendShareReceiver(ShareConstants.TYPE_BLOCK);
             traceTypeData("1");
             dismiss();
-        } else if (id == R.id.ivTrafficCheck) {
+        } else if (id == R.id.tvTrafficCheck) {
             //交通检查
             Logger.d(TAG,"点击交通检查");
             traceData("1");
             sendShareReceiver(ShareConstants.TYPE_TRAFFIC_CHECK);
             traceTypeData("3");
             dismiss();
-        } else if (id == R.id.ivClosure) {
+        } else if (id == R.id.tvClosure) {
             //封路
             Logger.d(TAG,"点击封路");
             traceData("1");
             sendShareReceiver(ShareConstants.TYPE_CLOSURE);
             traceTypeData("4");
             dismiss();
-        } else if (id == R.id.ivSeekHelp) {
+        } else if (id == R.id.tvSeekHelp) {
             // 故障求助
             Logger.d(TAG,"点击求助");
             SeekHelpManager.INSTANCE.seekHelp(mContext,seekListener,true);
             dismiss();
-        } else if (id == R.id.ivAccident) {
+        } else if (id == R.id.tvAccident) {
             // 事故
             Logger.d(TAG,"点击事故");
             sendShareReceiver(ShareConstants.TYPE_ACCIDENT);
             dismiss();
-        } else if (id == R.id.ivConstruction) {
+        } else if (id == R.id.tvConstruction) {
             // 道路施工
             Logger.d(TAG,"点击道路施工");
             sendShareReceiver(ShareConstants.TYPE_ROAD_CONSTRUCTION);
             dismiss();
-        } else if (id == R.id.ivRealTimeTraffic) {
+        } else if (id == R.id.tvRealTimeTraffic) {
             // 实时路况
             Logger.d(TAG,"点击实时路况");
             sendShareReceiver(ShareConstants.TYPE_REAL_TIME_TRAFFIC);
             dismiss();
-        } else if (id == R.id.ivStagnantWater) {
+        } else if (id == R.id.tvStagnantWater) {
             // 道路积水
             Logger.d(TAG,"点击道路积水");
             sendShareReceiver(ShareConstants.TYPE_STAGNANT_WATER);
             dismiss();
-        } else if (id == R.id.ivRoadIcy) {
+        } else if (id == R.id.tvRoadIcy) {
             // 道路结冰
             Logger.d(TAG,"点击道路结冰");
             sendShareReceiver(ShareConstants.TYPE_ROAD_ICY);
             dismiss();
-        } else if (id == R.id.ivDenseFog) {
+        } else if (id == R.id.tvDenseFog) {
             // 浓雾
             Logger.d(TAG,"点击浓雾");
             sendShareReceiver(ShareConstants.TYPE_DENSE_FOG);

modules/mogo-module-share/src/main/res/layout/launcher_dialog_share_2.xml

@@ -24,249 +24,148 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/share_module_title_margin_top"
         android:text="我要分享"
+        android:textColor="@color/white"
         android:drawableLeft="@drawable/module_share_title_icon"
         android:drawableRight="@drawable/module_share_title_icon"
         android:drawablePadding="@dimen/dp_40"
-        android:textColor="@color/white"
         android:textSize="@dimen/share_module_title_content"
         android:textStyle="bold"
         app:layout_constraintEnd_toEndOf="@+id/vBg"
         app:layout_constraintStart_toStartOf="@+id/vBg"
         app:layout_constraintTop_toTopOf="@+id/vBg" />
 
-    <ImageView
-        android:id="@+id/ivBlock"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_78"
-        android:background="@drawable/module_share_btn_bg"
-        android:scaleType="center"
-        android:src="@drawable/share_block_up"
-        app:layout_constraintLeft_toLeftOf="@+id/tvBlock"
-        app:layout_constraintRight_toRightOf="@+id/tvBlock"
-        app:layout_constraintTop_toBottomOf="@+id/btn_share_title" />
-
     <TextView
         android:id="@+id/tvBlock"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/dp_164"
-        android:layout_marginTop="@dimen/dp_30"
+        android:drawableTop="@drawable/share_block_up"
         android:text="拥堵"
-        android:textColor="#fff"
         android:textSize="@dimen/dp_32"
+        android:textColor="#fff"
         app:layout_constraintHorizontal_chainStyle="spread_inside"
-        app:layout_constraintLeft_toLeftOf="@+id/vBg"
+        android:gravity="center"
+        app:layout_constraintTop_toBottomOf="@+id/btn_share_title"
         app:layout_constraintRight_toLeftOf="@+id/tvTrafficCheck"
-        app:layout_constraintTop_toBottomOf="@+id/ivBlock" />
-
-    <ImageView
-        android:id="@+id/ivTrafficCheck"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="@dimen/dp_30"
-        android:background="@drawable/module_share_btn_bg"
-        android:scaleType="center"
-        android:src="@drawable/share_traffic_check"
-        app:layout_constraintBottom_toTopOf="@id/tvTrafficCheck"
-        app:layout_constraintLeft_toLeftOf="@+id/tvTrafficCheck"
-        app:layout_constraintRight_toRightOf="@+id/tvTrafficCheck" />
-
+        app:layout_constraintLeft_toLeftOf="@+id/vBg"
+        android:layout_marginStart="@dimen/dp_116"
+        android:layout_marginTop="@dimen/dp_78"
+        android:drawablePadding="@dimen/dp_30" />
     <TextView
         android:id="@+id/tvTrafficCheck"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:gravity="center"
+        android:drawableTop="@drawable/share_traffic_check"
         android:text="交通检查"
-        android:textColor="#fff"
         android:textSize="@dimen/dp_32"
+        android:textColor="#fff"
+        android:gravity="center"
+        app:layout_constraintTop_toTopOf="@+id/tvBlock"
         app:layout_constraintLeft_toRightOf="@id/tvBlock"
         app:layout_constraintRight_toLeftOf="@+id/tvClosure"
-        app:layout_constraintTop_toTopOf="@+id/tvBlock" />
-
-    <ImageView
-        android:id="@+id/ivClosure"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="@dimen/dp_30"
-        android:background="@drawable/module_share_btn_bg"
-        android:scaleType="center"
-        android:src="@drawable/share_road_closure"
-        app:layout_constraintBottom_toTopOf="@id/tvClosure"
-        app:layout_constraintLeft_toLeftOf="@+id/tvClosure"
-        app:layout_constraintRight_toRightOf="@+id/tvClosure" />
-
+        android:drawablePadding="@dimen/dp_30" />
     <TextView
         android:id="@+id/tvClosure"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:gravity="center"
+        android:drawableTop="@drawable/share_road_closure"
         android:text="封路"
-        android:textColor="#fff"
         android:textSize="@dimen/dp_32"
+        app:layout_constraintTop_toTopOf="@+id/tvBlock"
         app:layout_constraintLeft_toRightOf="@+id/tvTrafficCheck"
         app:layout_constraintRight_toLeftOf="@+id/tvAccident"
-        app:layout_constraintTop_toTopOf="@+id/tvBlock" />
-
-    <ImageView
-        android:id="@+id/ivAccident"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="@dimen/dp_30"
-        android:background="@drawable/module_share_btn_bg"
-        android:scaleType="center"
-        android:src="@drawable/share_accident"
-        app:layout_constraintBottom_toTopOf="@id/tvAccident"
-        app:layout_constraintLeft_toLeftOf="@+id/tvAccident"
-        app:layout_constraintRight_toRightOf="@+id/tvAccident" />
-
+        android:textColor="#fff"
+        android:gravity="center"
+        android:drawablePadding="@dimen/dp_30" />
     <TextView
         android:id="@+id/tvAccident"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:gravity="center"
+        android:drawableTop="@drawable/share_accident"
         android:text="事故"
-        android:textColor="#fff"
         android:textSize="@dimen/dp_32"
+        app:layout_constraintTop_toTopOf="@+id/tvBlock"
         app:layout_constraintLeft_toRightOf="@+id/tvClosure"
         app:layout_constraintRight_toLeftOf="@+id/tvConstruction"
-        app:layout_constraintTop_toTopOf="@+id/tvBlock" />
-
-    <ImageView
-        android:id="@+id/ivConstruction"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="@dimen/dp_30"
-        android:background="@drawable/module_share_btn_bg"
-        android:scaleType="center"
-        android:src="@drawable/share_road_construction"
-        app:layout_constraintBottom_toTopOf="@id/tvConstruction"
-        app:layout_constraintLeft_toLeftOf="@+id/tvConstruction"
-        app:layout_constraintRight_toRightOf="@+id/tvConstruction" />
-
+        android:textColor="#fff"
+        android:gravity="center"
+        android:drawablePadding="@dimen/dp_30" />
     <TextView
         android:id="@+id/tvConstruction"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginEnd="@dimen/dp_132"
-        android:gravity="center"
+        android:drawableTop="@drawable/share_road_construction"
         android:text="施工"
-        android:textColor="#fff"
         android:textSize="@dimen/dp_32"
+        app:layout_constraintTop_toTopOf="@+id/tvBlock"
         app:layout_constraintLeft_toRightOf="@+id/tvAccident"
         app:layout_constraintRight_toRightOf="@+id/vBg"
-        app:layout_constraintTop_toTopOf="@+id/tvBlock" />
-
-    <ImageView
-        android:id="@+id/ivRealTimeTraffic"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_62"
-        android:background="@drawable/module_share_btn_bg"
-        android:scaleType="center"
-        android:src="@drawable/share_real_time_traffic"
-        app:layout_constraintLeft_toLeftOf="@+id/tvBlock"
-        app:layout_constraintRight_toRightOf="@+id/tvBlock"
-        app:layout_constraintTop_toBottomOf="@+id/tvBlock" />
-
+        android:layout_marginEnd="@dimen/dp_116"
+        android:textColor="#fff"
+        android:gravity="center"
+        android:drawablePadding="@dimen/dp_30" />
     <TextView
         android:id="@+id/tvRealTimeTraffic"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_30"
-        android:gravity="center"
+        android:drawableTop="@drawable/share_real_time_traffic"
         android:text="实时路况"
-        android:textColor="#fff"
         android:textSize="@dimen/dp_32"
-        app:layout_constraintLeft_toLeftOf="@+id/ivRealTimeTraffic"
-        app:layout_constraintRight_toRightOf="@+id/ivRealTimeTraffic"
-        app:layout_constraintTop_toBottomOf="@+id/ivRealTimeTraffic" />
-    <ImageView
-        android:id="@+id/ivSeekHelp"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="@dimen/dp_30"
-        android:background="@drawable/module_share_btn_bg"
-        android:scaleType="center"
-        android:src="@drawable/share_seek_help"
-        app:layout_constraintLeft_toLeftOf="@+id/tvSeekHelp"
-        app:layout_constraintRight_toRightOf="@+id/tvSeekHelp"
-        app:layout_constraintBottom_toTopOf="@+id/tvSeekHelp"/>
+        android:textColor="#fff"
+        android:gravity="center"
+        app:layout_constraintTop_toBottomOf="@+id/tvBlock"
+        app:layout_constraintLeft_toLeftOf="@+id/tvBlock"
+        android:layout_marginTop="@dimen/dp_62"
+        android:drawablePadding="@dimen/dp_30" />
     <TextView
         android:id="@+id/tvSeekHelp"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:gravity="center"
+        android:drawableTop="@drawable/share_seek_help"
         android:text="故障求助"
-        android:textColor="#fff"
         android:textSize="@dimen/dp_32"
+        android:textColor="#fff"
+        android:gravity="center"
+        app:layout_constraintTop_toBottomOf="@+id/tvTrafficCheck"
         app:layout_constraintLeft_toLeftOf="@+id/tvTrafficCheck"
-        app:layout_constraintRight_toRightOf="@+id/tvTrafficCheck"
-        app:layout_constraintTop_toTopOf="@id/tvRealTimeTraffic"/>
-    <ImageView
-        android:id="@+id/ivStagnantWater"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="@dimen/dp_30"
-        android:background="@drawable/module_share_btn_bg"
-        android:scaleType="center"
-        android:src="@drawable/share_stagnant_water"
-        app:layout_constraintLeft_toLeftOf="@+id/tvStagnantWater"
-        app:layout_constraintRight_toRightOf="@+id/tvStagnantWater"
-        app:layout_constraintBottom_toTopOf="@+id/tvStagnantWater"/>
+        android:layout_marginTop="@dimen/dp_62"
+        android:drawablePadding="@dimen/dp_30" />
     <TextView
         android:id="@+id/tvStagnantWater"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:gravity="center"
+        android:drawableTop="@drawable/share_stagnant_water"
         android:text="道路积水"
-        android:textColor="#fff"
         android:textSize="@dimen/dp_32"
+        android:textColor="#fff"
+        android:gravity="center"
+        app:layout_constraintTop_toBottomOf="@+id/tvClosure"
         app:layout_constraintLeft_toLeftOf="@+id/tvClosure"
-        app:layout_constraintRight_toRightOf="@+id/tvClosure"
-        app:layout_constraintTop_toTopOf="@+id/tvSeekHelp"/>
-    <ImageView
-        android:id="@+id/ivRoadIcy"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="@dimen/dp_30"
-        android:background="@drawable/module_share_btn_bg"
-        android:scaleType="center"
-        android:src="@drawable/share_road_icy"
-        app:layout_constraintLeft_toLeftOf="@+id/tvRoadIcy"
-        app:layout_constraintRight_toRightOf="@+id/tvRoadIcy"
-        app:layout_constraintBottom_toTopOf="@+id/tvRoadIcy"/>
+        android:layout_marginTop="@dimen/dp_62"
+        android:drawablePadding="@dimen/dp_30" />
     <TextView
         android:id="@+id/tvRoadIcy"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:gravity="center"
+        android:drawableTop="@drawable/share_road_icy"
         android:text="道路积冰"
-        android:textColor="#fff"
         android:textSize="@dimen/dp_32"
+        android:textColor="#fff"
+        app:layout_constraintTop_toBottomOf="@+id/tvAccident"
         app:layout_constraintLeft_toLeftOf="@+id/tvAccident"
-        app:layout_constraintRight_toRightOf="@+id/tvAccident"
-        app:layout_constraintTop_toTopOf="@+id/tvStagnantWater"/>
-    <ImageView
-        android:id="@+id/ivDenseFog"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="@dimen/dp_30"
-        android:background="@drawable/module_share_btn_bg"
-        android:scaleType="center"
-        android:src="@drawable/share_dense_fog"
-        app:layout_constraintLeft_toLeftOf="@+id/tvDenseFog"
-        app:layout_constraintRight_toRightOf="@+id/tvDenseFog"
-        app:layout_constraintBottom_toTopOf="@+id/tvDenseFog"/>
+        android:layout_marginTop="@dimen/dp_62"
+        android:gravity="center"
+        android:drawablePadding="@dimen/dp_30" />
     <TextView
         android:id="@+id/tvDenseFog"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:gravity="center"
+        android:drawableTop="@drawable/share_dense_fog"
         android:text="浓雾"
-        android:textColor="#fff"
         android:textSize="@dimen/dp_32"
+        android:textColor="#fff"
+        app:layout_constraintTop_toBottomOf="@+id/tvConstruction"
         app:layout_constraintLeft_toLeftOf="@+id/tvConstruction"
-        app:layout_constraintRight_toRightOf="@+id/tvConstruction"
-        app:layout_constraintTop_toTopOf="@+id/tvRoadIcy"/>
+        android:layout_marginTop="@dimen/dp_62"
+        android:gravity="center"
+        android:drawablePadding="@dimen/dp_30" />
 </androidx.constraintlayout.widget.ConstraintLayout>