diff --git a/.idea/gradle.xml b/.idea/gradle.xml index f0420c959b..c7a463ad78 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -4,7 +4,7 @@ diff --git a/core/function-impl/mogo-core-function-check/src/main/res/drawable/check_close.png b/core/function-impl/mogo-core-function-check/src/main/res/drawable/dark_clore_close.png similarity index 100% rename from core/function-impl/mogo-core-function-check/src/main/res/drawable/check_close.png rename to core/function-impl/mogo-core-function-check/src/main/res/drawable/dark_clore_close.png diff --git a/core/function-impl/mogo-core-function-check/src/main/res/layout/activity_check.xml b/core/function-impl/mogo-core-function-check/src/main/res/layout/activity_check.xml index 9d81fab132..c9ba22b89e 100644 --- a/core/function-impl/mogo-core-function-check/src/main/res/layout/activity_check.xml +++ b/core/function-impl/mogo-core-function-check/src/main/res/layout/activity_check.xml @@ -22,7 +22,7 @@ android:layout_height="@dimen/dp_106" android:layout_marginLeft="@dimen/dp_50" android:layout_marginTop="@dimen/dp_50" - android:src="@drawable/check_close" + android:src="@drawable/dark_clore_close" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toTopOf="parent" /> diff --git a/core/function-impl/mogo-core-function-check/src/main/res/layout/check_dialog.xml b/core/function-impl/mogo-core-function-check/src/main/res/layout/check_dialog.xml index af07edb8d0..9f1605c508 100644 --- a/core/function-impl/mogo-core-function-check/src/main/res/layout/check_dialog.xml +++ b/core/function-impl/mogo-core-function-check/src/main/res/layout/check_dialog.xml @@ -13,7 +13,7 @@ android:layout_height="@dimen/dp_106" android:layout_marginLeft="@dimen/dp_30" android:layout_marginTop="@dimen/dp_30" - android:src="@drawable/check_close" + android:src="@drawable/dark_clore_close" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toTopOf="parent" /> diff --git a/core/function-impl/mogo-core-function-check/src/main/res/layout/check_info_list.xml b/core/function-impl/mogo-core-function-check/src/main/res/layout/check_info_list.xml index 9d53419d7c..876115d399 100644 --- a/core/function-impl/mogo-core-function-check/src/main/res/layout/check_info_list.xml +++ b/core/function-impl/mogo-core-function-check/src/main/res/layout/check_info_list.xml @@ -13,7 +13,7 @@ android:layout_height="@dimen/dp_106" android:layout_marginLeft="@dimen/dp_30" android:layout_marginTop="@dimen/dp_30" - android:src="@drawable/check_close" + android:src="@drawable/dark_clore_close" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toTopOf="parent" /> diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/notice_connect.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/notice_connect.xml new file mode 100644 index 0000000000..56c302519f --- /dev/null +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/notice_connect.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/notice_dialog_check_background.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/notice_dialog_check_background.xml new file mode 100644 index 0000000000..e2d70db4b2 --- /dev/null +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/notice_dialog_check_background.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/notice_unsuccess_image.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/notice_unsuccess_image.png new file mode 100644 index 0000000000..c0e9ff5b5f Binary files /dev/null and b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/notice_unsuccess_image.png differ diff --git a/modules/mogo-module-push/src/main/res/layout/module_push_dialog_check_with_accessory.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/notice_dialog_check_with_accessory.xml similarity index 64% rename from modules/mogo-module-push/src/main/res/layout/module_push_dialog_check_with_accessory.xml rename to core/function-impl/mogo-core-function-hmi/src/main/res/layout/notice_dialog_check_with_accessory.xml index fb0b2b4f1e..ea97036108 100644 --- a/modules/mogo-module-push/src/main/res/layout/module_push_dialog_check_with_accessory.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/notice_dialog_check_with_accessory.xml @@ -4,16 +4,16 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="@dimen/module_push_dialog_check_accessory_width" android:layout_height="@dimen/module_push_dialog_check_accessory_height" - android:background="@drawable/module_push_dialog_check_background"> + android:background="@drawable/notice_dialog_check_background"> @@ -22,10 +22,10 @@ android:id="@+id/module_push_dialog_acc_title" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="@dimen/module_push_dialog_title_margin" + android:layout_marginTop="@dimen/dp_54" android:text="官方公告" android:textColor="@android:color/white" - android:textSize="@dimen/module_push_dialog_title_size" + android:textSize="@dimen/dp_56" android:textStyle="bold" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" @@ -33,29 +33,46 @@ + app:layout_constraintLeft_toLeftOf="parent" /> + + + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/values-xhdpi-2560x1440/color.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/values-xhdpi-2560x1440/color.xml new file mode 100644 index 0000000000..db222fff5e --- /dev/null +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/values-xhdpi-2560x1440/color.xml @@ -0,0 +1,5 @@ + + + #2B6EFF + #E63B4577 + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/values-xhdpi-2560x1440/dimens.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/values-xhdpi-2560x1440/dimens.xml new file mode 100644 index 0000000000..576400242e --- /dev/null +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/values-xhdpi-2560x1440/dimens.xml @@ -0,0 +1,14 @@ + + + 1700px + 1200px + 1400px + 788px + + 32px + 42px + 50px + 52px + 54px + 56px + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/values/color.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/values/color.xml new file mode 100644 index 0000000000..db222fff5e --- /dev/null +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/values/color.xml @@ -0,0 +1,5 @@ + + + #2B6EFF + #E63B4577 + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/values/dimens.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/values/dimens.xml new file mode 100644 index 0000000000..576400242e --- /dev/null +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/values/dimens.xml @@ -0,0 +1,14 @@ + + + 1700px + 1200px + 1400px + 788px + + 32px + 42px + 50px + 52px + 54px + 56px + \ No newline at end of file diff --git a/core/mogo-core-res/src/main/res/drawable/dark_clore_close.png b/core/mogo-core-res/src/main/res/drawable/dark_clore_close.png new file mode 100644 index 0000000000..ba03e033d8 Binary files /dev/null and b/core/mogo-core-res/src/main/res/drawable/dark_clore_close.png differ diff --git a/modules/mogo-module-push/src/main/res/values-xhdpi-2560x1440/dimens.xml b/modules/mogo-module-push/src/main/res/values-xhdpi-2560x1440/dimens.xml index 8755e40541..d3d0959788 100644 --- a/modules/mogo-module-push/src/main/res/values-xhdpi-2560x1440/dimens.xml +++ b/modules/mogo-module-push/src/main/res/values-xhdpi-2560x1440/dimens.xml @@ -26,10 +26,6 @@ 1200px 763px - 1700px - 1200px - 1400px - 788px 32px 107px 107px diff --git a/modules/mogo-module-push/src/main/res/values/dimens.xml b/modules/mogo-module-push/src/main/res/values/dimens.xml index a38f980213..5738bb1b5f 100644 --- a/modules/mogo-module-push/src/main/res/values/dimens.xml +++ b/modules/mogo-module-push/src/main/res/values/dimens.xml @@ -114,10 +114,6 @@ 1200px 763px - 1700px - 1200px - 1400px - 788px 32px 107px 107px