[6.10.0]

[fea]
[删除车型维度]

core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/AppIdentityModeUtils.kt

@@ -330,6 +330,12 @@ object AppIdentityModeUtils {
             else -> Role.NONE
         }
     }
+
+    fun getVehicle(appIdentityMode: String):Vehicle{
+        val (_, _, carType) = getInfo(appIdentityMode)
+        return Vehicle.getVehicleByName(carType)
+    }
+
     @JvmStatic
     fun getCarType(appIdentityMode: String): CarType {
         val (_, _, carType) = getInfo(appIdentityMode)
@@ -371,6 +377,75 @@ enum class Product(val code: Int) {
             }
             return NONE
         }
+        fun getName(code: Int?):String{
+            val product = valueOf(code)
+            return when (product) {
+                NONE -> ""
+                BUS -> AppIdentityModeUtils.BUS
+                TAXI -> AppIdentityModeUtils.TAXI
+                SWEEPER -> AppIdentityModeUtils.SWEEPER
+                SHUTTLE -> AppIdentityModeUtils.SHUTTLE
+                CHARTER -> AppIdentityModeUtils.CHARTER
+                SCHEDULED -> AppIdentityModeUtils.SCHEDULED
+            }
+        }
+    }
+}
+
+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{
+            return when (name) {
+                NONE.code -> {NONE}
+                T1T2.code -> {T1T2}
+                B1.code -> {B1}
+                B2.code -> {B2}
+                C1.code -> {C1}
+                M1.code -> {M1}
+                else -> {
+                    NONE
+                }
+            }
+        }
+
+        @JvmStatic
+        fun getCarVehicleFromServerName(serverName:String?): Vehicle {
+            return when (serverName) {
+                "E70" -> {
+                    T1T2
+                }
+                "H9" -> {
+                    T1T2
+                }
+                "B1" -> {
+                    B1
+                }
+                "金旅牌XML6606JEVY0" -> {
+                    B1
+                }
+                "NJL6450ICEV" -> {
+                    B1
+                }
+                "B2","M2" -> {
+                    B2
+                }
+                "M1" -> {
+                    M1
+                }
+                "BJ5122TXSEV-H1" -> {
+                    C1
+                }
+                else -> {
+                    T1T2
+                }
+            }
+        }
     }
 }
 

core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/logger/scene/SceneConstant.kt

@@ -22,7 +22,7 @@ class SceneConstant {
         const val M_OTHER = "M_OTHER-"
 
         // Och common
-        const val M_OCHCOMMON = "M_OCHCOMMON-"
+        const val M_OCHCOMMON = "M_OCH-"
 
         // Och offline
         const val M_OFFLINE = "M_OFFLINE-"