Merge branch 'release_robotaxi-d_231031_6.2.0.2' into 6.2.0_merge_master

# Conflicts: # OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/cloud/fragment/BaseSweeperCloudTabFragment.java # OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/cloud/model/SweeperCloudTaskModel.java # OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/model/SweeperOperateTaskModel.java # OCH/sweeper/sweeper/build.gradle # OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/SweeperProvider.java # OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/view/BusArcView.java # app/script/functions/och.gradle # app/src/main/java/com/mogo/launcher/startup/ConfigStartUp.kt # core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/SOPSettingView.kt # core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_sop_setting.xml # core/function-impl/mogo-core-function-hmi/src/main/res/values/strings.xml # core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/config/FunctionBuildConfig.kt
2023-12-04 11:01:17 +08:00
parent 0dd41f3227 2bf65101ce
commit cce998c410
1322 changed files with 15039 additions and 15346 deletions
--- a/app/script/flavorfilter/flavors.json
+++ b/app/script/flavorfilter/flavors.json
@@ -1,8 +1,5 @@
 {
  "mogo": {
-    "noop" :{
-      "driver":["fPadLenovo"]
-    },
    "sweeperOperate" :{
      "driver": ["ochFT"]
    },
@@ -15,12 +12,10 @@
    },
    "taxi" :{
      "driver": ["ochDFHQ"],
-      "driverPassenger": ["ochDFHQ"],
      "passenger": ["ochDFHQ"]
    },
    "bus" :{
      "driver": ["ochJL"],
-      "driverPassenger": ["ochJL"],
      "passenger": ["ochJL"]
    },
    "charter" :{
@@ -54,7 +49,6 @@
  "saas": {
    "taxiunmanned" :{
      "driver": ["ochDFHQ"],
-      "driverpassenger": ["ochDFHQ"],
      "passenger": ["ochDFHQ"]
    },
    "shuttle" :{
@@ -63,7 +57,6 @@
    },
    "bus" :{
      "driver": ["ochJL"],
-      "driverPassenger": ["ochJL"],
      "passenger": ["ochJL"]
    },
    "charter" :{
--- a/app/script/functions/och.gradle
+++ b/app/script/functions/och.gradle
@@ -2,7 +2,8 @@ apply from: "./script/utils.gradle"
 // 网约车服务：仅小巴车、出租车渠道用
 project.dependencies {
    if (Boolean.valueOf(USE_MAVEN_PACKAGE)) {
-        fPadLenovoImplementation(rootProject.ext.dependencies.mogoochnoop)
+//        fPadLenovoImplementation(rootProject.ext.dependencies.mogoochnoop)
+
        // Bus司机端
 //        fMultiDisplayOchBusImplementation(rootProject.ext.dependencies.mogoochbus)
 //        // Bus乘客端
@@ -12,10 +13,10 @@ project.dependencies {
 //        fMultiDisplayOchTaxiImplementation(rootProject.ext.dependencies.mogoochtaxi)
 //        // taxi乘客端
 //        fMultiDisplayOchTaxiImplementation(rootProject.ext.dependencies.mogoochtaxi)
+
    } else {
-        if (isCurrentDriver("noop")) {
-            noopImplementation(project(':OCH:mogo-och-noop'))
-        } else if (isCurrentDriver("bus")) {
+
+        if (isCurrentDriver("bus")) {
            implementation project.project(':OCH:bus:driver')
        } else if (isCurrentPassenger("bus")) {
            implementation project.project(':OCH:bus:passenger')
@@ -40,7 +41,6 @@ project.dependencies {
        } else if (isCurrentPassenger("taxi")) {
            implementation project.project(':OCH:taxi:passenger')
        } else {
-            noopImplementation(project(':OCH:mogo-och-noop'))
            implementation project.project(':OCH:bus:driver')
            implementation project.project(':OCH:bus:passenger')
            implementation project.project(':OCH:charter:driver')
--- a/app/script/productFlavors/bus.gradle
+++ b/app/script/productFlavors/bus.gradle
@@ -8,9 +8,9 @@ project.android.productFlavors {
                // 标识
                CHANNEL_VALUE_HEAD: "Bus",
                // 在启动的时候把Task给清空
-                ACTIVITY_ROOT     : true,
+//                ACTIVITY_ROOT     : true,
                // Activity的朝向
-                SCREEN_ORIENTATION:"landscape",
+//                SCREEN_ORIENTATION:"landscape",
        ]

        // ①标识
--- a/app/script/productFlavors/charter.gradle
+++ b/app/script/productFlavors/charter.gradle
@@ -8,9 +8,9 @@ project.android.productFlavors {
        manifestPlaceholders = [
                CHANNEL_VALUE_HEAD: "Charter",
                // 在启动的时候把Task给清空
-                ACTIVITY_ROOT     : true,
+//                ACTIVITY_ROOT     : true,
                // Activity的朝向
-                SCREEN_ORIENTATION:"landscape",
+//                SCREEN_ORIENTATION:"landscape",
        ]
        // ①标识
        buildConfigField 'String', 'APP_IDENTITY_MODE_HEAD', "\"Charter\""
--- a/app/script/productFlavors/noop.gradle
+++ b/app/script/productFlavors/noop.gradle
@@ -1,27 +0,0 @@
-project.android.productFlavors {
-    // 空业务 主要是给鹰眼使用
-    noop {
-        dimension "product"
-
-        manifestPlaceholders = [
-                // 标识
-                CHANNEL_VALUE_HEAD: "Noop",
-                // 在启动的时候把Task给清空
-                ACTIVITY_ROOT     : true,
-                // Activity的朝向
-                SCREEN_ORIENTATION:"landscape",
-        ]
-
-        // ①标识
-        buildConfigField 'String', 'APP_IDENTITY_MODE_HEAD', "\"FPad\""
-
-        // ②连接的工控机IP地址
-        buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.1.104\""
-
-        // ③是否需要重写状态栏
-        buildConfigField 'boolean', 'IS_REPLACE_STATUSVIEW', 'false'
-
-        // ④构建 是否支持多屏异显异交互
-        buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'false'
-    }
-}
--- a/app/script/productFlavors/shuttle.gradle
+++ b/app/script/productFlavors/shuttle.gradle
@@ -9,7 +9,7 @@ project.android.productFlavors {
                // 标识
                CHANNEL_VALUE_HEAD: "Shuttle",
                // 在启动的时候把Task给清空
-                ACTIVITY_ROOT     : true,
+//                ACTIVITY_ROOT     : true,
        ]

        // ①标识
--- a/app/script/productFlavors/sweeperCloud.gradle
+++ b/app/script/productFlavors/sweeperCloud.gradle
@@ -7,9 +7,9 @@ project.android.productFlavors {
                // 标识
                CHANNEL_VALUE_HEAD: "Sweeper",
                // 在启动的时候把Task给清空
-                ACTIVITY_ROOT     : true,
+//                ACTIVITY_ROOT     : true,
                // Activity的朝向
-                SCREEN_ORIENTATION:"landscape",
+//                SCREEN_ORIENTATION:"landscape",
        ]

        // ①标识
--- a/app/script/productFlavors/sweeperOperate.gradle
+++ b/app/script/productFlavors/sweeperOperate.gradle
@@ -7,9 +7,9 @@ project.android.productFlavors {
                // 标识
                CHANNEL_VALUE_HEAD: "Sweeper",
                // 在启动的时候把Task给清空
-                ACTIVITY_ROOT     : true,
+//                ACTIVITY_ROOT     : true,
                // Activity的朝向
-                SCREEN_ORIENTATION:"landscape",
+//                SCREEN_ORIENTATION:"landscape",
        ]

        // ①标识
--- a/app/script/productFlavors/taxi.gradle
+++ b/app/script/productFlavors/taxi.gradle
@@ -6,7 +6,7 @@ project.android.productFlavors {
        manifestPlaceholders = [
                CHANNEL_VALUE_HEAD: "Taxi",
                // Activity的朝向
-                SCREEN_ORIENTATION:"landscape",
+//                SCREEN_ORIENTATION:"landscape",
        ]
        // ①标识
        buildConfigField 'String', 'APP_IDENTITY_MODE_HEAD', "\"Taxi\""
--- a/app/script/productFlavors/taxiunmanned.gradle
+++ b/app/script/productFlavors/taxiunmanned.gradle
@@ -6,7 +6,7 @@ project.android.productFlavors {
        manifestPlaceholders = [
                CHANNEL_VALUE_HEAD: "Taxi",
                // Activity的朝向
-                SCREEN_ORIENTATION:"landscape",
+//                SCREEN_ORIENTATION:"landscape",
        ]
        // ①标识
        buildConfigField 'String', 'APP_IDENTITY_MODE_HEAD', "\"Taxi\""
--- a/app/script/vehicleFlavors/fPadLenovo.gradle
+++ b/app/script/vehicleFlavors/fPadLenovo.gradle
@@ -1,21 +0,0 @@
-project.android.productFlavors {
-    // 衡阳-联想Pad
-    fPadLenovo {
-        dimension "vehicle"
-
-        
-        // 配置AndroidManifest.xml中用到的参数
-        manifestPlaceholders = [
-                CHANNEL_VALUE_TAIL: "Noop",
-        ]
-
-        // ①标识构建的应用身份类型，具体查看  README.md APP_IDENTITY_MODE规则
-        buildConfigField 'String', 'APP_IDENTITY_MODE_TAIL', "\"Noop\""
-
-        // ②构建的是否要动态更换模型
-        buildConfigField 'boolean', 'IS_CAR_MODEL_CHANGE', 'true'
-
-        // ③不能启动自驾的档位
-        buildConfigField 'java.util.Set<chassis.Chassis.GearPosition>', 'UNABLE_LAUNCH_AUTOPILOT_GEAR', 'null'
-    }
-}