diff --git a/app/build.gradle b/app/build.gradle index bc56865106..52431d9da7 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -173,14 +173,12 @@ android { apply from: "./script/productFlavors/bus.gradle" apply from: "./script/productFlavors/charter.gradle" - apply from: "./script/productFlavors/noop.gradle" apply from: "./script/productFlavors/shuttle.gradle" apply from: "./script/productFlavors/sweeperOperate.gradle" apply from: "./script/productFlavors/sweeperCloud.gradle" apply from: "./script/productFlavors/taxi.gradle" apply from: "./script/productFlavors/taxiunmanned.gradle" // 配置不同渠道参数,直接影响功能完整度 - apply from: "./script/vehicleFlavors/fPadLenovo.gradle" apply from: "./script/vehicleFlavors/ochJL.gradle" apply from: "./script/vehicleFlavors/ochJL.gradle" apply from: "./script/vehicleFlavors/ochM2.gradle" diff --git a/app/regroup.gradle b/app/regroup.gradle index 8d0fdf84e7..d537709675 100644 --- a/app/regroup.gradle +++ b/app/regroup.gradle @@ -2,7 +2,6 @@ afterEvaluate { def launcher = [ - "fPadLenovo", "ochFT", "fOchTaxi", "ochJL", diff --git a/app/script/flavorfilter/flavors.json b/app/script/flavorfilter/flavors.json index 698df829eb..b81368313a 100644 --- a/app/script/flavorfilter/flavors.json +++ b/app/script/flavorfilter/flavors.json @@ -1,8 +1,5 @@ { "mogo": { - "noop" :{ - "driver":["fPadLenovo"] - }, "sweeperOperate" :{ "driver": ["ochFT"] }, diff --git a/app/script/functions/och.gradle b/app/script/functions/och.gradle index 41e69962e2..35f7488335 100644 --- a/app/script/functions/och.gradle +++ b/app/script/functions/och.gradle @@ -2,7 +2,7 @@ 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) @@ -16,9 +16,7 @@ project.dependencies { } 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') @@ -43,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') diff --git a/app/script/productFlavors/noop.gradle b/app/script/productFlavors/noop.gradle deleted file mode 100644 index 5ffbeab9f6..0000000000 --- a/app/script/productFlavors/noop.gradle +++ /dev/null @@ -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' - } -} \ No newline at end of file diff --git a/app/script/vehicleFlavors/fPadLenovo.gradle b/app/script/vehicleFlavors/fPadLenovo.gradle deleted file mode 100644 index 16e63e0eb7..0000000000 --- a/app/script/vehicleFlavors/fPadLenovo.gradle +++ /dev/null @@ -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', 'UNABLE_LAUNCH_AUTOPILOT_GEAR', 'null' - } -} \ No newline at end of file diff --git a/config.gradle b/config.gradle index ca7f0e0307..3bf1982323 100644 --- a/config.gradle +++ b/config.gradle @@ -149,7 +149,6 @@ ext { mogooch : "com.mogo.och:och:${MOGO_OCH_VERSION}", mogoochbus : "com.mogo.och:och-bus:${MOGO_OCH_BUS_VERSION}", mogoochtaxi : "com.mogo.och:och-taxi:${MOGO_OCH_TAXI_VERSION}", - mogoochnoop : "com.mogo.och:och-noop:${MOGO_OCH_NOOP_VERSION}", //========================= AiCloudSDK Maven 版本管理 ========================= mogoaicloudservicesdk : "com.mogo.aicloud.services:services-sdk:${MOGO_AICLOUD_SERVICES_SDK_VERSION}", diff --git a/settings.gradle b/settings.gradle index b451a59a93..adaaed2bd4 100644 --- a/settings.gradle +++ b/settings.gradle @@ -67,8 +67,6 @@ include ':OCH:taxi:passenger' include ':OCH:taxi:unmanned-driver' include ':OCH:taxi:unmanned-passenger' -include ':OCH:mogo-och-noop' - include(':OCH:mogo-och-common-module') include ':OCH:mogo-och-data'