From 031fb4848700d21007b87c1d162a8a99b91fee3a Mon Sep 17 00:00:00 2001 From: EmArrow Date: Sun, 29 Sep 2024 14:27:32 +0800 Subject: [PATCH] [6.7.0] ui --- .../eagle/core/function/hmi/ui/tools/UpgradeAppDialog.kt | 4 ---- .../drawable/{bg_map_offline_btn.xml => bg_dialog_btn.xml} | 0 .../src/main/res/layout/dialog_ad_upgrade.xml | 4 ++-- .../src/main/res/layout/dialog_docker_reboot.xml | 4 ++-- .../src/main/res/layout/dialog_modify_bindingcar.xml | 4 ++-- .../src/main/res/layout/dialog_offline_map.xml | 6 +++--- .../src/main/res/layout/dialog_to_bindingcar.xml | 4 ++-- .../src/main/res/layout/dialog_upgrade_app.xml | 7 +++---- 8 files changed, 14 insertions(+), 19 deletions(-) rename core/function-impl/mogo-core-function-hmi/src/main/res/drawable/{bg_map_offline_btn.xml => bg_dialog_btn.xml} (100%) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/UpgradeAppDialog.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/UpgradeAppDialog.kt index 2d366c507f..e8a7e9ad4e 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/UpgradeAppDialog.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/UpgradeAppDialog.kt @@ -53,7 +53,6 @@ class UpgradeAppDialog(context: Context) : BaseFloatDialog(context), LifecycleOb private var cancelTv: TextView? = null private var upgradeTitleTv: TextView? = null private var upgradeContentTv: TextView? = null - private var verticalLineView: View? = null private var confirmForceTv: TextView? = null private var tag: String? = null private var downloadUrl: String? = null @@ -66,7 +65,6 @@ class UpgradeAppDialog(context: Context) : BaseFloatDialog(context), LifecycleOb upgradeContentTv = findViewById(R.id.tv_upgrade_content) confirmTv = findViewById(R.id.tv_upgrade_confirm) cancelTv = findViewById(R.id.tv_upgrade_cancel) - verticalLineView = findViewById(R.id.view_vertical_line) confirmForceTv = findViewById(R.id.tv_upgrade_confirm_force) confirmTv?.onClick { @@ -135,12 +133,10 @@ class UpgradeAppDialog(context: Context) : BaseFloatDialog(context), LifecycleOb confirmForceTv?.visibility = View.GONE confirmTv?.visibility = View.VISIBLE cancelTv?.visibility = View.VISIBLE - verticalLineView?.visibility = View.VISIBLE } "3" -> { confirmTv?.visibility = View.GONE cancelTv?.visibility = View.GONE - verticalLineView?.visibility = View.GONE confirmForceTv?.visibility = View.VISIBLE } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_map_offline_btn.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_dialog_btn.xml similarity index 100% rename from core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_map_offline_btn.xml rename to core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_dialog_btn.xml diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/dialog_ad_upgrade.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/dialog_ad_upgrade.xml index c03357e929..635ed3768c 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/dialog_ad_upgrade.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/dialog_ad_upgrade.xml @@ -59,7 +59,7 @@ android:layout_height="@dimen/dp_120" android:gravity="center" android:text="@string/confirm" - android:background="@drawable/bg_map_offline_btn" + android:background="@drawable/bg_dialog_btn" android:textColor="@color/color_2EACFF" android:textSize="@dimen/dp_40" android:layout_marginStart="@dimen/dp_65" @@ -75,7 +75,7 @@ android:text="@string/cancel" android:textColor="@color/white" android:textSize="@dimen/dp_40" - android:background="@drawable/bg_map_offline_btn" + android:background="@drawable/bg_dialog_btn" app:layout_constraintBottom_toBottomOf="parent" android:layout_marginEnd="@dimen/dp_65" android:layout_marginBottom="@dimen/dp_62" diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/dialog_docker_reboot.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/dialog_docker_reboot.xml index 560b2b4302..727da84d95 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/dialog_docker_reboot.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/dialog_docker_reboot.xml @@ -45,7 +45,7 @@ android:layout_height="@dimen/dp_120" android:layout_marginStart="@dimen/dp_65" android:layout_marginBottom="@dimen/dp_62" - android:background="@drawable/bg_map_offline_btn" + android:background="@drawable/bg_dialog_btn" android:gravity="center" android:text="@string/confirm" android:textColor="@color/color_2EACFF" @@ -59,7 +59,7 @@ android:layout_height="@dimen/dp_120" android:layout_marginEnd="@dimen/dp_65" android:layout_marginBottom="@dimen/dp_62" - android:background="@drawable/bg_map_offline_btn" + android:background="@drawable/bg_dialog_btn" android:gravity="center" android:text="@string/cancel" android:textColor="@color/white" diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/dialog_modify_bindingcar.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/dialog_modify_bindingcar.xml index fefa1420e2..83a4e370f5 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/dialog_modify_bindingcar.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/dialog_modify_bindingcar.xml @@ -47,7 +47,7 @@ android:layout_height="@dimen/dp_120" android:gravity="center" android:text="@string/confirm" - android:background="@drawable/bg_map_offline_btn" + android:background="@drawable/bg_dialog_btn" android:textColor="@color/color_2EACFF" android:textSize="@dimen/dp_40" android:layout_marginStart="@dimen/dp_65" @@ -63,7 +63,7 @@ android:text="@string/cancel" android:textColor="@color/white" android:textSize="@dimen/dp_40" - android:background="@drawable/bg_map_offline_btn" + android:background="@drawable/bg_dialog_btn" app:layout_constraintBottom_toBottomOf="parent" android:layout_marginEnd="@dimen/dp_65" android:layout_marginBottom="@dimen/dp_62" diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/dialog_offline_map.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/dialog_offline_map.xml index 6230b00ce4..b44996cc05 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/dialog_offline_map.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/dialog_offline_map.xml @@ -85,7 +85,7 @@ android:layout_height="@dimen/dp_120" android:gravity="center" android:text="@string/confirm" - android:background="@drawable/bg_map_offline_btn" + android:background="@drawable/bg_dialog_btn" android:textColor="@color/color_2EACFF" android:textSize="@dimen/dp_40" android:layout_marginStart="@dimen/dp_65" @@ -101,7 +101,7 @@ android:text="@string/cancel" android:textColor="@color/white" android:textSize="@dimen/dp_40" - android:background="@drawable/bg_map_offline_btn" + android:background="@drawable/bg_dialog_btn" app:layout_constraintBottom_toBottomOf="parent" android:layout_marginEnd="@dimen/dp_65" android:layout_marginBottom="@dimen/dp_62" @@ -117,7 +117,7 @@ android:textColor="@color/white" android:textSize="@dimen/dp_40" android:visibility="gone" - android:background="@drawable/bg_map_offline_btn" + android:background="@drawable/bg_dialog_btn" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent"/> diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/dialog_to_bindingcar.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/dialog_to_bindingcar.xml index 6c3ccb5324..ccf16cf952 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/dialog_to_bindingcar.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/dialog_to_bindingcar.xml @@ -47,7 +47,7 @@ android:layout_height="@dimen/dp_120" android:gravity="center" android:text="@string/confirm" - android:background="@drawable/bg_map_offline_btn" + android:background="@drawable/bg_dialog_btn" android:textColor="@color/color_2EACFF" android:textSize="@dimen/dp_40" android:layout_marginStart="@dimen/dp_65" @@ -63,7 +63,7 @@ android:text="@string/cancel" android:textColor="@color/white" android:textSize="@dimen/dp_40" - android:background="@drawable/bg_map_offline_btn" + android:background="@drawable/bg_dialog_btn" app:layout_constraintBottom_toBottomOf="parent" android:layout_marginEnd="@dimen/dp_65" android:layout_marginBottom="@dimen/dp_62" diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/dialog_upgrade_app.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/dialog_upgrade_app.xml index 57e32b4922..61cbf44203 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/dialog_upgrade_app.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/dialog_upgrade_app.xml @@ -54,10 +54,9 @@ android:gravity="center" android:text="@string/confirm" android:visibility="gone" - android:background="@drawable/bg_map_offline_btn" + android:background="@drawable/bg_dialog_btn" android:textColor="@color/color_2EACFF" android:textSize="@dimen/dp_40" - android:layout_marginStart="@dimen/dp_65" android:layout_marginBottom="@dimen/dp_62" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintRight_toRightOf="parent" @@ -69,7 +68,7 @@ android:layout_height="@dimen/dp_120" android:gravity="center" android:text="@string/confirm" - android:background="@drawable/bg_map_offline_btn" + android:background="@drawable/bg_dialog_btn" android:textColor="@color/color_2EACFF" android:textSize="@dimen/dp_40" android:layout_marginStart="@dimen/dp_65" @@ -85,7 +84,7 @@ android:text="@string/cancel" android:textColor="@color/white" android:textSize="@dimen/dp_40" - android:background="@drawable/bg_map_offline_btn" + android:background="@drawable/bg_dialog_btn" app:layout_constraintBottom_toBottomOf="parent" android:layout_marginEnd="@dimen/dp_65" android:layout_marginBottom="@dimen/dp_62"