Merge branch 'dev_RoboBus_P_230220_1.0.1' into 'dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0'

# Conflicts:
#   app/build.gradle

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

@@ -24,6 +24,7 @@ object AppIdentityModeUtils {
     private const val BUS = "Bus"
     private const val SWEEPER = "Sweeper"
     private const val SHUTTLE = "Shuttle"
+    private const val CHARTER = "Charter"
 
     // 车型
     private const val M1 = "M1"
@@ -106,15 +107,6 @@ object AppIdentityModeUtils {
         }
         return false
     }
-
-    @JvmStatic
-    fun isM1(appIdentityMode: String): Boolean {
-        val (_, _, model) = getInfo(appIdentityMode)
-        if (model.isNotEmpty()) {
-            return model == M1
-        }
-        return false
-    }
     @JvmStatic
     fun isM2(appIdentityMode: String): Boolean {
         val (_, _, model) = getInfo(appIdentityMode)
@@ -204,5 +196,27 @@ object AppIdentityModeUtils {
     }
 
 
+    /**
+     * 是否包车
+     */
+    @JvmStatic
+    fun isCharter(appIdentityMode: String): Boolean {
+        val (bussness, _, _) = getInfo(appIdentityMode)
+        if (bussness.isNotEmpty()) {
+            return bussness == CHARTER
+        }
+        return false
+    }
+    @JvmStatic
+    fun isM1(appIdentityMode: String): Boolean {
+        val (_, _, model) = getInfo(appIdentityMode)
+        if (model.isNotEmpty()) {
+            return model == M1
+        }
+        return false
+    }
+
+
+
 }