From cc5dd866ebae7a40c881133bf2d881ef8b1ffb9b Mon Sep 17 00:00:00 2001
From: yangyakun <yangyakun@zhidaoauto.com>
Date: Sat, 8 Feb 2025 12:18:38 +0800
Subject: [PATCH] =?UTF-8?q?[6.10.0]=20[fea]=20[=E6=B8=85=E6=89=AB=E8=BD=A6?=
 =?UTF-8?q?=E5=8D=8A=E5=85=BC=E5=AE=B9]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mogo/och/biz/login/LoginServiceManager.kt |  9 +++++++-
 .../biz/login/ui/debugview/BusinessView.kt    |  2 ++
 .../res/layout/biz_login_business_view.xml    | 21 ++++++++++++++++---
 .../utilcode/mogo/AppIdentityModeUtils.kt     |  4 ++--
 4 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/OCH/common/biz/src/main/java/com/mogo/och/biz/login/LoginServiceManager.kt b/OCH/common/biz/src/main/java/com/mogo/och/biz/login/LoginServiceManager.kt
index 4c525ac62c..9b2fe300d4 100644
--- a/OCH/common/biz/src/main/java/com/mogo/och/biz/login/LoginServiceManager.kt
+++ b/OCH/common/biz/src/main/java/com/mogo/och/biz/login/LoginServiceManager.kt
@@ -192,7 +192,10 @@ object LoginServiceManager {
 
     fun loginOut() {
         d(tag, "loginOut ")
-        FunctionBuildConfig.ochdebug = false
+        if(FunctionBuildConfig.ochdebug){
+            FunctionBuildConfig.ochdebug = false
+            queryLoginStatusByNet()
+        }
         if(FunctionBuildConfig.isOffLine) {
             FunctionBuildConfig.isOffLine = false
             sendLogin2Client(1)
@@ -449,6 +452,10 @@ object LoginServiceManager {
                 FunctionBuildConfig.appIdentityMode = "${AppIdentityModeUtils.SCHEDULED}_${identity}_${model}"
                 OchSPManager.putString(OCHPRODUCT,AppIdentityModeUtils.SCHEDULED)
             }
+            Product.SWEEPER -> {
+                FunctionBuildConfig.appIdentityMode = "${AppIdentityModeUtils.SWEEPER}_${identity}_${model}"
+                OchSPManager.putString(OCHPRODUCT,AppIdentityModeUtils.SWEEPER)
+            }
         }
         ScreenHelper.setScreenConfig(AbsMogoApplication.getApp())
         CallerDevaToolsManager.updateAppChannel()
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 46b9a8cf20..200feb725f 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
@@ -18,6 +18,7 @@ import com.mogo.och.common.module.biz.login.EnumLoginStatus
 import kotlinx.android.synthetic.main.biz_login_business_view.view.actv_business_bus
 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_sweeper
 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
 
@@ -64,6 +65,7 @@ class BusinessView : ConstraintLayout, BusinessViewModel.IErrorInfoViewCallback
         actv_business_bus.onClick { swtichBusiness(Product.BUS) }
         actv_business_taxi.onClick { swtichBusiness(Product.TAXI) }
         actv_business_charter.onClick { swtichBusiness(Product.CHARTER) }
+        actv_business_sweeper.onClick { swtichBusiness(Product.SWEEPER) }
         actv_debugview.onClick { ToggleDebugView.toggleDebugView.toggle(context) }
     }
 
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 1c6f235c3e..bcff527ebb 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_400"
+    android:layout_height="@dimen/dp_480"
     android:background="@drawable/biz_login_error_info">
 
     <androidx.appcompat.widget.AppCompatTextView
@@ -57,10 +57,25 @@
         android:gravity="center"
         android:text="出租车模式"
         android:textColor="@color/white"
-        app:layout_constraintBottom_toBottomOf="@+id/actv_debugview"
+        app:layout_constraintBottom_toBottomOf="@+id/actv_business_sweeper"
         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_business_sweeper"
+        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="清扫车模式"
+        android:textColor="@color/white"
+        app:layout_constraintBottom_toTopOf="@+id/actv_debugview"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/actv_business_taxi" />
+
     <androidx.appcompat.widget.AppCompatTextView
         android:id="@+id/actv_debugview"
         android:layout_width="match_parent"
@@ -73,7 +88,7 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/actv_business_taxi" />
+        app:layout_constraintTop_toBottomOf="@+id/actv_business_sweeper" />
 
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/AppIdentityModeUtils.kt b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/AppIdentityModeUtils.kt
index 73830199ca..1373c412ce 100644
--- a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/AppIdentityModeUtils.kt
+++ b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/AppIdentityModeUtils.kt
@@ -361,10 +361,10 @@ object AppIdentityModeUtils {
 
 enum class Product(val code: Int) {
     NONE(0),
-    BUS(10),
     TAXI(9),
-    SWEEPER(-1),
+    BUS(10),
     SHUTTLE(11),
+    SWEEPER(12),
     CHARTER(13) ,
     SCHEDULED(14);
     companion object {