From fa2043c97ab244fecfaaa48c500b695d94dcb43e Mon Sep 17 00:00:00 2001
From: chenfufeng <chenfufeng@zhidaoauto.com>
Date: Wed, 27 Sep 2023 14:54:25 +0800
Subject: [PATCH 1/2] =?UTF-8?q?[6.1.0][Fix]AD=E8=AF=B7=E6=B1=82=E7=9A=84?=
 =?UTF-8?q?=E5=B9=B3=E8=A1=8C=E9=A9=BE=E9=A9=B6=E5=8F=AF=E7=82=B9=E5=87=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../eagle/core/function/hmi/ui/widget/ParallelDriveView.kt  | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/ParallelDriveView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/ParallelDriveView.kt
index 28272c135c..84742609d3 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/ParallelDriveView.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/ParallelDriveView.kt
@@ -99,6 +99,10 @@ class ParallelDriveView @JvmOverloads constructor(
                     ToastUtils.showShort("请求已取消！")
                     checkAvailableAndUpdateUI()
                 }
+                AD_REQUESTING -> {
+                    Log.d(TAG, "Click-自动驾驶正在请求平行驾驶")
+                    ToastUtils.showShort("自动驾驶正在请求平行驾驶")
+                }
                 UNAVAILABLE -> {
                     Log.d(TAG, "Click-请P档驻车并松开油门刹车后请求")
                     ToastUtils.showShort("请P档驻车并松开油门刹车后请求")
@@ -251,7 +255,7 @@ class ParallelDriveView @JvmOverloads constructor(
 
             AD_REQUESTING -> {
                 stopSyncAnimation()
-                rootLayout.isEnabled = false
+                rootLayout.isEnabled = true
                 statusIconOuter.visibility = GONE
                 rootLayout.alpha = 1f
                 statusIcon.background =

From e624e914648f88c32ae9d2ee019f50595058535f Mon Sep 17 00:00:00 2001
From: chenfufeng <chenfufeng@zhidaoauto.com>
Date: Wed, 27 Sep 2023 16:51:45 +0800
Subject: [PATCH 2/2] =?UTF-8?q?[6.1.0][Opt]=E4=BC=98=E5=8C=96=E4=B8=8BQUIC?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=95=E6=8C=89=E9=92=AE=E6=8F=90=E7=A4=BA=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/res/layout/view_debug_setting.xml    | 23 +++++++++----------
 1 file changed, 11 insertions(+), 12 deletions(-)

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 041a3b4f91..dd886db100 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
@@ -290,18 +290,6 @@
                 android:textOn="关闭obu预警融合"
                 android:textSize="@dimen/dp_24" />
 
-            <ToggleButton
-                android:id="@+id/tbCronet"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_margin="@dimen/dp_10"
-                android:padding="@dimen/dp_20"
-                android:background="@drawable/radio_button_normal_background_right"
-                android:textColor="#000"
-                android:textOff="开启QUIC协议(网络信号差时)"
-                android:textOn="关闭QUIC协议"
-                android:textSize="@dimen/dp_24" />
-
             <!-- APP升级数据  start -->
             <ToggleButton
                 android:id="@+id/tbAppUpgrade"
@@ -2365,6 +2353,17 @@
 
                 </LinearLayout>
             </LinearLayout>
+            <ToggleButton
+                android:id="@+id/tbCronet"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_margin="@dimen/dp_10"
+                android:padding="@dimen/dp_20"
+                android:background="@drawable/radio_button_normal_background_right"
+                android:textColor="#000"
+                android:textOff="开启QUIC协议(服务器暂不支持)"
+                android:textOn="关闭QUIC协议"
+                android:textSize="@dimen/dp_24" />
         </LinearLayout>
 
     </androidx.core.widget.NestedScrollView>