diff --git a/OCH/facade/script/och.gradle b/OCH/facade/script/och.gradle
index 02474f769b..86583651c9 100644
--- a/OCH/facade/script/och.gradle
+++ b/OCH/facade/script/och.gradle
@@ -4,34 +4,34 @@ project.dependencies {
     if (Boolean.valueOf(USE_MAVEN_PACKAGE)) {
 
     } else {
-        if (isCurrentDriver("ochFT")) {
+        if (isCurrentDriver("C1")) {
             implementation project.project(':OCH:sweeper:driver')
-        } else if (isCurrentDriver("ochJL")) {
+        } else if (isCurrentDriver("B1")) {
             implementation project.project(':OCH:shuttle:driver')
             implementation project.project(':OCH:bus:driver')
-        } else if (isCurrentPassenger("ochJL")) {
+        } else if (isCurrentPassenger("B1")) {
             implementation project.project(':OCH:bus:passenger')
             implementation project.project(':OCH:shuttle:passenger')
-        } else if (isCurrentDriver("ochM1")) {
-            println "utils.gradle------isDriverOchM1"
+        } else if (isCurrentDriver("M1")) {
+            println "utils.gradle------isDriverM1"
             implementation project.project(':OCH:charter:driver')
-        } else if (isCurrentPassenger("ochM1")) {
+        } else if (isCurrentPassenger("M1")) {
             implementation project.project(':OCH:charter:passenger')
             println "utils.gradle------isPassengerM1"
-        } else if (isCurrentDriver("ochM2")) {
+        } else if (isCurrentDriver("B2")) {
             implementation project.project(':OCH:shuttle:driver')
             implementation project.project(':OCH:bus:driver')
-        } else if (isCurrentPassenger("ochM2")) {
+        } else if (isCurrentPassenger("B2")) {
             implementation project.project(':OCH:bus:passenger')
             implementation project.project(':OCH:shuttle:passenger')
-        } else if (isCurrentDriver("ochDFHQ")) {
+        } else if (isCurrentDriver("ochT1T2")) {
             if(isCurrentDriver("saas")){
                 implementation project.project(':OCH:taxi:unmanned-driver')
             }
             if(isCurrentDriver("mogo")){
                 implementation project.project(':OCH:taxi:driver')
             }
-        } else if (isCurrentPassenger("ochDFHQ")) {
+        } else if (isCurrentPassenger("ochT1T2")) {
             if(isCurrentDriver("saas")){
                 implementation project.project(':OCH:taxi:unmanned-passenger')
             }
diff --git a/OCH/facade/script/utils.gradle b/OCH/facade/script/utils.gradle
index 9db724526c..8876c6736e 100644
--- a/OCH/facade/script/utils.gradle
+++ b/OCH/facade/script/utils.gradle
@@ -32,7 +32,7 @@ boolean isPassenger() {
 
 boolean isJL() {
     for (String s : gradle.startParameter.taskNames) {
-        if (s.contains("OchJL") | s.contains("ochJL")) {
+        if (s.contains("b1") | s.contains("B1")) {
             return true
         }
     }
@@ -41,7 +41,7 @@ boolean isJL() {
 
 boolean isM2() {
     for (String s : gradle.startParameter.taskNames) {
-        if (s.contains("OchM2") | s.contains("ochM2")) {
+        if (s.contains("b2") | s.contains("B2")) {
             return true
         }
     }
diff --git a/app/build.gradle b/app/build.gradle
index 8d386c5500..48a8399911 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -29,6 +29,31 @@ android {
             }
         }
 
+        buildConfigField 'boolean', 'IS_LAUNCHER', 'true'
+        buildConfigField 'String', 'SOCKET_APP_ID', '\"com.mogo.launcher\"'
+        buildConfigField 'String', 'WORKING_BRANCH_NAME', getWorkingBranchName()
+        buildConfigField 'String', 'WORKING_BRANCH_HASH', getWorkingBranchHash()
+        buildConfigField 'String', 'APP_BUILD_TIME', getBuildTime()
+        buildConfigField 'String', 'MAP_SDK_VERSION', "\"${MAP_SDK_VERSION}\""
+        buildConfigField 'String', 'MAP_SDK_OPT_VERSION', "\"${MAP_SDK_OPERATION_VERSION}\""
+
+        // ②车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0
+        buildConfigField 'int', 'CAR_MACHINE_TYPE', '2'
+
+        // ④GPS数据提供源： 0-Android系统，1-工控机，2-OBU
+        buildConfigField 'int', 'GPS_PROVIDER', "1"
+
+        // ⑤构建的是否是演示（美化）模式
+        buildConfigField 'boolean', 'IS_DEMO_MODE', 'false'
+
+        buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.8.102\""
+
+        // 是否支持卡顿检测
+        buildConfigField 'boolean', 'IS_SUPPORT_JUNK_DETECT', "${rootProject.isJunkDetectEnable()}"
+
+        buildConfigField 'String', 'SWEEPER_DEFAULT_MODE', '\"Cloud\"'
+        buildConfigField 'boolean', 'SWEEPER_CAN_SWITCH_MODE', 'true'
+
         multiDexEnabled true
     }
 
@@ -114,37 +139,8 @@ android {
     // 项目 business
     // 业务线 product
     // 车型 vehicle
-    flavorDimensions "project","vehicle" ,"role","basic", "env"
+    flavorDimensions "project","vehicle" ,"role", "env"
     productFlavors {
-        // launcher app
-        launcher {
-            dimension "basic"
-            // 是否作为 launcher 运行
-            buildConfigField 'boolean', 'IS_LAUNCHER', 'true'
-            buildConfigField 'String', 'SOCKET_APP_ID', '\"com.mogo.launcher\"'
-            buildConfigField 'String', 'WORKING_BRANCH_NAME', getWorkingBranchName()
-            buildConfigField 'String', 'WORKING_BRANCH_HASH', getWorkingBranchHash()
-            buildConfigField 'String', 'APP_BUILD_TIME', getBuildTime()
-            buildConfigField 'String', 'MAP_SDK_VERSION', "\"${MAP_SDK_VERSION}\""
-            buildConfigField 'String', 'MAP_SDK_OPT_VERSION', "\"${MAP_SDK_OPERATION_VERSION}\""
-
-            // ②车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0
-            buildConfigField 'int', 'CAR_MACHINE_TYPE', '2'
-
-            // ④GPS数据提供源： 0-Android系统，1-工控机，2-OBU
-            buildConfigField 'int', 'GPS_PROVIDER', "1"
-
-            // ⑤构建的是否是演示（美化）模式
-            buildConfigField 'boolean', 'IS_DEMO_MODE', 'false'
-
-            buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.8.102\""
-
-            // 是否支持卡顿检测
-            buildConfigField 'boolean', 'IS_SUPPORT_JUNK_DETECT', "${rootProject.isJunkDetectEnable()}"
-
-            buildConfigField 'String', 'SWEEPER_DEFAULT_MODE', '\"Cloud\"'
-            buildConfigField 'boolean', 'SWEEPER_CAN_SWITCH_MODE', 'true'
-        }
 
         mogo {
             dimension "project"
@@ -194,12 +190,12 @@ android {
     apply from: "./script/roleFlavors/driverpassenger.gradle"
 
     // 配置不同渠道参数，直接影响功能完整度
-    apply from: "./script/vehicleFlavors/ochJL.gradle"
-    apply from: "./script/vehicleFlavors/ochM2.gradle"
-    apply from: "./script/vehicleFlavors/ochDFHQ.gradle"
-    apply from: "./script/vehicleFlavors/ochFT.gradle"
+    apply from: "./script/vehicleFlavors/B1.gradle"
+    apply from: "./script/vehicleFlavors/B2.gradle"
+    apply from: "./script/vehicleFlavors/T1T2.gradle"
+    apply from: "./script/vehicleFlavors/C1.gradle"
     //包车
-    apply from: "./script/vehicleFlavors/ochM1.gradle"
+    apply from: "./script/vehicleFlavors/M1.gradle"
     apply from: "./script/flavorfilter/flavorsFilterConfig.gradle"
 
     packagingOptions {
diff --git a/app/config/MediaUrlConfig.json b/app/config/MediaUrlConfig.json
index 42e23e8896..50bc6936ce 100644
--- a/app/config/MediaUrlConfig.json
+++ b/app/config/MediaUrlConfig.json
@@ -1,6 +1,6 @@
 {
   "mogo": {
-    "shuttlepassengerochjl": {
+    "shuttlepassengerb1": {
       "medias": [
         {
           "fileUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357256102/1.jpg",
@@ -64,7 +64,7 @@
         }
       ]
     },
-    "buspassengerochjl": {
+    "buspassengerb1": {
       "medias": [
         {
           "fileUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357256102/1.jpg",
@@ -128,7 +128,7 @@
         }
       ]
     },
-    "shuttlepassengerochm2": {
+    "shuttlepassengerb2": {
       "medias": [
         {
           "fileUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1681716116231/6923474a99a1983c9a0410ad3357888d.mov",
@@ -144,7 +144,7 @@
         }
       ]
     },
-    "taxiunmannedpassengerochdfhq": {
+    "taxiunmannedpassengerocht1t2": {
       "medias": [
         {
           "fileUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1655708499497/大运会合作解说版.m4v",
@@ -172,7 +172,7 @@
         }
       ]
     },
-    "charterpassengerochm1": {
+    "charterpassengerm1": {
       "medias": [
         {
           "fileUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1655708499497/大运会合作解说版.m4v",
@@ -202,7 +202,7 @@
     }
   },
   "dali": {
-    "shuttlepassengerochjl": {
+    "shuttlepassengerb1": {
       "medias": [
         {
           "fileUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357256102/1.jpg",
@@ -266,7 +266,7 @@
         }
       ]
     },
-    "buspassengerochjl": {
+    "buspassengerb1": {
       "medias": [
         {
           "fileUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357256102/1.jpg",
@@ -330,7 +330,7 @@
         }
       ]
     },
-    "shuttlepassengerochm2": {
+    "shuttlepassengerb2": {
       "medias": [
         {
           "fileUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1681716116231/6923474a99a1983c9a0410ad3357888d.mov",
@@ -346,7 +346,7 @@
         }
       ]
     },
-    "taxiunmannedpassengerochdfhq": {
+    "taxiunmannedpassengerochdt1t2": {
       "medias": [
         {
           "fileUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1655708499497/大运会合作解说版.m4v",
@@ -374,7 +374,7 @@
         }
       ]
     },
-    "charterpassengerochm1": {
+    "charterpassengerm1": {
       "medias": [
         {
           "fileUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1655708499497/大运会合作解说版.m4v",
@@ -404,7 +404,7 @@
     }
   },
   "yantai": {
-    "shuttlepassengerochjl": {
+    "shuttlepassengerb1": {
       "medias": [
         {
           "fileUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1681210971943/yangmadou.mp4",
@@ -420,7 +420,7 @@
         }
       ]
     },
-    "buspassengerochjl": {
+    "buspassengerb1": {
       "medias": [
         {
           "fileUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1681210971943/yangmadou.mp4",
@@ -436,7 +436,7 @@
         }
       ]
     },
-    "shuttlepassengerochm2": {
+    "shuttlepassengerb2": {
       "medias": [
         {
           "fileUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1681716116231/6923474a99a1983c9a0410ad3357888d.mov",
@@ -452,7 +452,7 @@
         }
       ]
     },
-    "taxiunmannedpassengerochdfhq": {
+    "taxiunmannedpassengerocht1t2": {
       "medias": [
         {
           "fileUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1655708499497/大运会合作解说版.m4v",
@@ -480,7 +480,7 @@
         }
       ]
     },
-    "charterpassengerochm1": {
+    "charterpassengerm1": {
       "medias": [
         {
           "fileUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1655708499497/大运会合作解说版.m4v",
@@ -510,7 +510,7 @@
     }
   },
   "saas": {
-    "shuttlepassengerochjl": {
+    "shuttlepassengerb1": {
       "medias": [
         {
           "fileUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357256102/1.jpg",
@@ -574,7 +574,7 @@
         }
       ]
     },
-    "buspassengerochjl": {
+    "buspassengerochb1": {
       "medias": [
         {
           "fileUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357256102/1.jpg",
@@ -638,7 +638,7 @@
         }
       ]
     },
-    "shuttlepassengerochm2": {
+    "shuttlepassengerb2": {
       "medias": [
         {
           "fileUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1681716116231/6923474a99a1983c9a0410ad3357888d.mov",
@@ -654,7 +654,7 @@
         }
       ]
     },
-    "taxiunmannedpassengerochdfhq": {
+    "taxiunmannedpassengerocht1t2": {
       "medias": [
         {
           "fileUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1655708499497/大运会合作解说版.m4v",
@@ -682,7 +682,7 @@
         }
       ]
     },
-    "charterpassengerochm1": {
+    "charterpassengerm1": {
       "medias": [
         {
           "fileUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1655708499497/大运会合作解说版.m4v",
diff --git a/app/config/MusicUrlConfig.json b/app/config/MusicUrlConfig.json
index 1c109ba55f..33ee46ede9 100644
--- a/app/config/MusicUrlConfig.json
+++ b/app/config/MusicUrlConfig.json
@@ -1,6 +1,6 @@
 {
   "mogo": {
-    "taxipassengerochdfhq": {
+    "taxipassengerocht1t2": {
       "musics": [
         {
           "id": "1",
@@ -124,7 +124,7 @@
         }
       ]
     },
-    "charterpassengerochm1": {
+    "charterpassengerm1": {
       "musics": [
         {
           "id": "1",
@@ -250,7 +250,7 @@
     }
   },
   "dali": {
-    "charterpassengerochm1": {
+    "charterpassengerm1": {
       "musics": [
         {
           "id": "1",
@@ -376,7 +376,7 @@
     }
   },
   "yantai": {
-    "charterpassengerochm1": {
+    "charterpassengerm1": {
       "musics": [
         {
           "id": "1",
@@ -502,7 +502,7 @@
     }
   },
   "saas": {
-    "taxiunmannedpassengerochdfhq": {
+    "taxiunmannedpassengerocht1t2": {
       "musics": [
         {
           "id": "1",
@@ -626,7 +626,7 @@
         }
       ]
     },
-    "charterpassengerochm1": {
+    "charterpassengerm1": {
       "musics": [
         {
           "id": "1",
diff --git a/app/regroup.gradle b/app/regroup.gradle
index d537709675..9a5e6539e3 100644
--- a/app/regroup.gradle
+++ b/app/regroup.gradle
@@ -2,14 +2,11 @@
 afterEvaluate {
 
     def launcher = [
-            "ochFT",
+            "C1",
             "fOchTaxi",
-            "ochJL",
-            "ochJL",
+            "B1",
             "fOchBusPassengerM1",
-            "ochM2",
-            "ochJL",
-            "ochJL",
+            "B2",
             "fOchTaxiPassenger",
             "MultiDisplayOchBus",
             "MultiDisplayOchTaxi"]
diff --git a/app/script/flavorfilter/flavors.json b/app/script/flavorfilter/flavors.json
index c25dd86a61..6bf15c7855 100644
--- a/app/script/flavorfilter/flavors.json
+++ b/app/script/flavorfilter/flavors.json
@@ -1,26 +1,26 @@
 {
   "mogo": {
-    "ochFT":["driver"],
-    "ochJL":["driver","passenger"],
-    "ochM2":["driver","passenger"],
-    "ochDFHQ":["driver","passenger"],
-    "ochM1":["driver","passenger"]
+    "C1":["driver"],
+    "B1":["driver","passenger"],
+    "B2":["driver","passenger"],
+    "T1T2":["driver","passenger"],
+    "M1":["driver","passenger"]
   },
   "dali": {
-    "ochJL":["driver","passenger"],
-    "ochM1":["driver","passenger"],
-    "ochM2":["driver","passenger"]
+    "B1":["driver","passenger"],
+    "M1":["driver","passenger"],
+    "B2":["driver","passenger"]
   },
   "yantai": {
-    "ochJL":["driver","passenger"],
-    "ochM1":["driver","passenger"],
-    "ochM2":["driver","passenger"],
-    "ochFT":["driver"]
+    "B1":["driver","passenger"],
+    "M1":["driver","passenger"],
+    "B2":["driver","passenger"],
+    "C1":["driver"]
   },
   "saas": {
-    "ochDFHQ":["driver","passenger"],
-    "ochJL":["driver","passenger"],
-    "ochM2":["driver","passenger"],
-    "ochM1":["driver","passenger"]
+    "T1T2":["driver","passenger"],
+    "B1":["driver","passenger"],
+    "B2":["driver","passenger"],
+    "M1":["driver","passenger"]
   }
 }
diff --git a/app/script/utils.gradle b/app/script/utils.gradle
index 1b0af32fcf..aa016a5a25 100644
--- a/app/script/utils.gradle
+++ b/app/script/utils.gradle
@@ -23,6 +23,7 @@ boolean isDriver() {
 
 boolean isPassenger() {
     for (String s : gradle.startParameter.taskNames) {
+        println "----------isPassenger------${s}"
         if (s.contains("Passenger") | s.contains("passenger")) {
             return true
         }
diff --git a/app/script/vehicleFlavors/ochJL.gradle b/app/script/vehicleFlavors/B1.gradle
similarity index 98%
rename from app/script/vehicleFlavors/ochJL.gradle
rename to app/script/vehicleFlavors/B1.gradle
index 7b4d07557a..473a87d019 100644
--- a/app/script/vehicleFlavors/ochJL.gradle
+++ b/app/script/vehicleFlavors/B1.gradle
@@ -1,6 +1,6 @@
 project.android.productFlavors {
     // 衡阳-联想Pad-网约车-小巴车
-    ochJL {
+    B1 {
         dimension "vehicle"
         matchingFallbacks = ['jinlvvan']
         missingDimensionStrategy "vehicle", "jinlvvan"
diff --git a/app/script/vehicleFlavors/ochM2.gradle b/app/script/vehicleFlavors/B2.gradle
similarity index 99%
rename from app/script/vehicleFlavors/ochM2.gradle
rename to app/script/vehicleFlavors/B2.gradle
index 4682f2c02b..b34721334d 100644
--- a/app/script/vehicleFlavors/ochM2.gradle
+++ b/app/script/vehicleFlavors/B2.gradle
@@ -2,7 +2,7 @@ apply from: "./script/utils.gradle"
 
 project.android.productFlavors {
     // 衡阳-联想Pad-网约车-小巴车-乘客端
-    ochM2 {
+    B2 {
         dimension "vehicle"
         // 和 och/mogo-och-bus-passenger 的flavors的m2对应
         if(isPassenger()){
diff --git a/app/script/vehicleFlavors/ochFT.gradle b/app/script/vehicleFlavors/C1.gradle
similarity index 98%
rename from app/script/vehicleFlavors/ochFT.gradle
rename to app/script/vehicleFlavors/C1.gradle
index 65288cdf7c..65b3f95061 100644
--- a/app/script/vehicleFlavors/ochFT.gradle
+++ b/app/script/vehicleFlavors/C1.gradle
@@ -1,6 +1,6 @@
 project.android.productFlavors {
     // 福田车
-    ochFT {
+    C1 {
         dimension "vehicle"
         missingDimensionStrategy "vehicle","ft","jinlvvan"
 
diff --git a/app/script/vehicleFlavors/ochM1.gradle b/app/script/vehicleFlavors/M1.gradle
similarity index 98%
rename from app/script/vehicleFlavors/ochM1.gradle
rename to app/script/vehicleFlavors/M1.gradle
index de9dd0abb8..4db16a2c4a 100644
--- a/app/script/vehicleFlavors/ochM1.gradle
+++ b/app/script/vehicleFlavors/M1.gradle
@@ -2,7 +2,7 @@ apply from: "./script/utils.gradle"
 
 project.android.productFlavors {
     // 金旅M1车
-    ochM1 {
+    M1 {
         dimension "vehicle"
         missingDimensionStrategy "vehicle", "jinlvvan"
 
diff --git a/app/script/vehicleFlavors/ochDFHQ.gradle b/app/script/vehicleFlavors/T1T2.gradle
similarity index 98%
rename from app/script/vehicleFlavors/ochDFHQ.gradle
rename to app/script/vehicleFlavors/T1T2.gradle
index 6cff407c2b..98611f8ea2 100644
--- a/app/script/vehicleFlavors/ochDFHQ.gradle
+++ b/app/script/vehicleFlavors/T1T2.gradle
@@ -1,6 +1,6 @@
 project.android.productFlavors {
     // 东风红旗
-    ochDFHQ {
+    ochT1T2 {
         dimension "vehicle"
         missingDimensionStrategy "vehicle","dfhq","jinlvvan"