diff --git a/core/function-impl/mogo-core-function-check/src/main/res/layout/check_info_title_item.xml b/core/function-impl/mogo-core-function-check/src/main/res/layout/check_info_title_item.xml index 8afee5f391..adcfa846bd 100644 --- a/core/function-impl/mogo-core-function-check/src/main/res/layout/check_info_title_item.xml +++ b/core/function-impl/mogo-core-function-check/src/main/res/layout/check_info_title_item.xml @@ -15,7 +15,9 @@ android:paddingLeft="@dimen/dp_40" android:paddingTop="@dimen/dp_32" android:text="模块名称" + android:textColor="#FFF" android:textSize="@dimen/dp_38" + android:textStyle="bold" app:layout_constraintHorizontal_chainStyle="spread" app:layout_constraintHorizontal_weight="1" app:layout_constraintLeft_toLeftOf="parent" @@ -30,7 +32,9 @@ android:paddingLeft="@dimen/dp_40" android:paddingTop="@dimen/dp_32" android:text="运行状态" + android:textColor="#FFF" android:textSize="@dimen/dp_38" + android:textStyle="bold" app:layout_constraintHorizontal_chainStyle="spread" app:layout_constraintHorizontal_weight="1" app:layout_constraintLeft_toRightOf="@+id/title_one" @@ -45,7 +49,9 @@ android:paddingLeft="@dimen/dp_40" android:paddingTop="@dimen/dp_32" android:text="模块名称" + android:textColor="#FFF" android:textSize="@dimen/dp_38" + android:textStyle="bold" app:layout_constraintHorizontal_chainStyle="spread" app:layout_constraintHorizontal_weight="1" app:layout_constraintLeft_toRightOf="@+id/title_two" @@ -60,7 +66,9 @@ android:paddingLeft="@dimen/dp_40" android:paddingTop="@dimen/dp_32" android:text="运行状态" + android:textColor="#FFF" android:textSize="@dimen/dp_38" + android:textStyle="bold" app:layout_constraintHorizontal_chainStyle="spread" app:layout_constraintHorizontal_weight="1" app:layout_constraintLeft_toRightOf="@+id/title_thr" diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/fragment_hmi.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/fragment_hmi.xml index 3b910a2110..ce22727b82 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/fragment_hmi.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/fragment_hmi.xml @@ -64,8 +64,8 @@ diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_check_status.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_check_status.xml index 035095487c..f544ecb001 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_check_status.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_check_status.xml @@ -8,13 +8,13 @@ diff --git a/core/mogo-core-res/src/main/function-hmi-res/drawable/module_ext_check.xml b/core/mogo-core-res/src/main/function-hmi-res/drawable/module_ext_check.xml index fa0dcc73b3..23c6cfb635 100644 --- a/core/mogo-core-res/src/main/function-hmi-res/drawable/module_ext_check.xml +++ b/core/mogo-core-res/src/main/function-hmi-res/drawable/module_ext_check.xml @@ -1,14 +1,50 @@ - - - - - - + + + + + + + + + + + + + + + + + + + - \ No newline at end of file + + + + + + + + + + + \ No newline at end of file diff --git a/core/mogo-core-res/src/main/res/values-xhdpi-2560x1440/dimens.xml b/core/mogo-core-res/src/main/res/values-xhdpi-2560x1440/dimens.xml index 044c28954c..b43f1f3a2f 100644 --- a/core/mogo-core-res/src/main/res/values-xhdpi-2560x1440/dimens.xml +++ b/core/mogo-core-res/src/main/res/values-xhdpi-2560x1440/dimens.xml @@ -27,7 +27,8 @@ 30px 70px - 128px + 138px + 368px 60px 44px diff --git a/core/mogo-core-res/src/main/res/values/dimens.xml b/core/mogo-core-res/src/main/res/values/dimens.xml index 7c21290aea..cc92f49987 100644 --- a/core/mogo-core-res/src/main/res/values/dimens.xml +++ b/core/mogo-core-res/src/main/res/values/dimens.xml @@ -27,7 +27,8 @@ 20px 50px - 128px + 138px + 368px 38px 33px diff --git a/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml b/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml index 93d3b47714..bdbc47b6c5 100644 --- a/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml +++ b/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml @@ -34,7 +34,6 @@ android:background="@drawable/module_switch_map_bg" android:elevation="@dimen/dp_10" android:padding="@dimen/dp_20" - android:visibility="gone" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent"> diff --git a/modules/mogo-module-push/src/main/res/drawable/module_push_item_background.xml b/modules/mogo-module-push/src/main/res/drawable/module_push_item_background.xml index a70936cd5d..2a98ae4301 100644 --- a/modules/mogo-module-push/src/main/res/drawable/module_push_item_background.xml +++ b/modules/mogo-module-push/src/main/res/drawable/module_push_item_background.xml @@ -3,8 +3,8 @@ android:shape="rectangle"> diff --git a/modules/mogo-module-push/src/main/res/layout/module_push_dialog_check.xml b/modules/mogo-module-push/src/main/res/layout/module_push_dialog_check.xml index 8b13014fe8..7fdd8003f5 100644 --- a/modules/mogo-module-push/src/main/res/layout/module_push_dialog_check.xml +++ b/modules/mogo-module-push/src/main/res/layout/module_push_dialog_check.xml @@ -25,6 +25,8 @@ android:layout_marginTop="@dimen/module_push_dialog_title_margin" android:textColor="@android:color/white" android:textSize="@dimen/module_push_dialog_title_size" + android:text="官方公告" + android:textStyle="bold" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" /> diff --git a/modules/mogo-module-push/src/main/res/layout/module_push_item.xml b/modules/mogo-module-push/src/main/res/layout/module_push_item.xml index f6375db0f6..4cb87856d8 100644 --- a/modules/mogo-module-push/src/main/res/layout/module_push_item.xml +++ b/modules/mogo-module-push/src/main/res/layout/module_push_item.xml @@ -25,6 +25,8 @@ android:layout_marginLeft="@dimen/module_push_ui_app_icon_leftMargin" android:layout_marginTop="@dimen/module_push_ui_app_icon_topMargin" android:gravity="center_vertical" + android:orientation="vertical" + app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toRightOf="@+id/module_push_image" app:layout_constraintTop_toTopOf="parent" app:layout_goneMarginTop="@dimen/module_push_ui_app_icon_goneTopMargin"> @@ -42,36 +44,29 @@ android:textSize="@dimen/module_push_ui_title_textSize" app:layout_constrainedWidth="true" tools:text="官方公告" /> - - - + - 8px 12px 16px + 6px 19px 30px 16px diff --git a/modules/mogo-module-push/src/main/res/values-mdpi/dimens.xml b/modules/mogo-module-push/src/main/res/values-mdpi/dimens.xml index 1f1106b6c5..6a741d060b 100644 --- a/modules/mogo-module-push/src/main/res/values-mdpi/dimens.xml +++ b/modules/mogo-module-push/src/main/res/values-mdpi/dimens.xml @@ -58,6 +58,7 @@ 8px 12px 16px + 6px 19px 30px 16px 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 4afc379245..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 @@ -7,6 +7,7 @@ 30px 21px 34px + 20px 33px 2px 120px @@ -17,7 +18,7 @@ 394px 42px 567px - 100px + 120px 20px 34px 34px diff --git a/modules/mogo-module-push/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-push/src/main/res/values-xhdpi/dimens.xml index c7e71bf8e5..7f784d0108 100644 --- a/modules/mogo-module-push/src/main/res/values-xhdpi/dimens.xml +++ b/modules/mogo-module-push/src/main/res/values-xhdpi/dimens.xml @@ -58,6 +58,7 @@ 17px 21px 30px + 20px 33px 50px 30px diff --git a/modules/mogo-module-push/src/main/res/values/colors.xml b/modules/mogo-module-push/src/main/res/values/colors.xml index d01c09cbad..6ec6f21c42 100644 --- a/modules/mogo-module-push/src/main/res/values/colors.xml +++ b/modules/mogo-module-push/src/main/res/values/colors.xml @@ -4,7 +4,7 @@ #FFFFFF #B2FFFFFF #999999 - #B3FFFFFF + #FFF #5A8EFD #E63B4577 \ No newline at end of file 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 dc5f0d6635..5738bb1b5f 100644 --- a/modules/mogo-module-push/src/main/res/values/dimens.xml +++ b/modules/mogo-module-push/src/main/res/values/dimens.xml @@ -58,6 +58,7 @@ 8px 12px 16px + 6px 19px 30px 16px @@ -102,7 +103,7 @@ 34px 567px - 100px + 120px 2px 120px