From c0cf9689cde573fb27bd12dc71c9c47a5cd250de Mon Sep 17 00:00:00 2001
From: yangyakun <yangyakun@zhidaoauto.com>
Date: Fri, 21 Feb 2025 14:41:07 +0800
Subject: [PATCH] =?UTF-8?q?[6.10.0]=20[fix]=20[=E5=8D=87=E7=BA=A7code=20?=
 =?UTF-8?q?=E5=8F=98=E5=8C=96]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../utilcode/mogo/AppIdentityModeUtils.kt     | 88 +++++++++++--------
 1 file changed, 51 insertions(+), 37 deletions(-)

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 bbb1fc93b2..e99f2e2eb9 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
@@ -6,27 +6,8 @@ package com.mogo.eagle.core.utilcode.mogo
  */
 fun AppIdentityModeUtils.getMisChannelCode(appIdentityMode: String): Int {
     return when {
-        isTaxi(appIdentityMode) && isPassenger(appIdentityMode) -> 1    // 出租乘客端
-        isTaxi(appIdentityMode) && isDriver(appIdentityMode) -> 2       // 出租司机端
-
-        isBus(appIdentityMode) && isPassenger(appIdentityMode) && isB1(appIdentityMode) -> 3       // B1公交乘客端
-        isBus(appIdentityMode) && isDriver(appIdentityMode) && isB1(appIdentityMode) -> 4          // B1公交司机端
-
-        isShuttle(appIdentityMode) && isPassenger(appIdentityMode) && isB1(appIdentityMode) -> 3   // B1接驳乘客端
-        isShuttle(appIdentityMode) && isDriver(appIdentityMode) && isB1(appIdentityMode)  -> 4     // B1接驳司机端
-
-
-        isCharter(appIdentityMode) && isPassenger(appIdentityMode) -> 8 // 包车乘客端
-        isCharter(appIdentityMode) && isDriver(appIdentityMode) -> 9    // 包车司机端
-
-        isSweeper(appIdentityMode) && isDriver(appIdentityMode) -> 12    // 清扫车司机端
-
-        isBus(appIdentityMode) && isPassenger(appIdentityMode) && isB2(appIdentityMode) -> 17      // B2公交乘客端
-        isBus(appIdentityMode) && isDriver(appIdentityMode) && isB2(appIdentityMode) -> 15         // B2公交司机端
-
-        isShuttle(appIdentityMode) && isPassenger(appIdentityMode) && isB2(appIdentityMode) -> 17  // B2接驳乘客端
-        isShuttle(appIdentityMode) && isDriver(appIdentityMode) && isB2(appIdentityMode) -> 15     // B2接驳司机端
-
+        isPassenger(appIdentityMode) -> 22    // 出租乘客端
+        isDriver(appIdentityMode) -> 21       // 出租司机端
         else -> 0
     }
 }
@@ -147,6 +128,7 @@ object AppIdentityModeUtils {
         }
         return false
     }
+
     @JvmStatic
     fun isShuttleDriver(appIdentityMode: String): Boolean {
         return isShuttle(appIdentityMode) && isDriver(appIdentityMode)
@@ -321,6 +303,7 @@ object AppIdentityModeUtils {
             else -> Product.NONE
         }
     }
+
     @JvmStatic
     fun getRole(appIdentityMode: String): Role {
         val (_, role, _) = getInfo(appIdentityMode)
@@ -331,7 +314,7 @@ object AppIdentityModeUtils {
         }
     }
 
-    fun getVehicle(appIdentityMode: String):Vehicle{
+    fun getVehicle(appIdentityMode: String): Vehicle {
         val (_, _, carType) = getInfo(appIdentityMode)
         return Vehicle.getVehicleByName(carType)
     }
@@ -365,8 +348,9 @@ enum class Product(val code: Int) {
     BUS(10),
     SHUTTLE(11),
     SWEEPER(12),
-    CHARTER(13) ,
+    CHARTER(13),
     SCHEDULED(14);
+
     companion object {
         @JvmStatic
         fun valueOf(code: Int?): Product {
@@ -377,7 +361,8 @@ enum class Product(val code: Int) {
             }
             return NONE
         }
-        fun getName(code: Int?):String{
+
+        fun getName(code: Int?): String {
             val product = valueOf(code)
             return when (product) {
                 NONE -> ""
@@ -391,34 +376,55 @@ enum class Product(val code: Int) {
         }
 
         fun getCodeFromWxQr(bizTypeCode: String): Int {
-            return  when (bizTypeCode) {
+            return when (bizTypeCode) {
                 "0" -> BUS.code
                 "1" -> SHUTTLE.code
                 "2" -> TAXI.code
                 "3" -> CHARTER.code
                 "4" -> SCHEDULED.code
-                else -> {0}
+                else -> {
+                    0
+                }
             }
         }
     }
 }
 
-enum class Vehicle(val code:String){
+enum class Vehicle(val code: String) {
     NONE("Vehicle"),
     T1T2("T1T2"),
     B1("B1"),
     B2("B2"),
     C1("C1"),
     M1("M1");
-    companion object{
-        fun getVehicleByName(name:String):Vehicle{
+
+    companion object {
+        fun getVehicleByName(name: String): Vehicle {
             return when (name) {
-                NONE.code -> {NONE}
-                T1T2.code -> {T1T2}
-                B1.code -> {B1}
-                B2.code -> {B2}
-                C1.code -> {C1}
-                M1.code -> {M1}
+                NONE.code -> {
+                    NONE
+                }
+
+                T1T2.code -> {
+                    T1T2
+                }
+
+                B1.code -> {
+                    B1
+                }
+
+                B2.code -> {
+                    B2
+                }
+
+                C1.code -> {
+                    C1
+                }
+
+                M1.code -> {
+                    M1
+                }
+
                 else -> {
                     NONE
                 }
@@ -426,32 +432,40 @@ enum class Vehicle(val code:String){
         }
 
         @JvmStatic
-        fun getCarVehicleFromServerName(serverName:String?): Vehicle {
+        fun getCarVehicleFromServerName(serverName: String?): Vehicle {
             return when (serverName) {
                 "E70" -> {
                     T1T2
                 }
+
                 "H9" -> {
                     T1T2
                 }
+
                 "B1" -> {
                     B1
                 }
+
                 "金旅牌XML6606JEVY0" -> {
                     B1
                 }
+
                 "NJL6450ICEV" -> {
                     B1
                 }
-                "B2","M2" -> {
+
+                "B2", "M2" -> {
                     B2
                 }
+
                 "M1" -> {
                     M1
                 }
+
                 "BJ5122TXSEV-H1" -> {
                     C1
                 }
+
                 else -> {
                     T1T2
                 }