diff --git a/OCH/bus/driver/build.gradle b/OCH/bus/driver/build.gradle index fae9576d3e..cf6345a3bd 100644 --- a/OCH/bus/driver/build.gradle +++ b/OCH/bus/driver/build.gradle @@ -44,21 +44,6 @@ android { } } - - flavorDimensions "vehicle" - productFlavors { - // 车型：金旅星辰、开沃 小巴业务 - jinlvvan { - dimension "vehicle" - buildConfigField 'int', 'NEW_TEST', '0' - } - // 车型：金旅m2 小巴业务 - m2 { - dimension "vehicle" - buildConfigField 'int', 'NEW_TEST', '1' - } - } - } dependencies { diff --git a/OCH/bus/passenger/build.gradle b/OCH/bus/passenger/build.gradle index 2c836f13b4..8c0a84d896 100644 --- a/OCH/bus/passenger/build.gradle +++ b/OCH/bus/passenger/build.gradle @@ -58,20 +58,6 @@ android { ] } } - - flavorDimensions "vehicle" - productFlavors { - // 车型：金旅星辰、开沃 小巴业务 - jinlvvan { - dimension "vehicle" - buildConfigField 'int', 'NEW_TEST', '0' - } - // 车型：金旅m1 小巴业务 - m2 { - dimension "vehicle" - buildConfigField 'int', 'NEW_TEST', '1' - } - } } dependencies { diff --git a/OCH/common/biz/src/main/res/layout/biz_login_view.xml b/OCH/common/biz/src/main/res/layout/biz_login_view.xml index 79dbe04a33..b8c4510382 100644 --- a/OCH/common/biz/src/main/res/layout/biz_login_view.xml +++ b/OCH/common/biz/src/main/res/layout/biz_login_view.xml @@ -33,8 +33,8 @@ android:text="@string/module_och_taxi_login_get_phone_title" android:textColor="@color/taxi_878890" android:textSize="40dp" - app:layout_constraintStart_toStartOf="@+id/actv_welcome_login_title" - app:layout_constraintTop_toBottomOf="@+id/actv_welcome_login_title" /> + app:layout_constraintStart_toStartOf="@+id/biz_actv_welcome_login_title" + app:layout_constraintTop_toBottomOf="@+id/biz_actv_welcome_login_title" /> + app:layout_constraintStart_toStartOf="@+id/biz_ace_login_phone_value" + app:layout_constraintTop_toBottomOf="@+id/biz_ace_login_phone_value" /> + + + + + \ No newline at end of file diff --git a/OCH/facade/src/main/java/com/mogo/och/facade/route/FacadeProvider.kt b/OCH/facade/src/main/java/com/mogo/och/facade/route/FacadeProvider.kt index 0850bd821c..7dca684da0 100644 --- a/OCH/facade/src/main/java/com/mogo/och/facade/route/FacadeProvider.kt +++ b/OCH/facade/src/main/java/com/mogo/och/facade/route/FacadeProvider.kt @@ -8,14 +8,12 @@ import android.widget.FrameLayout import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentActivity import androidx.fragment.app.FragmentManager -import com.alibaba.android.arouter.facade.annotation.Route import com.alibaba.android.arouter.launcher.ARouter import com.mogo.eagle.core.data.config.FunctionBuildConfig import com.mogo.eagle.core.function.api.base.IMoGoFunctionProvider import com.mogo.eagle.core.function.hmi.ui.widget.StatusBarView import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d -import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant import com.mogo.och.common.module.biz.constant.OchCommonConst import com.mogo.och.common.module.biz.login.ILoginCallback import com.mogo.och.common.module.biz.login.LoginStatusManager @@ -23,7 +21,7 @@ import com.mogo.och.common.module.biz.login.LoginStatusManager.queryLoginStatusB import com.mogo.och.common.module.biz.login.TaxiLoginStatusEnum import com.mogo.och.common.module.biz.provider.CommonService import com.mogo.och.common.module.manager.orderlogmanager.OchChainLogManager -import com.mogo.och.facade.constant.FacadeConst +import com.mogo.och.common.module.utils.ProjectUtils /** * 网约车小巴业务实现入口 @@ -74,17 +72,29 @@ abstract class FacadeProvider : IMoGoFunctionProvider, ILoginCallback { } else if (AppIdentityModeUtils.isCharterDriver(FunctionBuildConfig.appIdentityMode)) { return getFragmentByServeName(OchCommonConst.CHARTER_DRIVER) } else if (AppIdentityModeUtils.isTaxiDriver(FunctionBuildConfig.appIdentityMode)) { - return getFragmentByServeName(OchCommonConst.TAXI_DRIVER) + return if(ProjectUtils.isMogo()){ + getFragmentByServeName(OchCommonConst.TAXI_DRIVER) + }else if(ProjectUtils.isSaas()){ + getFragmentByServeName(OchCommonConst.TAXI_UNMANNED_DRIVER) + }else{ + getFragmentByServeName(OchCommonConst.TAXI_DRIVER) + } } else if (AppIdentityModeUtils.isSweeper(FunctionBuildConfig.appIdentityMode)) { return getFragmentByServeName(OchCommonConst.SWEEPER_DRIVER) } else if (AppIdentityModeUtils.isBusPassenger(FunctionBuildConfig.appIdentityMode)) { - return getFragmentByServeName(OchCommonConst.BUS_DRIVER) + return getFragmentByServeName(OchCommonConst.BUS_PASSENGER) } else if (AppIdentityModeUtils.isShuttlePassenger(FunctionBuildConfig.appIdentityMode)) { - return getFragmentByServeName(OchCommonConst.SHUTTLE_DRIVER) + return getFragmentByServeName(OchCommonConst.SHUTTLE_PASSENGER) } else if (AppIdentityModeUtils.isCharterPassenger(FunctionBuildConfig.appIdentityMode)) { - return getFragmentByServeName(OchCommonConst.CHARTER_DRIVER) + return getFragmentByServeName(OchCommonConst.CHARTER_PASSENGER) } else if (AppIdentityModeUtils.isTaxiPassenger(FunctionBuildConfig.appIdentityMode)) { - return getFragmentByServeName(OchCommonConst.TAXI_DRIVER) + return if(ProjectUtils.isMogo()){ + getFragmentByServeName(OchCommonConst.TAXI_PASSENGER) + }else if(ProjectUtils.isSaas()){ + getFragmentByServeName(OchCommonConst.TAXI_UNMANNED_PASSENGER) + }else{ + getFragmentByServeName(OchCommonConst.TAXI_PASSENGER) + } } return LoginStatusManager.getFragment() } diff --git a/OCH/shuttle/passenger/build.gradle b/OCH/shuttle/passenger/build.gradle index bdaac7108b..48bfec6cec 100644 --- a/OCH/shuttle/passenger/build.gradle +++ b/OCH/shuttle/passenger/build.gradle @@ -58,21 +58,6 @@ android { ] } } - - flavorDimensions "vehicle" - productFlavors { - // 车型：金旅星辰、开沃 小巴业务 - jinlvvan { - dimension "vehicle" - buildConfigField 'int', 'NEW_TEST', '0' - } - - // 车型：金旅m1 小巴业务 - m2 { - dimension "vehicle" - buildConfigField 'int', 'NEW_TEST', '1' - } - } } dependencies { diff --git a/app/build.gradle b/app/build.gradle index 8c73f2512b..8d386c5500 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -114,7 +114,7 @@ android { // 项目 business // 业务线 product // 车型 vehicle - flavorDimensions "project","product","role","vehicle" ,"basic", "env" + flavorDimensions "project","vehicle" ,"role","basic", "env" productFlavors { // launcher app launcher { @@ -193,13 +193,6 @@ android { apply from: "./script/roleFlavors/passenger.gradle" apply from: "./script/roleFlavors/driverpassenger.gradle" - apply from: "./script/productFlavors/bus.gradle" - apply from: "./script/productFlavors/charter.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/ochJL.gradle" apply from: "./script/vehicleFlavors/ochM2.gradle" diff --git a/app/script/flavorfilter/flavors.json b/app/script/flavorfilter/flavors.json index d66e7df44f..c25dd86a61 100644 --- a/app/script/flavorfilter/flavors.json +++ b/app/script/flavorfilter/flavors.json @@ -1,67 +1,26 @@ { "mogo": { - "sweeperOperate" :{ - "driver": ["ochFT"] - }, - "sweeperCloud" :{ - "driver": ["ochFT"] - }, - "shuttle" :{ - "driver": ["ochJL","ochM2"], - "passenger": ["ochJL","ochM2"] - }, - "taxi" :{ - "driver": ["ochDFHQ"], - "passenger": ["ochDFHQ"] - }, - "bus" :{ - "driver": ["ochJL","ochM2"], - "passenger": ["ochJL","ochM2"] - }, - "charter" :{ - "driver": ["ochM1"], - "passenger": ["ochM1"] - } + "ochFT":["driver"], + "ochJL":["driver","passenger"], + "ochM2":["driver","passenger"], + "ochDFHQ":["driver","passenger"], + "ochM1":["driver","passenger"] }, "dali": { - "shuttle" :{ - "driver": ["ochJL","ochM2"], - "passenger": ["ochJL","ochM2"] - }, - "charter" :{ - "driver": ["ochM1"], - "passenger": ["ochM1"] - } + "ochJL":["driver","passenger"], + "ochM1":["driver","passenger"], + "ochM2":["driver","passenger"] }, "yantai": { - "sweeperOperate" :{ - "driver": ["ochFT"] - }, - "shuttle" :{ - "driver": ["ochJL","ochM2"], - "passenger": ["ochJL","ochM2"] - }, - "charter" :{ - "driver": ["ochM1"], - "passenger": ["ochM1"] - } + "ochJL":["driver","passenger"], + "ochM1":["driver","passenger"], + "ochM2":["driver","passenger"], + "ochFT":["driver"] }, "saas": { - "taxiunmanned" :{ - "driver": ["ochDFHQ"], - "passenger": ["ochDFHQ"] - }, - "shuttle" :{ - "driver": ["ochJL","ochM2"], - "passenger": ["ochJL","ochM2"] - }, - "bus" :{ - "driver": ["ochJL","ochM2"], - "passenger": ["ochJL","ochM2"] - }, - "charter" :{ - "driver": ["ochM1"], - "passenger": ["ochM1"] - } + "ochDFHQ":["driver","passenger"], + "ochJL":["driver","passenger"], + "ochM2":["driver","passenger"], + "ochM1":["driver","passenger"] } } diff --git a/app/script/flavorfilter/flavorsFilterConfig.gradle b/app/script/flavorfilter/flavorsFilterConfig.gradle index 25c24d1d72..9722f98b76 100644 --- a/app/script/flavorfilter/flavorsFilterConfig.gradle +++ b/app/script/flavorfilter/flavorsFilterConfig.gradle @@ -14,24 +14,14 @@ project.android.variantFilter { variant -> config.each { projectKey,projectValue -> if(names.contains(projectKey)){ projectContain = false - def productContain = true - projectValue.each{productKey,productValue-> + def vehicleContain = true + projectValue.each{productKey,rolesValue-> if(names.contains(productKey)){ - productContain =false + vehicleContain =false def roleContain = true - productValue.each{roleKey,roleValue-> - if(names.contains(roleKey)){ + rolesValue.each{roleValue-> + if(names.contains(roleValue)){ roleContain =false - def vehicleContain = true - roleValue.each{vehicleValue-> - if (names.contains(vehicleValue)) { - //println "need $names" - vehicleContain = false - } - } - if(vehicleContain){ - setIgnore(true) - } } } if(roleContain){ @@ -39,7 +29,7 @@ project.android.variantFilter { variant -> } } } - if(productContain){ + if(vehicleContain){ setIgnore(true) } } diff --git a/app/script/functions/README.md b/app/script/functions/README.md deleted file mode 100644 index 27064aa5d3..0000000000 --- a/app/script/functions/README.md +++ /dev/null @@ -1 +0,0 @@ -# 不同渠道，依赖的实现不一样，需要各个渠道都去依赖各自需要的实现，渠道太多导致build.gradle 文件臃肿，可以通过分gradle文件方式减少臃肿 \ No newline at end of file diff --git a/app/script/functions/och.gradle b/app/script/functions/och.gradle deleted file mode 100644 index f95942131d..0000000000 --- a/app/script/functions/och.gradle +++ /dev/null @@ -1,70 +0,0 @@ -apply from: "./script/utils.gradle" -// 网约车服务：仅小巴车、出租车渠道用 -project.dependencies { - if (Boolean.valueOf(USE_MAVEN_PACKAGE)) { -// fPadLenovoImplementation(rootProject.ext.dependencies.mogoochnoop) - - // Bus司机端 -// fMultiDisplayOchBusImplementation(rootProject.ext.dependencies.mogoochbus) -// // Bus乘客端 -// fMultiDisplayOchBusImplementation(rootProject.ext.dependencies.mogoochbus) -// -// // taxi司机端 -// fMultiDisplayOchTaxiImplementation(rootProject.ext.dependencies.mogoochtaxi) -// // taxi乘客端 -// fMultiDisplayOchTaxiImplementation(rootProject.ext.dependencies.mogoochtaxi) - - } else { - - if (isCurrentDriver("bus")) { - implementation project.project(':OCH:bus:driver') - } else if (isCurrentPassenger("bus")) { - implementation project.project(':OCH:bus:passenger') - } else if (isCurrentDriver("charter")) { - implementation project.project(':OCH:charter:driver') - } else if (isCurrentPassenger("charter")) { - implementation project.project(':OCH:charter:passenger') - } else if (isCurrentDriver("shuttle")) { - implementation project(':OCH:shuttle:driver') - } else if (isCurrentPassenger("shuttle")) { - implementation project.project(':OCH:shuttle:passenger') - } else if (isCurrentDriver("sweeperOperate")) { - implementation project.project(':OCH:sweeper:driver') - } else if (isCurrentDriver("sweeperCloud")) { - implementation project.project(':OCH:sweeper:driver') - } else if (isCurrentDriver("taxiunmanned")) { - implementation project.project(':OCH:taxi:unmanned-driver') - } else if (isCurrentPassenger("taxiunmanned")) { - implementation project.project(':OCH:taxi:unmanned-passenger') - } else if (isCurrentDriver("taxi")) { - implementation project.project(':OCH:taxi:driver') - } else if (isCurrentPassenger("taxi")) { - implementation project.project(':OCH:taxi:passenger') - } else { - implementation project.project(':OCH:bus:driver') - implementation project.project(':OCH:bus:passenger') - implementation project.project(':OCH:charter:driver') - implementation project.project(':OCH:charter:passenger') - implementation project.project(':OCH:shuttle:driver') - implementation project.project(':OCH:shuttle:passenger') - implementation project.project(':OCH:sweeper:driver') - implementation project.project(':OCH:taxi:driver') - implementation project.project(':OCH:taxi:passenger') - implementation project.project(':OCH:taxi:unmanned-driver') - implementation project.project(':OCH:taxi:unmanned-passenger') - } - - // 多屏幕-Bus司机端 -// fMultiDisplayOchBusImplementation (project(':OCH:mogo-och-bus')) -// // 多屏幕-Bus乘客端 -// fMultiDisplayOchBusImplementation (project(':OCH:mogo-och-bus-passenger')) -// -// // taxi司机端 -// fMultiDisplayOchTaxiImplementation (project(':OCH:mogo-och-taxi')) -// // 多屏幕-taxi乘客端 -// fMultiDisplayOchTaxiImplementation (project(':OCH:mogo-och-taxi-passenger')) -// -// // 清扫车-多屏幕 -// fMultiDisplaySweeperImplementation (project(':OCH:mogo-och-sweeper')) - } -} diff --git a/app/script/productFlavors/bus.gradle b/app/script/productFlavors/bus.gradle deleted file mode 100644 index 09f87fdf7e..0000000000 --- a/app/script/productFlavors/bus.gradle +++ /dev/null @@ -1,27 +0,0 @@ -apply from: "./script/utils.gradle" - -project.android.productFlavors { - bus { - dimension "product" - - manifestPlaceholders = [ - // 标识 - CHANNEL_VALUE_HEAD: "Bus", - ] - - // ①标识 - buildConfigField 'String', 'APP_IDENTITY_MODE_HEAD', "\"Bus\"" - - if (isCurrentDriver("bus")) { - // ③是否需要重写状态栏 - buildConfigField 'boolean', 'IS_REPLACE_STATUSVIEW', 'false' - } else if (isCurrentPassenger("bus")) { - // ③是否需要重写状态栏 - buildConfigField 'boolean', 'IS_REPLACE_STATUSVIEW', 'true' - } - - // ④构建 是否支持多屏异显异交互 - buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'false' - } -} - diff --git a/app/script/productFlavors/charter.gradle b/app/script/productFlavors/charter.gradle deleted file mode 100644 index 9d0edc8871..0000000000 --- a/app/script/productFlavors/charter.gradle +++ /dev/null @@ -1,27 +0,0 @@ - - -project.android.productFlavors { - // 包车业务 - charter{ - dimension "product" - - manifestPlaceholders = [ - CHANNEL_VALUE_HEAD: "Charter", - ] - // ①标识 - buildConfigField 'String', 'APP_IDENTITY_MODE_HEAD', "\"Charter\"" - - // ④构建 是否支持多屏异显异交互 - buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'false' - - if(isCurrentDriver("charter")){ - // ③是否需要重写状态栏 - buildConfigField 'boolean', 'IS_REPLACE_STATUSVIEW', 'false' - }else if(isCurrentPassenger("charter")){ - // ③是否需要重写状态栏 - buildConfigField 'boolean', 'IS_REPLACE_STATUSVIEW', 'true' - }else { - buildConfigField 'boolean', 'IS_REPLACE_STATUSVIEW', 'true' - } - } -} \ No newline at end of file diff --git a/app/script/productFlavors/shuttle.gradle b/app/script/productFlavors/shuttle.gradle deleted file mode 100644 index 8f06d2dbdb..0000000000 --- a/app/script/productFlavors/shuttle.gradle +++ /dev/null @@ -1,41 +0,0 @@ -apply from: "./script/utils.gradle" - -project.android.productFlavors { - // 接驳车业务 - shuttle { - dimension "product" - - manifestPlaceholders = [ - // 标识 - CHANNEL_VALUE_HEAD: "Shuttle", - ] - - // ①标识 - buildConfigField 'String', 'APP_IDENTITY_MODE_HEAD', "\"Shuttle\"" - - if (isCurrentDriver("shuttle")) { - // ③是否需要重写状态栏 - buildConfigField 'boolean', 'IS_REPLACE_STATUSVIEW', 'false' - // ④构建 是否支持多屏异显异交互 - buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'false' - } else if (isCurrentPassenger("shuttle")) { - if (isM2()) { - // ③是否需要重写状态栏 - buildConfigField 'boolean', 'IS_REPLACE_STATUSVIEW', 'true' - // ④构建 是否支持多屏异显异交互 - buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'false' - } - if (isJL()) { - // ③是否需要重写状态栏 - buildConfigField 'boolean', 'IS_REPLACE_STATUSVIEW', 'true' - // ④构建 是否支持多屏异显异交互 - buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'true' - } - } else { - // ③是否需要重写状态栏 - buildConfigField 'boolean', 'IS_REPLACE_STATUSVIEW', 'true' - // ④构建 是否支持多屏异显异交互 - buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'true' - } - } -} \ No newline at end of file diff --git a/app/script/productFlavors/sweeperCloud.gradle b/app/script/productFlavors/sweeperCloud.gradle deleted file mode 100644 index 57a356beff..0000000000 --- a/app/script/productFlavors/sweeperCloud.gradle +++ /dev/null @@ -1,26 +0,0 @@ -project.android.productFlavors { - // 清扫车业务 - sweeperCloud { - dimension "product" - - manifestPlaceholders = [ - // 标识 - CHANNEL_VALUE_HEAD: "Sweeper", - ] - - // ①标识 - buildConfigField 'String', 'APP_IDENTITY_MODE_HEAD', "\"Sweeper\"" - - // ③是否需要重写状态栏 - buildConfigField 'boolean', 'IS_REPLACE_STATUSVIEW', 'false' - - // ④构建 是否支持多屏异显异交互 - buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'false' - - // ⑤清扫车 默认模式（运营/云控） - buildConfigField 'String', 'SWEEPER_DEFAULT_MODE', '\"Cloud\"' - - // ⑥清扫车 是否能切换模式 - buildConfigField 'boolean', 'SWEEPER_CAN_SWITCH_MODE', 'true' - } -} \ No newline at end of file diff --git a/app/script/productFlavors/sweeperOperate.gradle b/app/script/productFlavors/sweeperOperate.gradle deleted file mode 100644 index 2369092ea9..0000000000 --- a/app/script/productFlavors/sweeperOperate.gradle +++ /dev/null @@ -1,26 +0,0 @@ -project.android.productFlavors { - // 清扫车业务 - sweeperOperate { - dimension "product" - - manifestPlaceholders = [ - // 标识 - CHANNEL_VALUE_HEAD: "Sweeper", - ] - - // ①标识 - buildConfigField 'String', 'APP_IDENTITY_MODE_HEAD', "\"Sweeper\"" - - // ③是否需要重写状态栏 - buildConfigField 'boolean', 'IS_REPLACE_STATUSVIEW', 'false' - - // ④构建 是否支持多屏异显异交互 - buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'false' - - // ⑤清扫车 默认模式（运营/云控） - buildConfigField 'String', 'SWEEPER_DEFAULT_MODE', '\"Operate\"' - - // ⑥清扫车 是否能切换模式 - buildConfigField 'boolean', 'SWEEPER_CAN_SWITCH_MODE', 'false' - } -} \ No newline at end of file diff --git a/app/script/productFlavors/taxi.gradle b/app/script/productFlavors/taxi.gradle deleted file mode 100644 index a444f2e61c..0000000000 --- a/app/script/productFlavors/taxi.gradle +++ /dev/null @@ -1,26 +0,0 @@ -project.android.productFlavors { - // 出租车业务 - taxi { - dimension "product" - - manifestPlaceholders = [ - CHANNEL_VALUE_HEAD: "Taxi", - ] - // ①标识 - buildConfigField 'String', 'APP_IDENTITY_MODE_HEAD', "\"Taxi\"" - - // ④构建 是否支持多屏异显异交互 - buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'false' - - if (isCurrentDriver("taxi")) { - // ③是否需要重写状态栏 - buildConfigField 'boolean', 'IS_REPLACE_STATUSVIEW', 'false' - }else if (isCurrentPassenger("taxi")) { - // ③是否需要重写状态栏 - buildConfigField 'boolean', 'IS_REPLACE_STATUSVIEW', 'true' - }else { - // ③是否需要重写状态栏 - buildConfigField 'boolean', 'IS_REPLACE_STATUSVIEW', 'false' - } - } -} \ No newline at end of file diff --git a/app/script/productFlavors/taxiunmanned.gradle b/app/script/productFlavors/taxiunmanned.gradle deleted file mode 100644 index ac861e859e..0000000000 --- a/app/script/productFlavors/taxiunmanned.gradle +++ /dev/null @@ -1,26 +0,0 @@ -project.android.productFlavors { - // 出租车业务 - taxiunmanned { - - dimension "product" - manifestPlaceholders = [ - CHANNEL_VALUE_HEAD: "Taxi", - ] - // ①标识 - buildConfigField 'String', 'APP_IDENTITY_MODE_HEAD', "\"Taxi\"" - - // ④构建 是否支持多屏异显异交互 - buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'false' - - if (isCurrentDriver("taxi")) { - // ③是否需要重写状态栏 - buildConfigField 'boolean', 'IS_REPLACE_STATUSVIEW', 'false' - }else if (isCurrentPassenger("taxi")) { - // ③是否需要重写状态栏 - buildConfigField 'boolean', 'IS_REPLACE_STATUSVIEW', 'true' - }else { - // ③是否需要重写状态栏 - buildConfigField 'boolean', 'IS_REPLACE_STATUSVIEW', 'false' - } - } -} \ No newline at end of file diff --git a/app/script/utils.gradle b/app/script/utils.gradle index 9db724526c..1b0af32fcf 100644 --- a/app/script/utils.gradle +++ b/app/script/utils.gradle @@ -30,24 +30,6 @@ boolean isPassenger() { return false } -boolean isJL() { - for (String s : gradle.startParameter.taskNames) { - if (s.contains("OchJL") | s.contains("ochJL")) { - return true - } - } - return false -} - -boolean isM2() { - for (String s : gradle.startParameter.taskNames) { - if (s.contains("OchM2") | s.contains("ochM2")) { - return true - } - } - return false -} - boolean isCurrentFlavors(String flavors){ for (String s : gradle.startParameter.taskNames) { @@ -65,6 +47,4 @@ ext { isCurrentFlavors = this.&isCurrentFlavors isCurrentDriver = this.&isCurrentDriver isCurrentPassenger = this.&isCurrentPassenger - isJL = this.&isJL - isM2 = this.&isM2 } \ No newline at end of file diff --git a/app/script/vehicleFlavors/ochDFHQ.gradle b/app/script/vehicleFlavors/ochDFHQ.gradle index 07645b6903..6cff407c2b 100644 --- a/app/script/vehicleFlavors/ochDFHQ.gradle +++ b/app/script/vehicleFlavors/ochDFHQ.gradle @@ -2,6 +2,7 @@ project.android.productFlavors { // 东风红旗 ochDFHQ { dimension "vehicle" + missingDimensionStrategy "vehicle","dfhq","jinlvvan" // 配置AndroidManifest.xml中用到的参数 diff --git a/app/script/vehicleFlavors/ochFT.gradle b/app/script/vehicleFlavors/ochFT.gradle index fbc9a66f09..65288cdf7c 100644 --- a/app/script/vehicleFlavors/ochFT.gradle +++ b/app/script/vehicleFlavors/ochFT.gradle @@ -2,6 +2,7 @@ project.android.productFlavors { // 福田车 ochFT { dimension "vehicle" + missingDimensionStrategy "vehicle","ft","jinlvvan" // 配置AndroidManifest.xml中用到的参数 diff --git a/app/script/vehicleFlavors/ochJL.gradle b/app/script/vehicleFlavors/ochJL.gradle index 51396a0233..7b4d07557a 100644 --- a/app/script/vehicleFlavors/ochJL.gradle +++ b/app/script/vehicleFlavors/ochJL.gradle @@ -3,7 +3,7 @@ project.android.productFlavors { ochJL { dimension "vehicle" matchingFallbacks = ['jinlvvan'] - missingDimensionStrategy "vehicle", "jinlvvan", "m2", "jinlvvan" + missingDimensionStrategy "vehicle", "jinlvvan" // 配置AndroidManifest.xml中用到的参数 manifestPlaceholders = [ diff --git a/app/script/vehicleFlavors/ochM1.gradle b/app/script/vehicleFlavors/ochM1.gradle index b4c2f4071e..de9dd0abb8 100644 --- a/app/script/vehicleFlavors/ochM1.gradle +++ b/app/script/vehicleFlavors/ochM1.gradle @@ -4,7 +4,7 @@ project.android.productFlavors { // 金旅M1车 ochM1 { dimension "vehicle" - missingDimensionStrategy "vehicle","m2", "jinlvvan" + missingDimensionStrategy "vehicle", "jinlvvan" // 配置AndroidManifest.xml中用到的参数 manifestPlaceholders = [ diff --git a/app/script/vehicleFlavors/ochM2.gradle b/app/script/vehicleFlavors/ochM2.gradle index b7d7988e75..4682f2c02b 100644 --- a/app/script/vehicleFlavors/ochM2.gradle +++ b/app/script/vehicleFlavors/ochM2.gradle @@ -1,10 +1,17 @@ +apply from: "./script/utils.gradle" + project.android.productFlavors { // 衡阳-联想Pad-网约车-小巴车-乘客端 ochM2 { dimension "vehicle" // 和 och/mogo-och-bus-passenger 的flavors的m2对应 - matchingFallbacks = ['m2'] - missingDimensionStrategy "vehicle", "m2", "jinlvvan" + if(isPassenger()){ + matchingFallbacks = ['m2'] + missingDimensionStrategy "vehicle", "m2", "jinlvvan" + }else { + matchingFallbacks = ['jinlvvan'] + missingDimensionStrategy "vehicle", "m21", "jinlvvan" + } //高德地图鉴权信息 manifestPlaceholders = [ CHANNEL_VALUE_TAIL: "M2", diff --git a/app/src/main/java/com/mogo/launcher/startup/ConfigStartUp.kt b/app/src/main/java/com/mogo/launcher/startup/ConfigStartUp.kt index 6c1f1e6e8b..f0b843b112 100644 --- a/app/src/main/java/com/mogo/launcher/startup/ConfigStartUp.kt +++ b/app/src/main/java/com/mogo/launcher/startup/ConfigStartUp.kt @@ -41,7 +41,7 @@ object ConfigStartUp { // 演示模式,上一次勾选的数据 FunctionBuildConfig.isDemoMode = BuildConfig.IS_DEMO_MODE // // app安装的身份信息 - FunctionBuildConfig.appIdentityMode = "${BuildConfig.APP_IDENTITY_MODE_HEAD}_${BuildConfig.APP_IDENTITY_MODE_BODY}_${BuildConfig.APP_IDENTITY_MODE_TAIL}" + FunctionBuildConfig.appIdentityMode = "Product_${BuildConfig.APP_IDENTITY_MODE_BODY}_${BuildConfig.APP_IDENTITY_MODE_TAIL}" // 各个module需要的url FunctionBuildConfig.urlJson = GsonUtils.fromJson(BuildConfig.URLs, UrlConfig::class.java) //不能启动自动驾驶的档位 @@ -89,14 +89,12 @@ object ConfigStartUp { DebugConfig.setDebug(BuildConfig.DEBUG) DebugConfig.setLauncher(BuildConfig.IS_LAUNCHER) DebugConfig.setCarMachineType(BuildConfig.CAR_MACHINE_TYPE) - DebugConfig.setProductFlavor(BuildConfig.FLAVOR_product) + // todo DebugConfig.setProductFlavor(BuildConfig.FLAVOR_product) DebugConfig.setProjectFlavor(BuildConfig.FLAVOR_project) DebugConfig.setSocketAppId(BuildConfig.SOCKET_APP_ID) DebugConfig.setMapVersion(BuildConfig.MAP_SDK_VERSION) DebugConfig.setMapOptVersion(BuildConfig.MAP_SDK_OPT_VERSION) - DebugConfig.setMultiDisplay(BuildConfig.IS_MULTI_DISPLAY) DebugConfig.setCarModelChange(BuildConfig.IS_CAR_MODEL_CHANGE) - DebugConfig.setReplaceStatusview(BuildConfig.IS_REPLACE_STATUSVIEW) } private fun initOtherConfig(context: Context) { diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainLauncherActivity.java b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainLauncherActivity.java index 95c1f2e217..bed1854d3a 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainLauncherActivity.java +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainLauncherActivity.java @@ -111,31 +111,18 @@ public class MainLauncherActivity extends MainActivity implements IMogoIntentLis private void loadOCHModule() { IMoGoFunctionProvider ochProvider; // 兼容处理之前联想PAD及小巴车多个设备部署不同APP方案 - if (!DebugConfig.isMultiDisplay()) { - if (AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode)) { - ochProvider = (IMoGoFunctionProvider) ARouter.getInstance() - .build("/driver/api") - .navigation(getContext()); - } else if(AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode)){ - ochProvider = (IMoGoFunctionProvider) ARouter.getInstance() - .build("/passenger/api") - .navigation(getContext()); - } else { - ochProvider = (IMoGoFunctionProvider) ARouter.getInstance() - .build("/noop/api") - .navigation(getContext()); - } + if (AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode)) { + ochProvider = (IMoGoFunctionProvider) ARouter.getInstance() + .build("/driver/api") + .navigation(getContext()); + } else if(AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode)){ + ochProvider = (IMoGoFunctionProvider) ARouter.getInstance() + .build("/passenger/api") + .navigation(getContext()); } else { - // 目前只有金旅星辰乘客屏是连接的双屏 - if (AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode)) { - ochProvider = (IMoGoFunctionProvider) ARouter.getInstance() - .build("/passenger/api") - .navigation(getContext()); - } else { - ochProvider = (IMoGoFunctionProvider) ARouter.getInstance() - .build("/noop/api") - .navigation(getContext()); - } + ochProvider = (IMoGoFunctionProvider) ARouter.getInstance() + .build("/noop/api") + .navigation(getContext()); } if (ochProvider != null) { diff --git a/core/function-impl/mogo-core-function-startup/src/main/java/com/mogo/eagle/core/function/startup/stageone/HttpDnsStartUp.kt b/core/function-impl/mogo-core-function-startup/src/main/java/com/mogo/eagle/core/function/startup/stageone/HttpDnsStartUp.kt index 5132cd337a..43a5cef851 100644 --- a/core/function-impl/mogo-core-function-startup/src/main/java/com/mogo/eagle/core/function/startup/stageone/HttpDnsStartUp.kt +++ b/core/function-impl/mogo-core-function-startup/src/main/java/com/mogo/eagle/core/function/startup/stageone/HttpDnsStartUp.kt @@ -257,12 +257,13 @@ class HttpDnsStartUp : AndroidStartup(), IMoGoCloudListener { // 初始化网络配置 NetConfigUtils.init() // 加入启动统计 - val mStartParams: HashMap = HashMap() - mStartParams["start_time"] = TimeUtils.getNowMills() - mStartParams["app_version"] = AppUtils.getAppVersionName() - mStartParams["app_flavor"] = DebugConfig.getProductFlavor() - mStartParams["app_identity_mode"] = FunctionBuildConfig.appIdentityMode - MogoAnalyticUtils.track("app_start_time", mStartParams) +// todo 钟超 登陆后调用 获取 app_flavor +// val mStartParams: HashMap = HashMap() +// mStartParams["start_time"] = TimeUtils.getNowMills() +// mStartParams["app_version"] = AppUtils.getAppVersionName() +// mStartParams["app_flavor"] = DebugConfig.getProductFlavor() +// mStartParams["app_identity_mode"] = FunctionBuildConfig.appIdentityMode +// MogoAnalyticUtils.track("app_start_time", mStartParams) } } diff --git a/foudations/mogo-commons/src/main/java/com/mogo/commons/debug/DebugConfig.java b/foudations/mogo-commons/src/main/java/com/mogo/commons/debug/DebugConfig.java index 3056d07556..c6eac394ae 100644 --- a/foudations/mogo-commons/src/main/java/com/mogo/commons/debug/DebugConfig.java +++ b/foudations/mogo-commons/src/main/java/com/mogo/commons/debug/DebugConfig.java @@ -181,17 +181,6 @@ public class DebugConfig { return mapOptVersion; } - // 兼容是否支持多屏幕方案 - private static boolean isMultiDisplay = false; - - public static void setMultiDisplay(boolean status) { - isMultiDisplay = status; - } - - public static boolean isMultiDisplay() { - return isMultiDisplay; - } - // 兼容是否支持多屏幕方案 private static boolean isCarModelChange = true; @@ -202,13 +191,4 @@ public class DebugConfig { public static boolean isCarModelChange() { return isCarModelChange; } - - private static boolean isReplaceStatusview = true; - public static void setReplaceStatusview(boolean status) { - isReplaceStatusview = status; - } - - public static boolean isReplaceStatusview() { - return isReplaceStatusview; - } }