diff --git a/.idea/misc.xml b/.idea/misc.xml index 21e99e2dc0..cd77a1f062 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -4,7 +4,7 @@ - + \ No newline at end of file diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_share_empty_light.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_share_empty_light.png deleted file mode 100644 index 03da771490..0000000000 Binary files a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_share_empty_light.png and /dev/null differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_panel_close.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_panel_close.png index 23a53b903c..892b93afaf 100644 Binary files a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_panel_close.png and b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_panel_close.png differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_panel_list_background.9.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_panel_list_background.9.png index 245c2e855c..a4c313e353 100644 Binary files a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_panel_list_background.9.png and b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_panel_list_background.9.png differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_panel_close.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_panel_close.png index 289028afee..892b93afaf 100644 Binary files a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_panel_close.png and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_panel_close.png differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_panel_list_background.9.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_panel_list_background.9.png index e69d3fbacb..1de561aa65 100644 Binary files a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_panel_list_background.9.png and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_panel_list_background.9.png differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_event_list_item.xml b/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_event_list_item.xml index 82b27ed3d0..a5a333b605 100644 --- a/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_event_list_item.xml +++ b/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_event_list_item.xml @@ -1,7 +1,7 @@ - + \ No newline at end of file diff --git a/modules/mogo-module-v2x/src/main/res/drawable/v2x_shadow_shape_view.xml b/modules/mogo-module-v2x/src/main/res/drawable/v2x_shadow_shape_view.xml index 8d8ef310db..12e6ec50cf 100644 --- a/modules/mogo-module-v2x/src/main/res/drawable/v2x_shadow_shape_view.xml +++ b/modules/mogo-module-v2x/src/main/res/drawable/v2x_shadow_shape_view.xml @@ -1,5 +1,6 @@ + + android:layout_height="@dimen/module_v2x_fatigue_driving_window_height_ground" + android:background="@drawable/bg_v2x_event_list_item"> - + - + - + - + - + - + - + - - - - - \ No newline at end of file diff --git a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history.xml index cabc198172..7bd7a12d7a 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history.xml @@ -7,117 +7,105 @@ android:layout_height="wrap_content" android:layout_marginLeft="10px" android:layout_marginRight="10px" - android:layout_marginBottom="14px"> + android:layout_marginBottom="14px" + android:background="@drawable/bg_v2x_event_list_item"> - + android:layout_marginStart="@dimen/dp_24" + android:layout_marginTop="@dimen/dp_24" + android:background="@drawable/bg_v2x_event_type_read" + android:gravity="center" + android:paddingLeft="@dimen/dp_10" + android:paddingTop="@dimen/dp_3" + android:paddingRight="@dimen/dp_10" + android:paddingBottom="@dimen/dp_3" + android:text="违章停车" + android:textColor="#ffffff" + android:textSize="@dimen/dp_28" + app:layout_constraintLeft_toLeftOf="parent" + app:layout_constraintTop_toTopOf="parent" /> - + - + - + - + - + - + - - - - - diff --git a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history_other_help.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history_other_help.xml index cc9e7d8fdd..70bb272cf3 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history_other_help.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history_other_help.xml @@ -6,142 +6,128 @@ android:layout_height="wrap_content" android:layout_marginLeft="10px" android:layout_marginRight="10px" - android:layout_marginBottom="14px"> + android:layout_marginBottom="14px" + android:background="@drawable/bg_v2x_event_list_item"> - + android:layout_marginStart="@dimen/module_v2x_surrounding_item_bottom_image_height" + android:layout_marginTop="@dimen/dp_24" + android:background="@drawable/bg_v2x_event_type_orange" + android:gravity="center" + android:paddingLeft="@dimen/dp_10" + android:paddingTop="@dimen/dp_5" + android:paddingRight="@dimen/dp_10" + android:paddingBottom="@dimen/dp_3" + android:text="求助信息" + android:textColor="#ffffff" + android:textSize="@dimen/dp_28" + app:layout_constraintLeft_toLeftOf="parent" + app:layout_constraintTop_toTopOf="parent" /> - + - + - + - + - + - + - + - - - - - \ No newline at end of file diff --git a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_panel_fragment_event_panel.xml b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_panel_fragment_event_panel.xml index 8d61e6c0b5..91a0af3bb2 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_panel_fragment_event_panel.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_panel_fragment_event_panel.xml @@ -89,11 +89,10 @@ app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="@+id/rgTabSelect" /> - - + + + + + diff --git a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_item.xml b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_item.xml index 5e93414bf9..fc1e9abc1e 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_item.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_item.xml @@ -37,7 +37,6 @@ android:textColor="#FFFFFF" android:textSize="18px" /> - + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"/> #FFFFFF #B3FFFFFF #1F2131 - #1F2131 #FFFFFF #FFFFFF #10121E diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-ldpi/v2x_panel_close_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-ldpi/v2x_panel_close_light.png index 5bb2114ce2..0bbb52b488 100644 Binary files a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-ldpi/v2x_panel_close_light.png and b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-ldpi/v2x_panel_close_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/v2x_panel_close_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/v2x_panel_close_light.png index 1680352bfd..0bbb52b488 100644 Binary files a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/v2x_panel_close_light.png and b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/v2x_panel_close_light.png differ