From 1e1b0707f95ffc357cb90088364795271b3cdc47 Mon Sep 17 00:00:00 2001
From: xuxinchao <13522809046@163.com>
Date: Wed, 13 Apr 2022 11:14:34 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E8=AF=95=E7=AA=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1、调整控制中心列表元素位置
2、修复Bus包切换自车按钮显示错误问题
3、调整连接工控机按钮文字
---
 .../hmi/ui/setting/DebugSettingView.kt        |   8 +-
 .../main/res/layout/view_debug_setting.xml    | 272 +++++++++---------
 2 files changed, 143 insertions(+), 137 deletions(-)

diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt
index 7120d95378..ff38bc4435 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt
@@ -449,7 +449,7 @@ class DebugSettingView @JvmOverloads constructor(
         /**
          * 修改自车按钮（出租车、小巴车）
          */
-        tbChangeCurrentCarIcon.setOnCheckedChangeListener { buttonView, isChecked ->
+        tbChangeCurrentCarIcon.setOnCheckedChangeListener { _, isChecked ->
             if (!isChecked) {
                 // 替换为出租车图标
                 CallerHDMapManager.changeCurrentIcon(R.raw.chuzuche)
@@ -589,6 +589,12 @@ class DebugSettingView @JvmOverloads constructor(
                 etConnectServerIp.visibility = View.VISIBLE
             }
         }
+
+        //初始化切换自车按钮文本（Bus版本默认显示：切换自车为出租车）
+        if(AppIdentityModeUtils.isBus(FunctionBuildConfig.appIdentityMode)){
+            tbChangeCurrentCarIcon.isChecked = true
+        }
+
     }
 
     /**
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml
index 1290bc2ec1..a1ff2860b7 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml
@@ -450,116 +450,6 @@
                 android:orientation="vertical"
                 android:visibility="gone">
 
-                <ToggleButton
-                    android:id="@+id/tbEagleEyeController"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_margin="@dimen/dp_10"
-                    android:background="@drawable/setting_toggle_button_background"
-                    android:drawableEnd="@drawable/icon_right"
-                    android:padding="@dimen/dp_20"
-                    android:textOff="鹰眼本地配置"
-                    android:textOn="鹰眼本地配置" />
-
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:id="@+id/eagleEyeControllerLayout"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:visibility="gone">
-
-                    <Button
-                        android:id="@+id/btnBrakeThreshold"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:gravity="center"
-                        android:padding="@dimen/dp_5"
-                        android:text="设置刹车加速度阈值"
-                        android:textSize="@dimen/dp_24"
-                        app:layout_constraintLeft_toLeftOf="parent"
-                        app:layout_constraintTop_toTopOf="parent"
-                        android:paddingStart="@dimen/dp_20"
-                        android:paddingEnd="@dimen/dp_20"
-                        />
-
-                    <androidx.appcompat.widget.LinearLayoutCompat
-                        android:layout_width="0dp"
-                        android:layout_height="0dp"
-                        android:layout_marginStart="@dimen/dp_30"
-                        android:layout_marginTop="@dimen/dp_10"
-                        android:layout_marginEnd="@dimen/dp_30"
-                        android:layout_marginBottom="@dimen/dp_10"
-                        android:background="@drawable/debug_setting_edit_bg"
-                        android:focusable="true"
-                        android:focusableInTouchMode="true"
-                        android:orientation="horizontal"
-                        app:layout_constraintBottom_toBottomOf="@id/btnBrakeThreshold"
-                        app:layout_constraintLeft_toRightOf="@id/btnBrakeThreshold"
-                        app:layout_constraintRight_toRightOf="parent"
-                        app:layout_constraintTop_toTopOf="@id/btnBrakeThreshold">
-
-                        <androidx.appcompat.widget.AppCompatEditText
-                            android:id="@+id/etInputBrakeThreshold"
-                            style="@style/DebugSettingText"
-                            android:layout_width="0dp"
-                            android:layout_height="match_parent"
-                            android:layout_marginStart="90px"
-                            android:layout_weight="1"
-                            android:background="@null"
-                            android:gravity="center"
-                            tools:ignore="SpeakableTextPresentCheck" />
-
-                        <TextView
-                            style="@style/DebugSettingText"
-                            android:layout_width="93px"
-                            android:layout_height="match_parent"
-                            android:gravity="center_vertical"
-                            android:text="m/s²" />
-
-                    </androidx.appcompat.widget.LinearLayoutCompat>
-
-                    <View
-                        android:id="@+id/brakeThresholdDivider"
-                        android:layout_width="match_parent"
-                        android:layout_height="1dp"
-                        android:background="#F0F0F0"
-                        app:layout_constraintTop_toBottomOf="@id/btnBrakeThreshold"
-                        />
-
-                    <Button
-                        android:id="@+id/btnConnectServerIp"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:gravity="center"
-                        android:padding="@dimen/dp_5"
-                        android:text="连接司机屏IP"
-                        android:textSize="@dimen/dp_24"
-                        android:paddingStart="@dimen/dp_20"
-                        android:paddingEnd="@dimen/dp_20"
-                        app:layout_constraintTop_toBottomOf="@id/brakeThresholdDivider"
-                        app:layout_constraintLeft_toLeftOf="parent"
-                        />
-
-                    <androidx.appcompat.widget.AppCompatEditText
-                        android:id="@+id/etConnectServerIp"
-                        android:layout_width="0dp"
-                        android:layout_height="0dp"
-                        android:layout_marginStart="@dimen/dp_30"
-                        android:layout_marginTop="@dimen/dp_10"
-                        android:layout_marginEnd="@dimen/dp_20"
-                        android:layout_marginBottom="@dimen/dp_10"
-                        android:background="@drawable/debug_setting_edit_bg"
-                        android:gravity="center"
-                        android:hint="请输入司机屏IP"
-                        android:textColor="#1A1A1A"
-                        android:textSize="14sp"
-                        app:layout_constraintBottom_toBottomOf="@id/btnConnectServerIp"
-                        app:layout_constraintTop_toTopOf="@id/btnConnectServerIp"
-                        app:layout_constraintLeft_toRightOf="@id/btnConnectServerIp"
-                        app:layout_constraintRight_toRightOf="parent"/>
-
-
-                </androidx.constraintlayout.widget.ConstraintLayout>
-
                 <ToggleButton
                     android:id="@+id/tbDomainController"
                     android:layout_width="match_parent"
@@ -598,7 +488,7 @@
                         android:layout_height="wrap_content"
                         android:gravity="center"
                         android:padding="@dimen/dp_5"
-                        android:text="重置IP"
+                        android:text="连接工控机"
                         android:textSize="@dimen/dp_24"
                         app:layout_constraintLeft_toLeftOf="parent"
                         app:layout_constraintTop_toBottomOf="@id/autopilotInfoDivider" />
@@ -802,6 +692,53 @@
 
                 </androidx.constraintlayout.widget.ConstraintLayout>
 
+                <ToggleButton
+                    android:id="@+id/tbVehicleStateController"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="@dimen/dp_10"
+                    android:background="@drawable/setting_toggle_button_background"
+                    android:drawableEnd="@drawable/icon_right"
+                    android:padding="@dimen/dp_20"
+                    android:textOff="车辆状态"
+                    android:textOn="车辆状态"
+                    />
+
+                <LinearLayout
+                    android:id="@+id/vehicleStateLayout"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical"
+                    android:visibility="gone">
+
+                    <TextView
+                        android:id="@+id/tvSteeringInfo"
+                        style="@style/DebugSettingText"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:text="方向盘转向角:"
+                        />
+
+                    <View
+                        android:layout_width="match_parent"
+                        android:layout_height="1dp"
+                        android:background="#F0F0F0" />
+
+                    <TextView
+                        android:id="@+id/tvGearInfo"
+                        style="@style/DebugSettingText"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:text="挂挡档位:"
+                        />
+
+                    <View
+                        android:layout_width="match_parent"
+                        android:layout_height="1dp"
+                        android:background="#F0F0F0" />
+
+                </LinearLayout>
+
                 <ToggleButton
                     android:id="@+id/tbObuController"
                     android:layout_width="match_parent"
@@ -885,51 +822,114 @@
                 </androidx.constraintlayout.widget.ConstraintLayout>
 
                 <ToggleButton
-                    android:id="@+id/tbVehicleStateController"
+                    android:id="@+id/tbEagleEyeController"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_margin="@dimen/dp_10"
                     android:background="@drawable/setting_toggle_button_background"
                     android:drawableEnd="@drawable/icon_right"
                     android:padding="@dimen/dp_20"
-                    android:textOff="车辆状态"
-                    android:textOn="车辆状态"
-                    />
+                    android:textOff="鹰眼本地配置"
+                    android:textOn="鹰眼本地配置" />
 
-                <LinearLayout
-                    android:id="@+id/vehicleStateLayout"
+                <androidx.constraintlayout.widget.ConstraintLayout
+                    android:id="@+id/eagleEyeControllerLayout"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:orientation="vertical"
                     android:visibility="gone">
 
-                    <TextView
-                        android:id="@+id/tvSteeringInfo"
-                        style="@style/DebugSettingText"
-                        android:layout_width="match_parent"
+                    <Button
+                        android:id="@+id/btnBrakeThreshold"
+                        android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="方向盘转向角:"
+                        android:gravity="center"
+                        android:padding="@dimen/dp_5"
+                        android:text="设置刹车加速度阈值"
+                        android:textSize="@dimen/dp_24"
+                        app:layout_constraintLeft_toLeftOf="parent"
+                        app:layout_constraintTop_toTopOf="parent"
+                        android:paddingStart="@dimen/dp_20"
+                        android:paddingEnd="@dimen/dp_20"
                         />
 
+                    <androidx.appcompat.widget.LinearLayoutCompat
+                        android:layout_width="0dp"
+                        android:layout_height="0dp"
+                        android:layout_marginStart="@dimen/dp_30"
+                        android:layout_marginTop="@dimen/dp_10"
+                        android:layout_marginEnd="@dimen/dp_30"
+                        android:layout_marginBottom="@dimen/dp_10"
+                        android:background="@drawable/debug_setting_edit_bg"
+                        android:focusable="true"
+                        android:focusableInTouchMode="true"
+                        android:orientation="horizontal"
+                        app:layout_constraintBottom_toBottomOf="@id/btnBrakeThreshold"
+                        app:layout_constraintLeft_toRightOf="@id/btnBrakeThreshold"
+                        app:layout_constraintRight_toRightOf="parent"
+                        app:layout_constraintTop_toTopOf="@id/btnBrakeThreshold">
+
+                        <androidx.appcompat.widget.AppCompatEditText
+                            android:id="@+id/etInputBrakeThreshold"
+                            style="@style/DebugSettingText"
+                            android:layout_width="0dp"
+                            android:layout_height="match_parent"
+                            android:layout_marginStart="90px"
+                            android:layout_weight="1"
+                            android:background="@null"
+                            android:gravity="center"
+                            tools:ignore="SpeakableTextPresentCheck" />
+
+                        <TextView
+                            style="@style/DebugSettingText"
+                            android:layout_width="93px"
+                            android:layout_height="match_parent"
+                            android:gravity="center_vertical"
+                            android:text="m/s²" />
+
+                    </androidx.appcompat.widget.LinearLayoutCompat>
+
                     <View
+                        android:id="@+id/brakeThresholdDivider"
                         android:layout_width="match_parent"
                         android:layout_height="1dp"
-                        android:background="#F0F0F0" />
-
-                    <TextView
-                        android:id="@+id/tvGearInfo"
-                        style="@style/DebugSettingText"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:text="挂挡档位:"
+                        android:background="#F0F0F0"
+                        app:layout_constraintTop_toBottomOf="@id/btnBrakeThreshold"
                         />
 
-                    <View
-                        android:layout_width="match_parent"
-                        android:layout_height="1dp"
-                        android:background="#F0F0F0" />
+                    <Button
+                        android:id="@+id/btnConnectServerIp"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:gravity="center"
+                        android:padding="@dimen/dp_5"
+                        android:text="连接司机屏IP"
+                        android:textSize="@dimen/dp_24"
+                        android:paddingStart="@dimen/dp_20"
+                        android:paddingEnd="@dimen/dp_20"
+                        app:layout_constraintTop_toBottomOf="@id/brakeThresholdDivider"
+                        app:layout_constraintLeft_toLeftOf="parent"
+                        />
 
-                </LinearLayout>
+                    <androidx.appcompat.widget.AppCompatEditText
+                        android:id="@+id/etConnectServerIp"
+                        android:layout_width="0dp"
+                        android:layout_height="0dp"
+                        android:layout_marginStart="@dimen/dp_30"
+                        android:layout_marginTop="@dimen/dp_10"
+                        android:layout_marginEnd="@dimen/dp_20"
+                        android:layout_marginBottom="@dimen/dp_10"
+                        android:background="@drawable/debug_setting_edit_bg"
+                        android:gravity="center"
+                        android:hint="请输入司机屏IP"
+                        android:textColor="#1A1A1A"
+                        android:textSize="14sp"
+                        app:layout_constraintBottom_toBottomOf="@id/btnConnectServerIp"
+                        app:layout_constraintTop_toTopOf="@id/btnConnectServerIp"
+                        app:layout_constraintLeft_toRightOf="@id/btnConnectServerIp"
+                        app:layout_constraintRight_toRightOf="parent"/>
+
+
+                </androidx.constraintlayout.widget.ConstraintLayout>
 
                 <ToggleButton
                     android:id="@+id/tbHmiController"