From 564903e5151dbbae578ef0a7502d0a10bdd79473 Mon Sep 17 00:00:00 2001
From: xuxinchao <xuxinchao@zhidaoauto.com>
Date: Tue, 25 Jul 2023 11:58:42 +0800
Subject: [PATCH 1/2] =?UTF-8?q?[3.4.0]=E8=B0=83=E6=95=B4=E8=BF=90=E8=90=A5?=
 =?UTF-8?q?=E9=9D=A2=E6=9D=BF360=E7=8E=AF=E8=A7=86=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=E4=BD=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/res/layout/view_sop_setting.xml  | 29 ++++++++++---------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_sop_setting.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_sop_setting.xml
index f745fa7a19..83498eb0b9 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_sop_setting.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_sop_setting.xml
@@ -279,18 +279,7 @@
         app:layout_constraintRight_toLeftOf="@id/verticalGuideLine"
         />
 
-    <androidx.appcompat.widget.SwitchCompat
-        android:id="@+id/tbNew360LookAround"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="360环视"
-        android:paddingTop="25dp"
-        android:paddingBottom="25dp"
-        android:scaleY="1.2"
-        android:scaleX="1.2"
-        app:layout_constraintTop_toBottomOf="@id/tbNewV2NData"
-        app:layout_constraintLeft_toRightOf="@+id/verticalGuideLine"
-        app:layout_constraintLeft_toLeftOf="parent" />
+
 
         <androidx.appcompat.widget.SwitchCompat
             android:id="@+id/tbWeakNetSlowDown"
@@ -319,12 +308,26 @@
             app:layout_constraintLeft_toRightOf="@+id/verticalGuideLine"
             app:layout_constraintRight_toRightOf="parent"/>
 
+        <androidx.appcompat.widget.SwitchCompat
+            android:id="@+id/tbNew360LookAround"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="360环视"
+            android:paddingTop="25dp"
+            android:paddingBottom="25dp"
+            android:scaleY="1.2"
+            android:scaleX="1.2"
+            app:layout_constraintTop_toBottomOf="@id/tbWeakNetSlowDown"
+            app:layout_constraintRight_toLeftOf="@+id/verticalGuideLine"
+            app:layout_constraintLeft_toLeftOf="parent"
+            />
+
         <TextView
             android:id="@+id/tvSpeedThresholdTitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             app:layout_constraintLeft_toLeftOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tbWeakNetSlowDown"
+            app:layout_constraintTop_toBottomOf="@id/tbNew360LookAround"
             android:text="变道速度阈值："
             android:textSize="@dimen/dp_36"
             android:textColor="#1A1A1A"

From 07e8dd067eeb820521ec62c9000735a5be50e4c2 Mon Sep 17 00:00:00 2001
From: renwj <renwenjie@zhidaoauto.com>
Date: Tue, 25 Jul 2023 14:05:16 +0800
Subject: [PATCH 2/2] =?UTF-8?q?[3.4.0][=E9=AD=94=E6=96=B9]=20=E6=9B=B4?=
 =?UTF-8?q?=E6=94=B9=E9=AD=94=E6=96=B9=E8=B0=83=E8=AF=95=E6=A8=A1=E5=BC=8F?=
 =?UTF-8?q?=E5=BC=80=E5=90=AF=E5=90=8EToast=E5=B1=95=E7=A4=BA=E6=96=87?=
 =?UTF-8?q?=E6=A1=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mofang/MoGoMoFangProviderImpl.kt                       | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/mofang/MoGoMoFangProviderImpl.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/mofang/MoGoMoFangProviderImpl.kt
index a4ed1a2a8f..025212fbd2 100644
--- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/mofang/MoGoMoFangProviderImpl.kt
+++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/mofang/MoGoMoFangProviderImpl.kt
@@ -177,7 +177,7 @@ internal class MoGoMoFangProviderImpl: IMoGoMoFangProvider, OnMoFangDeviceListen
     override fun onBluetoothKeyBoardCombineClicked(vararg keyCodes: Int) {
         val keycodesText = keyCodes.joinToString(",") { KeyEvent.keyCodeToString(it).replace("KEYCODE_", "", true) }
         if (isTest.get()) {
-            showToast("组合键[$keycodesText]触发了")
+            showToast("[$keycodesText]")
         }
         try {
             MoFangAnalyticUtils.track(EVENT_INPUT, mutableMapOf(EVENT_INPUT_SUB_KEYCODE to keycodesText, EVENT_INPUT_SUB_TYPE to "3"))
@@ -192,7 +192,8 @@ internal class MoGoMoFangProviderImpl: IMoGoMoFangProvider, OnMoFangDeviceListen
 
     override fun onBluetoothKeyBoardLongClicked(keyCode: Int) {
         if (isTest.get()) {
-            showToast("长按键[${KeyEvent.keyCodeToString(keyCode).replace("KEYCODE_", "", true)}]触发了")
+            val key = KeyEvent.keyCodeToString(keyCode).replace("KEYCODE_", "", true)
+            showToast("[$key$key]")
         }
         try {
             MoFangAnalyticUtils.track(EVENT_INPUT, mutableMapOf(EVENT_INPUT_SUB_KEYCODE to keyCode.toString(), EVENT_INPUT_SUB_TYPE to "2"))
@@ -210,7 +211,7 @@ internal class MoGoMoFangProviderImpl: IMoGoMoFangProvider, OnMoFangDeviceListen
     override fun onBluetoothKeyboardClicked(keyCode: Int) {
         val keycodeText = KeyEvent.keyCodeToString(keyCode)
         if (isTest.get()) {
-            showToast("单击键[${keycodeText.replace("KEYCODE_", "", true)}]触发了")
+            showToast("[${keycodeText.replace("KEYCODE_", "", true)}]")
         }
         try {
             MoFangAnalyticUtils.track(EVENT_INPUT, mutableMapOf(EVENT_INPUT_SUB_KEYCODE to keyCode.toString(), EVENT_INPUT_SUB_TYPE to "1"))