From 35c0e8c98fca92a0b179d5ce5841d63e5d32850a Mon Sep 17 00:00:00 2001
From: lixiaopeng <lixiaopeng@zhidaoauto.com>
Date: Mon, 13 Mar 2023 15:34:56 +0800
Subject: [PATCH] =?UTF-8?q?[dev=5Farch=5Fopt=5F3.0]=20=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E6=B1=BD=E8=BD=A6=E4=BF=A1=E6=81=AF=E6=98=BE=E7=A4=BA=E5=9C=A8?=
 =?UTF-8?q?=E8=B0=83=E8=AF=95=E9=9D=A2=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../binding/BindingCarNetWorkManager.kt       | 38 ++++++-------------
 .../main/res/layout/view_debug_setting.xml    |  2 +-
 2 files changed, 12 insertions(+), 28 deletions(-)

diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/binding/BindingCarNetWorkManager.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/binding/BindingCarNetWorkManager.kt
index a6b0fccc0f..e7a8d157db 100644
--- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/binding/BindingCarNetWorkManager.kt
+++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/binding/BindingCarNetWorkManager.kt
@@ -72,36 +72,26 @@ class BindingCarNetWorkManager private constructor() {
                 override fun onSubscribe(d: Disposable) {}
                 override fun onNext(info: BindingCarInfo) {
                     if (info != null && info.getData() != null) {
-                        d(
-                            SceneConstant.M_BINDING + TAG,
-                            "getBindingCarInfo data =" + info.getData().toString()
+                        d(SceneConstant.M_BINDING + TAG, "getBindingCarInfo data =" + info.getData().toString())
+                        SharedPrefsMgr.getInstance(context).putString(
+                            SharedPrefsConstants.CAR_INFO,
+                            GsonUtils.toJson(info.getData())
                         )
-                        updateCarVrIconRes(info.getData().brandId);
                         when (info.getData().compare) {
                             "0" -> showBindingCarDialog()
                             "3" -> showModifyBindingCarDialog()
                             "null" -> TipToast.shortTip("当前工控机没有入库")
                         }
-                        SharedPrefsMgr.getInstance(context).putString(
-                            SharedPrefsConstants.CAR_INFO,
-                            GsonUtils.toJson(info.getData())
-                        )
+                        updateCarVrIconRes(info.getData().brandId);
                     } else {
-//                        SharedPrefsMgr.getInstance(context).putString(
-//                            SharedPrefsConstants.CAR_INFO, "null")
-                        e(
-                            SceneConstant.M_BINDING + TAG, "getBindingCarInfo data = null "
-                        )
+                        SharedPrefsMgr.getInstance(context).putString(SharedPrefsConstants.CAR_INFO, "")
+                        e(SceneConstant.M_BINDING + TAG, "getBindingCarInfo data = null ")
                     }
                 }
 
                 override fun onError(e: Throwable) {
-//                    SharedPrefsMgr.getInstance(context).putString(
-//                        SharedPrefsConstants.CAR_INFO, e.message.toString())
-                    e(
-                        SceneConstant.M_BINDING + TAG,
-                        "getBindingCarInfo onError e = " + e.toString() + "---e.getMessage = " + e.message
-                    )
+                    SharedPrefsMgr.getInstance(context).putString(SharedPrefsConstants.CAR_INFO, "")
+                    e(SceneConstant.M_BINDING + TAG, "getBindingCarInfo onError e = " + e.toString() + "---e.getMessage = " + e.message)
                 }
 
                 override fun onComplete() {}
@@ -138,19 +128,13 @@ class BindingCarNetWorkManager private constructor() {
                 override fun onNext(info: ModifyBindingcarInfo) {
                     if (info != null) {
                         callBack.invoke(info)
-                        d(
-                            SceneConstant.M_BINDING + TAG,
-                            "modifyBindingCar onNext code = " + info.code + "---msg = " + info.msg + "--info.toString() = " + info.toString()
-                        )
+                        d(SceneConstant.M_BINDING + TAG, "modifyBindingCar onNext code = " + info.code + "---msg = " + info.msg + "--info.toString() = " + info.toString())
                         updateCarVrIconRes(info.data.brandId)
                     }
                 }
 
                 override fun onError(e: Throwable) {
-                    e(
-                        SceneConstant.M_BINDING + TAG,
-                        "modifyBindingCar onError e = " + e.toString() + "---e.getMessage = " + e.message
-                    )
+                    e(SceneConstant.M_BINDING + TAG, "modifyBindingCar onError e = " + e.toString() + "---e.getMessage = " + e.message)
                 }
 
                 override fun onComplete() {}
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 8ba6b14009..0ab7cf9f74 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
@@ -222,7 +222,7 @@
                 style="@style/DebugSettingText"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:minLines="5" />
+                android:minLines="4" />
 
             <View
                 android:layout_width="match_parent"