From 02c502f1970b5d597bd13cdb8d30fe17ecb3a051 Mon Sep 17 00:00:00 2001 From: liujing Date: Wed, 20 Oct 2021 14:47:54 +0800 Subject: [PATCH 1/5] UI-check --- .../main/res/layout/check_info_title_item.xml | 8 +++ .../src/main/res/layout/view_check_status.xml | 6 +- .../drawable/module_ext_check.xml | 58 +++++++++++++++---- 3 files changed, 58 insertions(+), 14 deletions(-) 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/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 From ae292a77eba15a754236905935a2ce18f8bdc947 Mon Sep 17 00:00:00 2001 From: liujing Date: Wed, 20 Oct 2021 15:22:13 +0800 Subject: [PATCH 2/5] =?UTF-8?q?UI-=E5=85=AC=E5=91=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mogo/eagle/core/function/check/net/CheckNetWork.kt | 2 +- .../src/main/res/drawable/module_push_item_background.xml | 4 ++-- .../src/main/res/layout/module_push_dialog_check.xml | 2 ++ .../mogo-module-push/src/main/res/layout/module_push_item.xml | 2 ++ .../src/main/res/values-xhdpi-2560x1440/dimens.xml | 2 +- modules/mogo-module-push/src/main/res/values/colors.xml | 2 +- modules/mogo-module-push/src/main/res/values/dimens.xml | 2 +- 7 files changed, 10 insertions(+), 6 deletions(-) diff --git a/core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/net/CheckNetWork.kt b/core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/net/CheckNetWork.kt index 5d2703522e..3da2c6d33f 100644 --- a/core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/net/CheckNetWork.kt +++ b/core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/net/CheckNetWork.kt @@ -22,7 +22,7 @@ object CheckNetWork { //网络请求,获取自车检测结果(工控机上报云端) fun checkNetWork(context: Context, callbackFlow: ICheckResultCallBack) { val params = ParamsBuilder.of(false) - .append("sn", MoGoAiCloudClientConfig.getInstance().sn) + .append("sn", "X20202108044A6797CFE6F8E899") .build() CheckApiServiceFactory.getDataApiService(context).loadMonitorDetail(params) .subscribeOn(Schedulers.io()) 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..f70762fece 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 @@ -58,7 +58,9 @@ android:layout_width="wrap_content" android:layout_height="match_parent" android:ellipsize="end" + android:gravity="center|left" android:maxLines="3" + android:text="这是测试数据,当前测试数据是为了查看换行的显示效果,如果最多3行呢,怎么显示的呢" android:textColor="@android:color/white" android:textSize="@dimen/module_push_ui_title_text_size" /> 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..8280b9b643 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 @@ -17,7 +17,7 @@ 394px 42px 567px - 100px + 120px 20px 34px 34px 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..061812050f 100644 --- a/modules/mogo-module-push/src/main/res/values/dimens.xml +++ b/modules/mogo-module-push/src/main/res/values/dimens.xml @@ -102,7 +102,7 @@ 34px 567px - 100px + 120px 2px 120px From 3528cde743727513947a19d8aa03e3aa2d760564 Mon Sep 17 00:00:00 2001 From: liujing Date: Wed, 20 Oct 2021 15:25:25 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/mogo/eagle/core/function/check/net/CheckNetWork.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/net/CheckNetWork.kt b/core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/net/CheckNetWork.kt index 3da2c6d33f..5d2703522e 100644 --- a/core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/net/CheckNetWork.kt +++ b/core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/net/CheckNetWork.kt @@ -22,7 +22,7 @@ object CheckNetWork { //网络请求,获取自车检测结果(工控机上报云端) fun checkNetWork(context: Context, callbackFlow: ICheckResultCallBack) { val params = ParamsBuilder.of(false) - .append("sn", "X20202108044A6797CFE6F8E899") + .append("sn", MoGoAiCloudClientConfig.getInstance().sn) .build() CheckApiServiceFactory.getDataApiService(context).loadMonitorDetail(params) .subscribeOn(Schedulers.io()) From 7b70de8f2ea4acb01d997b07b5b38f9f2ce5b8b6 Mon Sep 17 00:00:00 2001 From: liujing Date: Wed, 20 Oct 2021 16:11:01 +0800 Subject: [PATCH 4/5] =?UTF-8?q?UI-=E5=AE=98=E6=96=B9=E5=85=AC=E5=91=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/res/layout/module_push_item.xml | 27 +++++++------------ .../src/main/res/values-ldpi/dimens.xml | 1 + .../src/main/res/values-mdpi/dimens.xml | 1 + .../res/values-xhdpi-2560x1440/dimens.xml | 1 + .../src/main/res/values-xhdpi/dimens.xml | 1 + .../src/main/res/values/dimens.xml | 1 + 6 files changed, 15 insertions(+), 17 deletions(-) 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 f70762fece..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,38 +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 8280b9b643..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 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/dimens.xml b/modules/mogo-module-push/src/main/res/values/dimens.xml index 061812050f..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 From a823d8aee33cf547354704e24dfd870aaec782fc Mon Sep 17 00:00:00 2001 From: liujing Date: Wed, 20 Oct 2021 16:46:13 +0800 Subject: [PATCH 5/5] UI --- .../src/main/res/layout/fragment_hmi.xml | 4 ++-- .../src/main/res/values-xhdpi-2560x1440/dimens.xml | 3 ++- core/mogo-core-res/src/main/res/values/dimens.xml | 3 ++- .../src/main/res/layout/module_ext_layout_entrance.xml | 1 - 4 files changed, 6 insertions(+), 5 deletions(-) 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 173dd322c6..a2b72ce4e1 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 @@ -66,8 +66,8 @@ 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 a32b5ba646..2204e87bab 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 8753a23a7b..1c16c6a00e 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 87a059af77..f10aa2c149 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 @@ -55,7 +55,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">