[add] 取消求助黑白模式.9图

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

@@ -9,7 +9,7 @@
     <include
         layout="@layout/module_ext_layout_extensions"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"/>
+        android:layout_height="wrap_content" />
 
     <include
         layout="@layout/module_ext_include_seeking_help_notice"
@@ -30,17 +30,17 @@
         android:id="@+id/module_entrance_id_buttons_container"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:orientation="vertical"
         android:layout_marginLeft="@dimen/module_common_shadow_width_pos"
         android:layout_marginBottom="@dimen/module_common_shadow_width_pos"
+        android:orientation="vertical"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintLeft_toLeftOf="parent">
 
         <TextView
             android:id="@+id/module_entrance_id_button1"
-            android:layout_width="@dimen/module_ext_navi_exit_width"
-            android:layout_height="@dimen/module_ext_navi_exit_height"
-            android:background="@drawable/module_ext_dw_common_corner_bkg"
+            android:layout_width="@dimen/module_ext_operation_panel_width"
+            android:layout_height="@dimen/module_ext_operation_panel_width"
+            android:background="@drawable/v2x_cancel_help"
             android:gravity="center"
             android:text="前方\n实况"
             android:textColor="@color/module_commons_FFF_333"
@@ -51,10 +51,10 @@
 
         <TextView
             android:id="@+id/module_entrance_id_button2"
-            android:layout_width="@dimen/module_ext_navi_exit_width"
-            android:layout_height="@dimen/module_ext_navi_exit_height"
+            android:layout_width="@dimen/module_ext_operation_panel_width"
+            android:layout_height="@dimen/module_ext_operation_panel_width"
             android:layout_marginTop="@dimen/module_entrance_id_button_marginTop"
-            android:background="@drawable/module_ext_dw_common_corner_bkg"
+            android:background="@drawable/v2x_cancel_help"
             android:gravity="center"
             android:text="取消\n求助"
             android:textColor="@color/module_commons_FFF_333"
@@ -71,7 +71,7 @@
             android:background="@drawable/module_ext_dw_common_corner_bkg"
             android:gravity="center"
             android:text="@string/module_ext_str_exit_navi"
-            android:textColor="#FFFFFF"
+            android:textColor="@color/module_commons_FFF_333"
             android:textSize="@dimen/module_ext_navi_exit_textSize"
             android:textStyle="bold"
             android:visibility="gone"
@@ -79,10 +79,12 @@
 
         <FrameLayout
             android:id="@+id/module_entrance_id_upload_road_condition"
-            android:layout_marginTop="@dimen/module_entrance_id_button_marginTop"
             android:layout_width="@dimen/module_ext_operation_panel_share_width"
             android:layout_height="@dimen/module_ext_operation_panel_share_height"
+            android:layout_marginLeft="@dimen/dp_8"
+            android:layout_marginTop="@dimen/module_entrance_id_button_marginTop"
             android:background="@drawable/module_ext_dw_upload_road_condition_bkg">
+
             <TextView
                 android:id="@+id/module_entrance_id_upload"
                 android:layout_width="match_parent"
@@ -110,15 +112,15 @@
 
     <FrameLayout
         android:id="@+id/module_ext_id_top_container_shader"
-        android:background="#7f000000"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:visibility="gone"/>
+        android:background="#7f000000"
+        android:visibility="gone" />
+
     <include
         layout="@layout/include_navi_info_panle"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        />
+        android:layout_height="wrap_content" />
 
     <TextView
         android:id="@+id/module_ext_id_north"
@@ -144,19 +146,19 @@
         android:id="@+id/module_ext_id_destination_online_car"
         android:layout_width="wrap_content"
         android:layout_height="@dimen/module_ext_button_height"
+        android:layout_marginLeft="@dimen/module_common_shadow_width_pos"
         android:layout_marginTop="@dimen/module_ext_camera_button_marginTop"
         android:background="@drawable/module_ext_dw_navi_info_panel_bkg"
         android:drawableLeft="@drawable/module_ext_destination_online_car_dw"
         android:drawablePadding="@dimen/module_ext_destination_online_car_drawablePadding"
         android:gravity="center_vertical"
+        android:paddingLeft="@dimen/module_ext_destination_online_car_paddingLeft"
+        android:paddingRight="@dimen/module_ext_destination_online_car_paddingRight"
         android:text="@string/module_ext_destination_online_car_text"
-        android:visibility="gone"
         android:textColor="@color/module_ext_color_voice_text"
         android:textSize="@dimen/module_ext_north_textSize"
         android:textStyle="bold"
-        android:paddingRight="@dimen/module_ext_destination_online_car_paddingRight"
-        android:layout_marginLeft="@dimen/module_common_shadow_width_pos"
-        android:paddingLeft="@dimen/module_ext_destination_online_car_paddingLeft"
+        android:visibility="gone"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/module_map_id_navi_bg"
         app:layout_goneMarginTop="@dimen/module_ext_north_goneMarginTop"
@@ -187,12 +189,12 @@
         android:id="@+id/module_ext_id_display_overview"
         android:layout_width="@dimen/module_ext_button_width"
         android:layout_height="@dimen/module_ext_button_height"
+        android:layout_marginLeft="@dimen/module_common_shadow_width_pos"
         android:layout_marginTop="@dimen/module_ext_camera_button_marginTop"
         android:background="@drawable/module_ext_dw_common_corner_bkg"
         android:gravity="center_horizontal"
         android:orientation="vertical"
         android:visibility="gone"
-        android:layout_marginLeft="@dimen/module_common_shadow_width_pos"
         app:layout_constraintLeft_toLeftOf="@+id/module_map_id_navi_bg"
         app:layout_constraintTop_toBottomOf="@+id/module_map_id_navi_bg"
         tools:visibility="gone">
@@ -268,6 +270,7 @@
         android:textSize="20sp"
         app:layout_constraintBottom_toTopOf="@id/btnShowTextTip"
         app:layout_constraintLeft_toLeftOf="parent" />
+
     <Button
         android:id="@+id/btnShowDrawableTipNoSize"
         android:layout_width="wrap_content"

modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/help/V2XSeekHelpButton.java

@@ -54,7 +54,6 @@ public class V2XSeekHelpButton implements IV2XButton {
             tv = V2XServiceManager.getMogoEntranceButtonController().getButton(ButtonIndex.BUTTON2);
             tv.setText("取消\n求助");
             tv.setVisibility(View.VISIBLE);
-            tv.setBackgroundResource(R.drawable.bg_v2x_cancel_help);
             tv.setOnClickListener(v -> {
                 //调用取消求助接口
                 // TODO: 2020/5/18 回调，显示对话框