From 60f20cfb6304fab9172cd215e7dd1c02dc76be38 Mon Sep 17 00:00:00 2001
From: yangyakun <yangyakun@zhidaoauto.com>
Date: Tue, 14 May 2024 14:07:55 +0800
Subject: [PATCH 1/2] =?UTF-8?q?[fea]=20[=E7=99=BB=E5=BD=95=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E6=B7=BB=E5=8A=A0=E5=B1=95=E7=A4=BAdebugview=20?=
 =?UTF-8?q?=E6=B6=88=E6=81=AF]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../och/biz/login/ui/debugview/BusinessView.kt  |  3 +++
 .../main/res/layout/biz_login_business_view.xml | 17 +++++++++++++++--
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/OCH/common/biz/src/main/java/com/mogo/och/biz/login/ui/debugview/BusinessView.kt b/OCH/common/biz/src/main/java/com/mogo/och/biz/login/ui/debugview/BusinessView.kt
index 8041973b4c..2eb8674dba 100644
--- a/OCH/common/biz/src/main/java/com/mogo/och/biz/login/ui/debugview/BusinessView.kt
+++ b/OCH/common/biz/src/main/java/com/mogo/och/biz/login/ui/debugview/BusinessView.kt
@@ -7,6 +7,7 @@ import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.findViewTreeViewModelStoreOwner
 import com.mogo.eagle.core.data.config.FunctionBuildConfig
+import com.mogo.eagle.core.function.hmi.ui.setting.ToggleDebugView
 import com.mogo.eagle.core.utilcode.kotlin.onClick
 import com.mogo.och.biz.R
 import com.mogo.och.common.module.biz.login.BusinessEnum
@@ -15,6 +16,7 @@ import kotlinx.android.synthetic.main.biz_login_business_view.view.actv_business
 import kotlinx.android.synthetic.main.biz_login_business_view.view.actv_business_charter
 import kotlinx.android.synthetic.main.biz_login_business_view.view.actv_business_shuttle
 import kotlinx.android.synthetic.main.biz_login_business_view.view.actv_business_taxi
+import kotlinx.android.synthetic.main.biz_login_business_view.view.actv_debugview
 
 
 class BusinessView : ConstraintLayout, BusinessViewModel.IErrorInfoViewCallback {
@@ -48,6 +50,7 @@ class BusinessView : ConstraintLayout, BusinessViewModel.IErrorInfoViewCallback
         actv_business_bus.onClick { swtichBusiness(BusinessEnum.Bus) }
         actv_business_taxi.onClick { swtichBusiness(BusinessEnum.Taxi) }
         actv_business_charter.onClick { swtichBusiness(BusinessEnum.Charter) }
+        actv_debugview.onClick { ToggleDebugView.toggleDebugView.toggle(context) }
     }
 
     private fun swtichBusiness(businessEnum: BusinessEnum){
diff --git a/OCH/common/biz/src/main/res/layout/biz_login_business_view.xml b/OCH/common/biz/src/main/res/layout/biz_login_business_view.xml
index 48ebd3c80b..b022aa4d9a 100644
--- a/OCH/common/biz/src/main/res/layout/biz_login_business_view.xml
+++ b/OCH/common/biz/src/main/res/layout/biz_login_business_view.xml
@@ -3,7 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="@dimen/dp_200"
-    android:layout_height="@dimen/dp_300"
+    android:layout_height="@dimen/dp_400"
     android:background="@drawable/biz_login_error_info">
 
     <androidx.appcompat.widget.AppCompatTextView
@@ -57,10 +57,23 @@
         android:gravity="center"
         android:text="出租车模式"
         android:textColor="@color/white"
-        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintBottom_toBottomOf="@+id/actv_debugview"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/actv_business_shuttle" />
+    <androidx.appcompat.widget.AppCompatTextView
+        android:id="@+id/actv_debugview"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingTop="@dimen/dp_20"
+        android:paddingBottom="@dimen/dp_20"
+        android:gravity="center"
+        android:text="debugview"
+        android:textColor="@color/white"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/actv_business_taxi" />
 
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

From f894269833efe8ec7ce547e74861e89371f2e4eb Mon Sep 17 00:00:00 2001
From: yangyakun <yangyakun@zhidaoauto.com>
Date: Thu, 16 May 2024 18:33:59 +0800
Subject: [PATCH 2/2] =?UTF-8?q?[6.4.2]=20[=E8=B0=83=E8=AF=95=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E8=B0=83=E6=95=B4]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/mogo/och/biz/login/ui/LoginFragment.kt  | 8 +++++---
 .../com/mogo/och/biz/login/ui/LoginPassengerFragment.kt   | 6 +++---
 .../biz/src/main/res/layout/biz_login_business_view.xml   | 2 +-
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/OCH/common/biz/src/main/java/com/mogo/och/biz/login/ui/LoginFragment.kt b/OCH/common/biz/src/main/java/com/mogo/och/biz/login/ui/LoginFragment.kt
index 4b0dfa7535..b1d91d3dc3 100644
--- a/OCH/common/biz/src/main/java/com/mogo/och/biz/login/ui/LoginFragment.kt
+++ b/OCH/common/biz/src/main/java/com/mogo/och/biz/login/ui/LoginFragment.kt
@@ -117,9 +117,11 @@ class LoginFragment : MvpFragment<LoginFragment?, LoginPresenter?>(), ILoginView
             }
         }
         biz_actv_login_show_sn.text = SharedPrefsMgr.getInstance().sn
-        biz_actv_login_show_sn.setOnLongClickListener {
-            bv_switch_business.selectBusniess()
-            true
+        if(BuildConfig.DEBUG) {
+            biz_actv_login_show_sn.setOnLongClickListener {
+                bv_switch_business.selectBusniess()
+                true
+            }
         }
     }
 
diff --git a/OCH/common/biz/src/main/java/com/mogo/och/biz/login/ui/LoginPassengerFragment.kt b/OCH/common/biz/src/main/java/com/mogo/och/biz/login/ui/LoginPassengerFragment.kt
index 4e6bf92d3f..d94fcf32b7 100644
--- a/OCH/common/biz/src/main/java/com/mogo/och/biz/login/ui/LoginPassengerFragment.kt
+++ b/OCH/common/biz/src/main/java/com/mogo/och/biz/login/ui/LoginPassengerFragment.kt
@@ -63,11 +63,11 @@ class LoginPassengerFragment : MvpFragment<LoginPassengerFragment?, LoginPasseng
 
         actv_app_version?.text = FlavorUtils.getInfo()
 
-        actv_app_version?.setOnLongClickListener {
-            if(BuildConfig.DEBUG){
+        if(BuildConfig.DEBUG) {
+            actv_app_version?.setOnLongClickListener {
                 bv_switch_business?.selectBusniess()
+                true
             }
-            true
         }
 
         CallerLogger.d(TAG, "init")
diff --git a/OCH/common/biz/src/main/res/layout/biz_login_business_view.xml b/OCH/common/biz/src/main/res/layout/biz_login_business_view.xml
index b022aa4d9a..1c6f235c3e 100644
--- a/OCH/common/biz/src/main/res/layout/biz_login_business_view.xml
+++ b/OCH/common/biz/src/main/res/layout/biz_login_business_view.xml
@@ -68,7 +68,7 @@
         android:paddingTop="@dimen/dp_20"
         android:paddingBottom="@dimen/dp_20"
         android:gravity="center"
-        android:text="debugview"
+        android:text="调试页面"
         android:textColor="@color/white"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"