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-tanlu/src/main/res/values-mdpi/dimens.xml b/modules/mogo-module-tanlu/src/main/res/values-mdpi/dimens.xml index de34df6c83..a1e06f3f9c 100644 --- a/modules/mogo-module-tanlu/src/main/res/values-mdpi/dimens.xml +++ b/modules/mogo-module-tanlu/src/main/res/values-mdpi/dimens.xml @@ -85,7 +85,7 @@ 13px 8px 13px - 15px + 17px 3px 18px 26px diff --git a/modules/mogo-module-tanlu/src/main/res/values-xhdpi-1920x1000/dimens.xml b/modules/mogo-module-tanlu/src/main/res/values-xhdpi-1920x1000/dimens.xml index d93494cf3a..a3ea0c5760 100644 --- a/modules/mogo-module-tanlu/src/main/res/values-xhdpi-1920x1000/dimens.xml +++ b/modules/mogo-module-tanlu/src/main/res/values-xhdpi-1920x1000/dimens.xml @@ -85,7 +85,7 @@ 19px 13px 23px - 15px + 30px 9px 27px 46px diff --git a/modules/mogo-module-tanlu/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-tanlu/src/main/res/values-xhdpi/dimens.xml index a0c1f15833..caf019b61c 100644 --- a/modules/mogo-module-tanlu/src/main/res/values-xhdpi/dimens.xml +++ b/modules/mogo-module-tanlu/src/main/res/values-xhdpi/dimens.xml @@ -85,7 +85,7 @@ 19px 13px 23px - 15px + 30px 9px 27px 46px diff --git a/modules/mogo-module-tanlu/src/main/res/values/dimens.xml b/modules/mogo-module-tanlu/src/main/res/values/dimens.xml index b616be35ca..caa0a414c4 100644 --- a/modules/mogo-module-tanlu/src/main/res/values/dimens.xml +++ b/modules/mogo-module-tanlu/src/main/res/values/dimens.xml @@ -85,7 +85,7 @@ 13px 8px 13px - 15px + 17px 3px 18px 26px diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/loading_image.gif b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/loading_image.gif deleted file mode 100644 index 5e3b79bbed..0000000000 Binary files a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/loading_image.gif and /dev/null differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_icon_live_logo.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_icon_live_logo.png index 957c298fd6..b964d6b4ad 100644 Binary files a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_icon_live_logo.png and b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_icon_live_logo.png differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-mdpi/v2x_icon_live_logo.png b/modules/mogo-module-v2x/src/main/res/drawable-mdpi/v2x_icon_live_logo.png new file mode 100644 index 0000000000..e02a57044f Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-mdpi/v2x_icon_live_logo.png differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/loading_image.gif b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/loading_image.gif deleted file mode 100644 index 5e3b79bbed..0000000000 Binary files a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/loading_image.gif and /dev/null differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_icon_live_logo.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_icon_live_logo.png index dabf25dbbb..5480b6d165 100644 Binary files a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_icon_live_logo.png and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_icon_live_logo.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 old mode 100644 new mode 100755 index 892b93afaf..bb3e2b1195 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/bg_v2x_event_list_item.xml b/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_event_list_item.xml index a5a333b605..920fbb912a 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 @@ -2,6 +2,6 @@ - + \ No newline at end of file diff --git a/modules/mogo-module-v2x/src/main/res/drawable/loading_image.gif b/modules/mogo-module-v2x/src/main/res/drawable/loading_image.gif deleted file mode 100644 index 5e3b79bbed..0000000000 Binary files a/modules/mogo-module-v2x/src/main/res/drawable/loading_image.gif and /dev/null differ 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 70bb272cf3..36eaea608e 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 @@ -72,7 +72,7 @@ android:layout_height="wrap_content" android:layout_marginStart="@dimen/dp_10" android:layout_marginEnd="@dimen/dp_30" - android:textColor="@android:color/white" + android:textColor="@color/v2x_FFF_333" android:textSize="@dimen/dp_33" android:textStyle="bold" app:layout_constraintEnd_toStartOf="@+id/tvFaultHelpDistance" @@ -87,7 +87,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:alpha="0.59" - android:textColor="@android:color/white" + android:textColor="@color/v2x_FFF_999" android:textSize="@dimen/dp_29" app:layout_constraintBottom_toBottomOf="parent" android:layout_marginBottom="@dimen/dp_24" @@ -101,7 +101,7 @@ android:layout_height="wrap_content" android:layout_marginEnd="@dimen/dp_30" android:gravity="center_vertical" - android:textColor="#FFF" + android:textColor="@color/v2x_FFF_333" android:textSize="@dimen/dp_80" android:textStyle="bold" app:layout_constraintBottom_toBottomOf="@+id/ivFaultHelpEventCall" diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable/bg_v2x_event_list_item_light.xml b/skin/mogo-skin-light/src/main/module-v2x-res/drawable/bg_v2x_event_list_item_light.xml index 24460bd967..5d291943ec 100644 --- a/skin/mogo-skin-light/src/main/module-v2x-res/drawable/bg_v2x_event_list_item_light.xml +++ b/skin/mogo-skin-light/src/main/module-v2x-res/drawable/bg_v2x_event_list_item_light.xml @@ -2,6 +2,6 @@ - + \ No newline at end of file