From 0714df0081637dba326dffce4b860ddaf1dee453 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Tue, 31 Jan 2023 14:52:21 +0800 Subject: [PATCH] =?UTF-8?q?[gradle=20=E6=B8=A0=E9=81=93=E4=BF=AE=E6=94=B9]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- OCH/mogo-och-bus-passenger/README.md | 15 ++ OCH/mogo-och-bus-passenger/build.gradle | 36 ++-- .../och/bus/passenger/constant/URLConst.kt | 0 .../network/PassengerServiceApi.java | 0 OCH/mogo-och-bus/build.gradle | 8 +- .../mogo/och/bus/bean/BusOrdersResponse.java | 0 .../mogo/och/bus/bean/BusRoutesResponse.java | 0 .../com/mogo/och/bus/bean/BusStationBean.java | 0 .../com/mogo/och/bus/constant/URLConst.kt | 0 .../com/mogo/och/bus/model/OrderModel.java | 0 .../com/mogo/och/bus/net/IBascApiService.java | 0 .../mogo/och/bus/net/OrderServiceManager.kt | 0 .../bus/net/login/OchCommonServiceManager.kt | 0 .../och/bus/net/login/OchLoginServiceApi.java | 0 .../com/mogo/och/bus/model/OrderModel.java | 37 ++-- app/build.gradle | 204 ++++++++++++------ app/config.json | 4 +- app/functions/och.gradle | 36 ++-- app/productFlavors/fMultiDisplayOchBus.gradle | 8 +- .../fMultiDisplayOchTaxi.gradle | 6 +- ...fPadLenovoOchBus.gradle => fOchBus.gradle} | 10 +- ...ssenger.gradle => fOchBusPassenger.gradle} | 11 +- ...gerM1.gradle => fOchBusPassengerM1.gradle} | 7 +- ...gerM2.gradle => fOchBusPassengerM2.gradle} | 7 +- ...chBusShuttle.gradle => fOchShuttle.gradle} | 9 +- ...ger.gradle => fOchShuttlePassenger.gradle} | 8 +- ...voOchSweeper.gradle => fOchSweeper.gradle} | 6 +- ...adLenovoOchTaxi.gradle => fOchTaxi.gradle} | 8 +- ...senger.gradle => fOchTaxiPassenger.gradle} | 8 +- app/productFlavors/fPadLenovo.gradle | 4 +- app/regroup.gradle | 14 +- .../hmi/ui/tools/AutoPilotAndCheckView.kt | 13 -- 32 files changed, 267 insertions(+), 192 deletions(-) create mode 100644 OCH/mogo-och-bus-passenger/README.md rename OCH/mogo-och-bus-passenger/src/{base => jinlvvan}/java/com/mogo/och/bus/passenger/constant/URLConst.kt (100%) rename OCH/mogo-och-bus-passenger/src/{base => jinlvvan}/java/com/mogo/och/bus/passenger/network/PassengerServiceApi.java (100%) rename OCH/mogo-och-bus/src/{base => jinlvvan}/java/com/mogo/och/bus/bean/BusOrdersResponse.java (100%) rename OCH/mogo-och-bus/src/{base => jinlvvan}/java/com/mogo/och/bus/bean/BusRoutesResponse.java (100%) rename OCH/mogo-och-bus/src/{base => jinlvvan}/java/com/mogo/och/bus/bean/BusStationBean.java (100%) rename OCH/mogo-och-bus/src/{base => jinlvvan}/java/com/mogo/och/bus/constant/URLConst.kt (100%) rename OCH/mogo-och-bus/src/{base => jinlvvan}/java/com/mogo/och/bus/model/OrderModel.java (100%) rename OCH/mogo-och-bus/src/{base => jinlvvan}/java/com/mogo/och/bus/net/IBascApiService.java (100%) rename OCH/mogo-och-bus/src/{base => jinlvvan}/java/com/mogo/och/bus/net/OrderServiceManager.kt (100%) rename OCH/mogo-och-bus/src/{base => jinlvvan}/java/com/mogo/och/bus/net/login/OchCommonServiceManager.kt (100%) rename OCH/mogo-och-bus/src/{base => jinlvvan}/java/com/mogo/och/bus/net/login/OchLoginServiceApi.java (100%) rename app/productFlavors/{fPadLenovoOchBus.gradle => fOchBus.gradle} (89%) rename app/productFlavors/{fPadLenovoOchBusPassenger.gradle => fOchBusPassenger.gradle} (85%) rename app/productFlavors/{fPadLenovoOchBusPassengerM1.gradle => fOchBusPassengerM1.gradle} (88%) rename app/productFlavors/{fPadLenovoOchBusPassengerM2.gradle => fOchBusPassengerM2.gradle} (88%) rename app/productFlavors/{fPadLenovoOchBusShuttle.gradle => fOchShuttle.gradle} (85%) rename app/productFlavors/{fPadLenovoOchBusShuttlePassenger.gradle => fOchShuttlePassenger.gradle} (86%) rename app/productFlavors/{fPadLenovoOchSweeper.gradle => fOchSweeper.gradle} (91%) rename app/productFlavors/{fPadLenovoOchTaxi.gradle => fOchTaxi.gradle} (91%) rename app/productFlavors/{fPadLenovoOchTaxiPassenger.gradle => fOchTaxiPassenger.gradle} (90%) diff --git a/OCH/mogo-och-bus-passenger/README.md b/OCH/mogo-och-bus-passenger/README.md new file mode 100644 index 0000000000..6175119b78 --- /dev/null +++ b/OCH/mogo-och-bus-passenger/README.md @@ -0,0 +1,15 @@ + + + + + +src + - androidTest Android 测试代码 + - basecommon 金旅开沃、接驳车 公用代码部分 + - jinlvvan 金旅开沃 独立代码部分 + - m1 金旅m1 独立代码部分 + - m2 金旅m2 独立代码部分 + - main 所有车型公用代码部分 + - shuttle 接驳车独立代码 因为接驳车和金旅开沃代码耦合厉害暂时放入到mogo-och-bus-passenger里面 + 后期会创建独立module和mogo-och-bus-passenger平级 + - test 普通代码测试 \ No newline at end of file diff --git a/OCH/mogo-och-bus-passenger/build.gradle b/OCH/mogo-och-bus-passenger/build.gradle index 41462ddc64..8b6caab739 100644 --- a/OCH/mogo-och-bus-passenger/build.gradle +++ b/OCH/mogo-och-bus-passenger/build.gradle @@ -41,38 +41,37 @@ android { } } - flavorDimensions "product" + flavorDimensions "pattern" productFlavors { - base { - dimension "product" + // 车型：金旅星辰、开沃 小巴业务 + jinlvvan { + dimension "pattern" buildConfigField 'int', 'NEW_TEST', '0' } - // 接驳车 + // 车型：金旅m1 小巴业务 m1 { - dimension "product" + dimension "pattern" buildConfigField 'int', 'NEW_TEST', '1' } - // bus 乘客屏M2 + // 车型：金旅m1 小巴业务 m2 { - dimension "product" + dimension "pattern" buildConfigField 'int', 'NEW_TEST', '1' } - // 接驳车 + // 业务：接驳车 bus乘客屏高度耦合、暂时放到这里 + // 后期会和module mogo-och-bus-passenger 放到同一级别 shuttle { - dimension "product" + dimension "pattern" buildConfigField 'int', 'NEW_TEST', '1' } } sourceSets { - shuttle { - res.srcDirs = ['src/basecommon/res', 'src/shuttle/res',] - java.srcDirs=['src/basecommon/java', 'src/shuttle/java',] - } - base { - res.srcDirs = ['src/basecommon/res', 'src/base/res',] - java.srcDirs=['src/basecommon/java', 'src/base/java',] + // basecommon 文件夹是 金旅开沃、接驳车公用部分 差异内容是 域名和接口path不同 + jinlvvan { + res.srcDirs = ['src/basecommon/res', 'src/jinlvvan/res',] + java.srcDirs=['src/basecommon/java', 'src/jinlvvan/java',] } m1 { res.srcDirs = ['src/m1/res'] @@ -82,6 +81,11 @@ android { res.srcDirs = ['src/m2/res'] java.srcDirs=['src/m2/java'] } + // basecommon 文件夹是 金旅开沃、接驳车公用部分 差异内容是 域名和接口path不同 + shuttle { + res.srcDirs = ['src/basecommon/res', 'src/shuttle/res',] + java.srcDirs=['src/basecommon/java', 'src/shuttle/java',] + } } } diff --git a/OCH/mogo-och-bus-passenger/src/base/java/com/mogo/och/bus/passenger/constant/URLConst.kt b/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/constant/URLConst.kt similarity index 100% rename from OCH/mogo-och-bus-passenger/src/base/java/com/mogo/och/bus/passenger/constant/URLConst.kt rename to OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/constant/URLConst.kt diff --git a/OCH/mogo-och-bus-passenger/src/base/java/com/mogo/och/bus/passenger/network/PassengerServiceApi.java b/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/network/PassengerServiceApi.java similarity index 100% rename from OCH/mogo-och-bus-passenger/src/base/java/com/mogo/och/bus/passenger/network/PassengerServiceApi.java rename to OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/network/PassengerServiceApi.java diff --git a/OCH/mogo-och-bus/build.gradle b/OCH/mogo-och-bus/build.gradle index 57930c1d10..ba948ab44a 100644 --- a/OCH/mogo-och-bus/build.gradle +++ b/OCH/mogo-och-bus/build.gradle @@ -40,17 +40,17 @@ android { } - flavorDimensions "product" + flavorDimensions "pattern" productFlavors { - base { - dimension "product" + jinlvvan { + dimension "pattern" buildConfigField 'int', 'NEW_TEST', '0' } // 接驳车 shuttle { - dimension "product" + dimension "pattern" buildConfigField 'int', 'NEW_TEST', '1' } } diff --git a/OCH/mogo-och-bus/src/base/java/com/mogo/och/bus/bean/BusOrdersResponse.java b/OCH/mogo-och-bus/src/jinlvvan/java/com/mogo/och/bus/bean/BusOrdersResponse.java similarity index 100% rename from OCH/mogo-och-bus/src/base/java/com/mogo/och/bus/bean/BusOrdersResponse.java rename to OCH/mogo-och-bus/src/jinlvvan/java/com/mogo/och/bus/bean/BusOrdersResponse.java diff --git a/OCH/mogo-och-bus/src/base/java/com/mogo/och/bus/bean/BusRoutesResponse.java b/OCH/mogo-och-bus/src/jinlvvan/java/com/mogo/och/bus/bean/BusRoutesResponse.java similarity index 100% rename from OCH/mogo-och-bus/src/base/java/com/mogo/och/bus/bean/BusRoutesResponse.java rename to OCH/mogo-och-bus/src/jinlvvan/java/com/mogo/och/bus/bean/BusRoutesResponse.java diff --git a/OCH/mogo-och-bus/src/base/java/com/mogo/och/bus/bean/BusStationBean.java b/OCH/mogo-och-bus/src/jinlvvan/java/com/mogo/och/bus/bean/BusStationBean.java similarity index 100% rename from OCH/mogo-och-bus/src/base/java/com/mogo/och/bus/bean/BusStationBean.java rename to OCH/mogo-och-bus/src/jinlvvan/java/com/mogo/och/bus/bean/BusStationBean.java diff --git a/OCH/mogo-och-bus/src/base/java/com/mogo/och/bus/constant/URLConst.kt b/OCH/mogo-och-bus/src/jinlvvan/java/com/mogo/och/bus/constant/URLConst.kt similarity index 100% rename from OCH/mogo-och-bus/src/base/java/com/mogo/och/bus/constant/URLConst.kt rename to OCH/mogo-och-bus/src/jinlvvan/java/com/mogo/och/bus/constant/URLConst.kt diff --git a/OCH/mogo-och-bus/src/base/java/com/mogo/och/bus/model/OrderModel.java b/OCH/mogo-och-bus/src/jinlvvan/java/com/mogo/och/bus/model/OrderModel.java similarity index 100% rename from OCH/mogo-och-bus/src/base/java/com/mogo/och/bus/model/OrderModel.java rename to OCH/mogo-och-bus/src/jinlvvan/java/com/mogo/och/bus/model/OrderModel.java diff --git a/OCH/mogo-och-bus/src/base/java/com/mogo/och/bus/net/IBascApiService.java b/OCH/mogo-och-bus/src/jinlvvan/java/com/mogo/och/bus/net/IBascApiService.java similarity index 100% rename from OCH/mogo-och-bus/src/base/java/com/mogo/och/bus/net/IBascApiService.java rename to OCH/mogo-och-bus/src/jinlvvan/java/com/mogo/och/bus/net/IBascApiService.java diff --git a/OCH/mogo-och-bus/src/base/java/com/mogo/och/bus/net/OrderServiceManager.kt b/OCH/mogo-och-bus/src/jinlvvan/java/com/mogo/och/bus/net/OrderServiceManager.kt similarity index 100% rename from OCH/mogo-och-bus/src/base/java/com/mogo/och/bus/net/OrderServiceManager.kt rename to OCH/mogo-och-bus/src/jinlvvan/java/com/mogo/och/bus/net/OrderServiceManager.kt diff --git a/OCH/mogo-och-bus/src/base/java/com/mogo/och/bus/net/login/OchCommonServiceManager.kt b/OCH/mogo-och-bus/src/jinlvvan/java/com/mogo/och/bus/net/login/OchCommonServiceManager.kt similarity index 100% rename from OCH/mogo-och-bus/src/base/java/com/mogo/och/bus/net/login/OchCommonServiceManager.kt rename to OCH/mogo-och-bus/src/jinlvvan/java/com/mogo/och/bus/net/login/OchCommonServiceManager.kt diff --git a/OCH/mogo-och-bus/src/base/java/com/mogo/och/bus/net/login/OchLoginServiceApi.java b/OCH/mogo-och-bus/src/jinlvvan/java/com/mogo/och/bus/net/login/OchLoginServiceApi.java similarity index 100% rename from OCH/mogo-och-bus/src/base/java/com/mogo/och/bus/net/login/OchLoginServiceApi.java rename to OCH/mogo-och-bus/src/jinlvvan/java/com/mogo/och/bus/net/login/OchLoginServiceApi.java diff --git a/OCH/mogo-och-bus/src/shuttle/java/com/mogo/och/bus/model/OrderModel.java b/OCH/mogo-och-bus/src/shuttle/java/com/mogo/och/bus/model/OrderModel.java index 58c921370a..60d51e5d2a 100644 --- a/OCH/mogo-och-bus/src/shuttle/java/com/mogo/och/bus/model/OrderModel.java +++ b/OCH/mogo-och-bus/src/shuttle/java/com/mogo/och/bus/model/OrderModel.java @@ -24,13 +24,13 @@ import com.mogo.commons.module.status.StatusDescriptor; import com.mogo.eagle.core.data.BaseData; import com.mogo.eagle.core.data.autopilot.AutopilotControlParameters; import com.mogo.eagle.core.data.config.FunctionBuildConfig; -import com.mogo.eagle.core.data.map.MogoLocation; -import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotPlanningListener; import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener; -import com.mogo.eagle.core.function.api.map.listener.IMoGoMapLocationListener; +import com.mogo.eagle.core.function.api.autopilot.IMoGoChassisLocationGCJ02Listener; +import com.mogo.eagle.core.function.api.autopilot.IMoGoPlanningRottingListener; import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotManager; import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager; -import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotPlanningListenerManager; +import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ20ListenerManager; +import com.mogo.eagle.core.function.call.autopilot.CallerPlanningRottingListenerManager; import com.mogo.eagle.core.function.call.map.CallerMapLocationListenerManager; import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; import com.mogo.eagle.core.utilcode.util.NetworkUtils; @@ -150,12 +150,12 @@ public class OrderModel { mContext = AbsMogoApplication.getApp(); loginService = (LoginService) ARouter.getInstance().build(OchCommonConst.LOGINSERVICE).navigation(); // 定位监听 - CallerMapLocationListenerManager.INSTANCE.addListener(TAG, mMapLocationListener, false); + CallerChassisLocationGCJ20ListenerManager.INSTANCE.addListener(TAG, mMapLocationListener); MogoStatusManager.getInstance().registerStatusChangedListener(TAG, StatusDescriptor.VR_MODE, mMogoStatusChangedListener); //自动驾驶路线规划接口 - CallerAutopilotPlanningListenerManager.INSTANCE.addListener(TAG, moGoAutopilotPlanningListener); + CallerPlanningRottingListenerManager.INSTANCE.addListener(TAG, moGoAutopilotPlanningListener); //开启自驾后 异常信息返回 OCHAdasAbilityManager.getInstance().setAdasStartFailureCallback(mAdasStartFailureListener); @@ -265,12 +265,7 @@ public class OrderModel { this.mControllerStatusCallback = callback; } - private final IMoGoAutopilotPlanningListener moGoAutopilotPlanningListener = new IMoGoAutopilotPlanningListener() { - - @Override - public void onAutopilotTrajectory(@NonNull List trajectoryInfos) { - - } + private final IMoGoPlanningRottingListener moGoAutopilotPlanningListener = new IMoGoPlanningRottingListener() { @Override public void onAutopilotRotting(MessagePad.GlobalPathResp routeList) { @@ -307,7 +302,7 @@ public class OrderModel { CallerMapLocationListenerManager.INSTANCE.removeListener(TAG,false); //自动驾驶路线规划接口 - CallerAutopilotPlanningListenerManager.INSTANCE.removeListener(moGoAutopilotPlanningListener); + CallerPlanningRottingListenerManager.INSTANCE.removeListener(moGoAutopilotPlanningListener); loginService = null; OCHAdasAbilityManager.getInstance().setAdasStartFailureCallback(null); @@ -349,25 +344,25 @@ public class OrderModel { }; // 自车定位 - private final IMoGoMapLocationListener mMapLocationListener = new IMoGoMapLocationListener() { + private final IMoGoChassisLocationGCJ02Listener mMapLocationListener = new IMoGoChassisLocationGCJ02Listener() { @Override - public void onLocationChanged(@Nullable MogoLocation location, int from, boolean isGps) { - if (null == location) return; - mLongitude = location.getLongitude(); - mLatitude = location.getLatitude(); + public void onChassisLocationGCJ02(@Nullable MessagePad.GnssInfo gnssInfo) { + if (null == gnssInfo) return; + mLongitude = gnssInfo.getLongitude(); + mLatitude = gnssInfo.getLatitude(); if (mControllerStatusCallback != null) { - mControllerStatusCallback.onCarLocationChanged(location); + mControllerStatusCallback.onCarLocationChanged(gnssInfo); } //是否到站的围栏判断 离站状态并且自动驾驶还未触发到站 if (isGoingToNextStation && !isArrivedStation) { - judgeArrivedStation(location); + judgeArrivedStation(gnssInfo); } } }; //根据围栏判断，是否到达站点 - private void judgeArrivedStation(MogoLocation location) { + private void judgeArrivedStation(MessagePad.GnssInfo location) { if (backgroundCurrentStationIndex + 1 > stationList.size() - 1) { CallerLogger.INSTANCE.e(M_BUS + TAG, "到站数组越界"); diff --git a/app/build.gradle b/app/build.gradle index 1218b0ccb7..032e963998 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -194,9 +194,10 @@ android { manifest.srcFile 'src/main/AndroidManifest.xml' } } - - flavorDimensions "business","product", "basic", "env" - + // 项目 business + // 业务线 product + // 车型 pattern + flavorDimensions "project","product","pattern" ,"basic", "env" productFlavors { // launcher app launcher { @@ -210,21 +211,36 @@ android { buildConfigField 'String', 'MAP_SDK_VERSION', "\"${MAP_SDK_VERSION}\"" buildConfigField 'String', 'MAP_SDK_OPT_VERSION', "\"${MAP_SDK_OPERATION_VERSION}\"" } + + mogo { + dimension "project" + } + + dali { + dimension "project" + } + + // 空业务 主要是给鹰眼使用 noop { - dimension "business" + dimension "product" } - busbase { - dimension "business" + // 小巴车业务 + bus { + dimension "product" } - taxibase { - dimension "business" + // 出租车业务 + taxi { + dimension "product" } + // 清扫车业务 sweeper { - dimension "business" + dimension "product" } + // 接驳车业务 shuttle{ - dimension "business" + dimension "product" } + // 配置网络环境，QA、线上、演示 qa { dimension "env" @@ -245,71 +261,119 @@ android { // 配置不同渠道参数，直接影响功能完整度 apply from: "./productFlavors/fPadLenovo.gradle" - apply from: "./productFlavors/fPadLenovoOchBus.gradle" - apply from: "./productFlavors/fPadLenovoOchBusShuttle.gradle" - apply from: "./productFlavors/fPadLenovoOchTaxi.gradle" - apply from: "./productFlavors/fPadLenovoOchBusPassenger.gradle" - apply from: "./productFlavors/fPadLenovoOchBusPassengerM1.gradle" - apply from: "./productFlavors/fPadLenovoOchBusPassengerM2.gradle" - apply from: "./productFlavors/fPadLenovoOchBusShuttlePassenger.gradle" - apply from: "./productFlavors/fPadLenovoOchTaxiPassenger.gradle" - apply from: "./productFlavors/fPadLenovoOchSweeper.gradle" + apply from: "./productFlavors/fOchBus.gradle" + apply from: "./productFlavors/fOchShuttle.gradle" + apply from: "./productFlavors/fOchTaxi.gradle" + apply from: "./productFlavors/fOchBusPassenger.gradle" + apply from: "./productFlavors/fOchBusPassengerM1.gradle" + apply from: "./productFlavors/fOchBusPassengerM2.gradle" + apply from: "./productFlavors/fOchShuttlePassenger.gradle" + apply from: "./productFlavors/fOchTaxiPassenger.gradle" + apply from: "./productFlavors/fOchSweeper.gradle" apply from: "./productFlavors/fMultiDisplayOchBus.gradle" apply from: "./productFlavors/fMultiDisplayOchTaxi.gradle" variantFilter { variant -> def names = variant.flavors*.name //要检查特定的构建类型，请使用variant.buildType.name ==“ ” - // region 过滤noop 的flavors 不带och业务的 - if (names.contains("noop")&&!names.contains("fPadLenovo")) { - //Gradle会忽略满足上述条件的所有变体 + if(names.contains("mogo")) { + // region 过滤noop 的flavors 不带och业务的 + if (names.contains("noop")&&!names.contains("fPadLenovo")) { + //Gradle会忽略满足上述条件的所有变体 + setIgnore(true) + } + // endregion + // region 过滤sweper 的flavors + if (names.contains("sweeper") && !names.contains("fOchSweeper")) { + //Gradle会忽略满足上述条件的所有变体 + setIgnore(true) + } + // endregion + // region 过滤shuttle 的flavors + if (names.contains("shuttle")) { + //Gradle会忽略满足上述条件的所有变体 + if (names.contains("fOchBus")) { + } else if (names.contains("fOchBusPassenger")) { + } else { + setIgnore(true) + } + } + // endregion + // region 过滤taxi 的flavors + if (names.contains("taxi")) { + //Gradle会忽略满足上述条件的所有变体 + if (names.contains("fOchTaxi")) { + } else if (names.contains("fOchTaxiPassenger")) { + } else if (names.contains("fPadLenovo")) { + } else if (names.contains("fMultiDisplayOchTaxi")) { + } else { + setIgnore(true) + } + } + // endregion + // region 过滤bus 的flavors + if (names.contains("bus")) { + //Gradle会忽略满足上述条件的所有变体 + if (names.contains("fOchBus")) { + } else if (names.contains("fOchBusPassenger")) { + } else if (names.contains("fMultiDisplayOchBus")) { + } else if (names.contains("fOchBusPassengerM1")) { + } else if (names.contains("fOchBusPassengerM2")) { + } else if (names.contains("fOchShuttle")) { + } else if (names.contains("fOchShuttlePassenger")) { + } else { + setIgnore(true) + } + } + // endregion + } + else if(names.contains("dali")){ + // region 过滤noop 的flavors 不带och业务的 + if (names.contains("noop")) { + //Gradle会忽略满足上述条件的所有变体 + setIgnore(true) + } + // endregion + // region 过滤sweper 的flavors + if (names.contains("sweeper")) { + //Gradle会忽略满足上述条件的所有变体 + setIgnore(true) + } + // endregion + // region 过滤taxi 的flavors + if (names.contains("taxi")) { + setIgnore(true) + } + // endregion + // region 过滤shuttle 的flavors + if (names.contains("shuttle")) { + //Gradle会忽略满足上述条件的所有变体 + if (names.contains("fOchShuttle")) { + } else if (names.contains("fOchShuttlePassenger")) { + } else { + setIgnore(true) + } + } + // endregion + // region 过滤bus 的flavors + if (names.contains("bus")) { + //Gradle会忽略满足上述条件的所有变体 + if (names.contains("fOchBus")) { + } else if (names.contains("fOchBusPassenger")) { + } else if (names.contains("fMultiDisplayOchBus")) { + } else if (names.contains("fOchBusPassengerM1")) { + } else if (names.contains("fOchBusPassengerM2")) { + } else if (names.contains("fOchShuttle")) { + } else if (names.contains("fBusShuttlePassenger")) { + } else { + setIgnore(true) + } + } + // endregion + } + else { setIgnore(true) } - // endregion - // region 过滤sweper 的flavors - if (names.contains("sweeper")&&!names.contains("fPadLenovoOchSweeper")) { - //Gradle会忽略满足上述条件的所有变体 - setIgnore(true) - } - // endregion - - // region 过滤shuttle 的flavors - if (names.contains("shuttle")) { - //Gradle会忽略满足上述条件的所有变体 - if(names.contains("fPadLenovoOchBus")){ - }else if(names.contains("fPadLenovoOchBusPassenger")){ - }else { - setIgnore(true) - } - } - // endregion - // region 过滤taxibase 的flavors - if (names.contains("taxibase")) { - //Gradle会忽略满足上述条件的所有变体 - if(names.contains("fPadLenovoOchTaxi")){ - }else if(names.contains("fPadLenovoOchTaxiPassenger")){ - }else if(names.contains("fPadLenovo")){ - }else if(names.contains("fMultiDisplayOchTaxi")){ - }else { - setIgnore(true) - } - } - // endregion - // region 过滤taxibase 的flavors - if (names.contains("busbase")) { - //Gradle会忽略满足上述条件的所有变体 - if(names.contains("fPadLenovoOchBus")){ - }else if(names.contains("fPadLenovoOchBusPassenger")){ - }else if(names.contains("fMultiDisplayOchBus")){ - }else if(names.contains("fPadLenovoOchBusPassengerM1")){ - }else if(names.contains("fPadLenovoOchBusPassengerM2")){ - }else if(names.contains("fPadLenovoOchBusShuttle")){ - }else if(names.contains("fPadLenovoOchBusShuttlePassenger")){ - }else { - setIgnore(true) - } - } - // endregion } packagingOptions { @@ -494,7 +558,7 @@ Object readFileToJson(env){ } } // 保底原则 - return jsonOutput.toJson(config.get("busbase").get(env)) + return jsonOutput.toJson(config.get("bus").get(env)) } catch (IOException e) { e.printStackTrace() } @@ -508,9 +572,9 @@ def variantName() { return split[2].toString().split("]")[0].replace("assemble","") }else { if(taskName.contains("bus")) { - return "busbase" + return "bus" }else { - return "taxibase" + return "taxi" } } } diff --git a/app/config.json b/app/config.json index 539d613985..1498dae577 100644 --- a/app/config.json +++ b/app/config.json @@ -1,5 +1,5 @@ { - "busbase": { + "bus": { "qa": { "och_url":"https://tech-qa.zhidaohulian.com" }, @@ -10,7 +10,7 @@ "och_url":"http://tech-dev.zhidaohulian.com" } }, - "taxibase": { + "taxi": { "qa": { "och_url":"https://tech-qa.zhidaohulian.com" }, diff --git a/app/functions/och.gradle b/app/functions/och.gradle index 36bea43bd1..8388840e97 100644 --- a/app/functions/och.gradle +++ b/app/functions/och.gradle @@ -3,19 +3,19 @@ project.dependencies { if (Boolean.valueOf(USE_MAVEN_PACKAGE)) { fPadLenovoImplementation(rootProject.ext.dependencies.mogoochnoop) // sweeper清扫车 - fPadLenovoOchSweeperImplementation(rootProject.ext.dependencies.mogoochsweeper) + fOchSweeperImplementation(rootProject.ext.dependencies.mogoochsweeper) // Bus司机端 - fPadLenovoOchBusImplementation(rootProject.ext.dependencies.mogoochbus) + fOchBusImplementation(rootProject.ext.dependencies.mogoochbus) // Bus乘客端 - fPadLenovoOchBusPassengerImplementation(rootProject.ext.dependencies.mogoochbus) - fPadLenovoOchBusPassengerM1Implementation(rootProject.ext.dependencies.mogoochbus) - fPadLenovoOchBusPassengerM2Implementation(rootProject.ext.dependencies.mogoochbus) + fOchBusPassengerImplementation(rootProject.ext.dependencies.mogoochbus) + fOchBusPassengerM1Implementation(rootProject.ext.dependencies.mogoochbus) + fOchBusPassengerM2Implementation(rootProject.ext.dependencies.mogoochbus) // taxi司机端 - fPadLenovoOchTaxiImplementation(rootProject.ext.dependencies.mogoochtaxi) + fOchTaxiImplementation(rootProject.ext.dependencies.mogoochtaxi) // taxi乘客端 - fPadLenovoOchTaxiPassengerImplementation(rootProject.ext.dependencies.mogoochtaxi) + fOchTaxiPassengerImplementation(rootProject.ext.dependencies.mogoochtaxi) // Bus司机端 fMultiDisplayOchBusImplementation(rootProject.ext.dependencies.mogoochbus) @@ -23,8 +23,8 @@ project.dependencies { fMultiDisplayOchBusImplementation(rootProject.ext.dependencies.mogoochbus) //接驳车司乘端 - fPadLenovoOchBusShuttleImplementation(rootProject.ext.dependencies.mogoochbus) - fPadLenovoOchBusShuttlePassengerImplementation(rootProject.ext.dependencies.mogoochbus) + fOchShuttleImplementation(rootProject.ext.dependencies.mogoochbus) + fOchShuttlePassengerImplementation(rootProject.ext.dependencies.mogoochbus) // taxi司机端 fMultiDisplayOchTaxiImplementation(rootProject.ext.dependencies.mogoochtaxi) @@ -33,19 +33,19 @@ project.dependencies { } else { fPadLenovoImplementation (project(':OCH:mogo-och-noop')) // sweeper 清扫车 - fPadLenovoOchSweeperImplementation (project(':OCH:mogo-och-sweeper')) + fOchSweeperImplementation (project(':OCH:mogo-och-sweeper')) // Bus司机端 - fPadLenovoOchBusImplementation (project(':OCH:mogo-och-bus')) + fOchBusImplementation (project(':OCH:mogo-och-bus')) // Bus乘客端 - fPadLenovoOchBusPassengerImplementation (project(':OCH:mogo-och-bus-passenger')) - fPadLenovoOchBusPassengerM1Implementation (project(':OCH:mogo-och-bus-passenger')) - fPadLenovoOchBusPassengerM2Implementation (project(':OCH:mogo-och-bus-passenger')) + fOchBusPassengerImplementation (project(':OCH:mogo-och-bus-passenger')) + fOchBusPassengerM1Implementation (project(':OCH:mogo-och-bus-passenger')) + fOchBusPassengerM2Implementation (project(':OCH:mogo-och-bus-passenger')) // taxi司机端 - fPadLenovoOchTaxiImplementation (project(':OCH:mogo-och-taxi')) + fOchTaxiImplementation (project(':OCH:mogo-och-taxi')) // taxi乘客端 - fPadLenovoOchTaxiPassengerImplementation (project(':OCH:mogo-och-taxi-passenger')) + fOchTaxiPassengerImplementation (project(':OCH:mogo-och-taxi-passenger')) // Bus司机端 fMultiDisplayOchBusImplementation (project(':OCH:mogo-och-bus')) @@ -53,8 +53,8 @@ project.dependencies { fMultiDisplayOchBusImplementation (project(':OCH:mogo-och-bus-passenger')) //接驳车司乘端 - fPadLenovoOchBusShuttleImplementation (project(':OCH:mogo-och-bus')) - fPadLenovoOchBusShuttlePassengerImplementation (project(':OCH:mogo-och-bus-passenger')) + fOchShuttleImplementation (project(':OCH:mogo-och-bus')) + fOchShuttlePassengerImplementation (project(':OCH:mogo-och-bus-passenger')) // taxi司机端 fMultiDisplayOchTaxiImplementation (project(':OCH:mogo-och-taxi')) diff --git a/app/productFlavors/fMultiDisplayOchBus.gradle b/app/productFlavors/fMultiDisplayOchBus.gradle index 8b3608c211..1a9663cf31 100644 --- a/app/productFlavors/fMultiDisplayOchBus.gradle +++ b/app/productFlavors/fMultiDisplayOchBus.gradle @@ -13,12 +13,14 @@ project.android.productFlavors { versionName rootProject.versionName // 应用包名 applicationId rootProject.ext.android.fLauncherApplicationId - dimension "product" + dimension "pattern" + // 和 och/mogo-och-bus-passenger 的flavors的m1对应 + matchingFallbacks = ['jinlvvan'] // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0 buildConfigField 'int', 'CAR_MACHINE_TYPE', '2' //高德地图鉴权信息 - manifestPlaceholders = [AMAP_API_VALUE: rootProject.ext.android.fLauncherAmapApiValue, CHANNEL_VALUE: "fPadLenovoOchBus",ACTIVITY_ROOT:true] + manifestPlaceholders = [AMAP_API_VALUE: rootProject.ext.android.fLauncherAmapApiValue, CHANNEL_VALUE: "fOchBus",ACTIVITY_ROOT:true] // 是否需要实时上报坐标 buildConfigField 'boolean', 'IS_NEED_UPLOAD_COORDINATES_IN_TIME', 'true' @@ -26,7 +28,7 @@ project.android.productFlavors { buildConfigField 'int', 'GPS_PROVIDER', "1" // 构建的应用身份类型，具体查看 README.md APP_IDENTITY_MODE规则 - buildConfigField 'String', 'APP_IDENTITY_MODE', "\"Bus_Driver_Base\"" + buildConfigField 'String', 'APP_IDENTITY_MODE', "\"Bus_Driver_JLKV\"" // 连接的工控机IP地址 buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.8.102\"" // 构建的是否是演示（美化）模式 diff --git a/app/productFlavors/fMultiDisplayOchTaxi.gradle b/app/productFlavors/fMultiDisplayOchTaxi.gradle index a5534d3fce..9960a37933 100644 --- a/app/productFlavors/fMultiDisplayOchTaxi.gradle +++ b/app/productFlavors/fMultiDisplayOchTaxi.gradle @@ -13,12 +13,12 @@ project.android.productFlavors { versionName rootProject.versionName // 应用包名 applicationId rootProject.ext.android.fLauncherApplicationId - dimension "product" + dimension "pattern" // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0 buildConfigField 'int', 'CAR_MACHINE_TYPE', '2' //高德地图鉴权信息 - manifestPlaceholders = [AMAP_API_VALUE: rootProject.ext.android.fLauncherAmapApiValue, CHANNEL_VALUE: "fPadLenovoOchTaxi",ACTIVITY_ROOT:true] + manifestPlaceholders = [AMAP_API_VALUE: rootProject.ext.android.fLauncherAmapApiValue, CHANNEL_VALUE: "fOchTaxi",ACTIVITY_ROOT:true] // 是否需要实时上报坐标 buildConfigField 'boolean', 'IS_NEED_UPLOAD_COORDINATES_IN_TIME', 'true' @@ -26,7 +26,7 @@ project.android.productFlavors { buildConfigField 'int', 'GPS_PROVIDER', "1" // 构建的应用身份类型，具体查看 README.md APP_IDENTITY_MODE规则 - buildConfigField 'String', 'APP_IDENTITY_MODE', "\"Taxi_Driver_Base\"" + buildConfigField 'String', 'APP_IDENTITY_MODE', "\"Taxi_Driver_DFHQ\"" // 连接的工控机IP地址 buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.1.102\"" // 构建的是否是演示（美化）模式 diff --git a/app/productFlavors/fPadLenovoOchBus.gradle b/app/productFlavors/fOchBus.gradle similarity index 89% rename from app/productFlavors/fPadLenovoOchBus.gradle rename to app/productFlavors/fOchBus.gradle index 7a8943d7a7..f2191e8e95 100644 --- a/app/productFlavors/fPadLenovoOchBus.gradle +++ b/app/productFlavors/fOchBus.gradle @@ -1,6 +1,6 @@ project.android.productFlavors { // 衡阳-联想Pad-网约车-小巴车 - fPadLenovoOchBus { + fOchBus { externalNativeBuild { ndk { // 设置支持的SO库架构 @@ -13,13 +13,13 @@ project.android.productFlavors { versionName rootProject.versionName // 应用包名 applicationId rootProject.ext.android.fLauncherApplicationId - dimension "product" - matchingFallbacks = ['base'] + dimension "pattern" + matchingFallbacks = ['jinlvvan'] // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0 buildConfigField 'int', 'CAR_MACHINE_TYPE', '2' //高德地图鉴权信息 - manifestPlaceholders = [AMAP_API_VALUE: rootProject.ext.android.fLauncherAmapApiValue, CHANNEL_VALUE: "fPadLenovoOchBus",ACTIVITY_ROOT:true] + manifestPlaceholders = [AMAP_API_VALUE: rootProject.ext.android.fLauncherAmapApiValue, CHANNEL_VALUE: "fOchBus",ACTIVITY_ROOT:true] // 是否需要实时上报坐标 buildConfigField 'boolean', 'IS_NEED_UPLOAD_COORDINATES_IN_TIME', 'true' @@ -27,7 +27,7 @@ project.android.productFlavors { buildConfigField 'int', 'GPS_PROVIDER', "1" // 构建的应用身份类型，具体查看 README.md APP_IDENTITY_MODE规则 - buildConfigField 'String', 'APP_IDENTITY_MODE', "\"Bus_Driver_Base\"" + buildConfigField 'String', 'APP_IDENTITY_MODE', "\"Bus_Driver_JLKV\"" // 连接的工控机IP地址 buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.8.102\"" // 构建的是否是演示（美化）模式 diff --git a/app/productFlavors/fPadLenovoOchBusPassenger.gradle b/app/productFlavors/fOchBusPassenger.gradle similarity index 85% rename from app/productFlavors/fPadLenovoOchBusPassenger.gradle rename to app/productFlavors/fOchBusPassenger.gradle index fee09bf5c4..858bbabcbd 100644 --- a/app/productFlavors/fPadLenovoOchBusPassenger.gradle +++ b/app/productFlavors/fOchBusPassenger.gradle @@ -1,6 +1,6 @@ project.android.productFlavors { // 衡阳-联想Pad-网约车-小巴车-乘客端 - fPadLenovoOchBusPassenger { + fOchBusPassenger { externalNativeBuild { ndk { // 设置支持的SO库架构 @@ -11,13 +11,14 @@ project.android.productFlavors { targetSdkVersion rootProject.ext.android.targetSdkVersionPadLenovo // 应用包名 applicationId rootProject.ext.android.fLauncherApplicationId - dimension "product" - matchingFallbacks = ['base'] + dimension "pattern" + // 和 och/mogo-och-bus-passenger 的flavors的jinlvvan对应 + matchingFallbacks = ['jinlvvan'] // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0 buildConfigField 'int', 'CAR_MACHINE_TYPE', '2' //高德地图鉴权信息 - manifestPlaceholders = [AMAP_API_VALUE: rootProject.ext.android.fLauncherAmapApiValue, CHANNEL_VALUE: "fPadLenovoOchBusPassenger",ACTIVITY_ROOT:true] + manifestPlaceholders = [AMAP_API_VALUE: rootProject.ext.android.fLauncherAmapApiValue, CHANNEL_VALUE: "fOchBusPassenger",ACTIVITY_ROOT:true] // 是否需要实时上报坐标 buildConfigField 'boolean', 'IS_NEED_UPLOAD_COORDINATES_IN_TIME', 'true' @@ -25,7 +26,7 @@ project.android.productFlavors { buildConfigField 'int', 'GPS_PROVIDER', "1" // 构建的应用身份类型，具体查看 README.md APP_IDENTITY_MODE规则 - buildConfigField 'String', 'APP_IDENTITY_MODE', "\"Bus_Passenger_Base\"" + buildConfigField 'String', 'APP_IDENTITY_MODE', "\"Bus_Passenger_JLKV\"" // 连接的工控机IP地址 buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.8.103\"" // 构建的是否是演示（美化）模式 diff --git a/app/productFlavors/fPadLenovoOchBusPassengerM1.gradle b/app/productFlavors/fOchBusPassengerM1.gradle similarity index 88% rename from app/productFlavors/fPadLenovoOchBusPassengerM1.gradle rename to app/productFlavors/fOchBusPassengerM1.gradle index 3a7820ea00..a13828e9f6 100644 --- a/app/productFlavors/fPadLenovoOchBusPassengerM1.gradle +++ b/app/productFlavors/fOchBusPassengerM1.gradle @@ -1,6 +1,6 @@ project.android.productFlavors { // 衡阳-联想Pad-网约车-小巴车-乘客端 - fPadLenovoOchBusPassengerM1 { + fOchBusPassengerM1 { externalNativeBuild { ndk { // 设置支持的SO库架构 @@ -11,13 +11,14 @@ project.android.productFlavors { targetSdkVersion rootProject.ext.android.targetSdkVersionPadLenovo // 应用包名 applicationId rootProject.ext.android.fLauncherApplicationId - dimension "product" + dimension "pattern" + // 和 och/mogo-och-bus-passenger 的flavors的m1对应 matchingFallbacks = ['m1'] // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0 buildConfigField 'int', 'CAR_MACHINE_TYPE', '2' //高德地图鉴权信息 - manifestPlaceholders = [AMAP_API_VALUE: rootProject.ext.android.fLauncherAmapApiValue, CHANNEL_VALUE: "fPadLenovoOchBusPassenger",ACTIVITY_ROOT:true] + manifestPlaceholders = [AMAP_API_VALUE: rootProject.ext.android.fLauncherAmapApiValue, CHANNEL_VALUE: "fOchBusPassenger",ACTIVITY_ROOT:true] // 是否需要实时上报坐标 buildConfigField 'boolean', 'IS_NEED_UPLOAD_COORDINATES_IN_TIME', 'true' diff --git a/app/productFlavors/fPadLenovoOchBusPassengerM2.gradle b/app/productFlavors/fOchBusPassengerM2.gradle similarity index 88% rename from app/productFlavors/fPadLenovoOchBusPassengerM2.gradle rename to app/productFlavors/fOchBusPassengerM2.gradle index 5575a2133a..33ce9209fa 100644 --- a/app/productFlavors/fPadLenovoOchBusPassengerM2.gradle +++ b/app/productFlavors/fOchBusPassengerM2.gradle @@ -1,6 +1,6 @@ project.android.productFlavors { // 衡阳-联想Pad-网约车-小巴车-乘客端 - fPadLenovoOchBusPassengerM2 { + fOchBusPassengerM2 { externalNativeBuild { ndk { // 设置支持的SO库架构 @@ -11,13 +11,14 @@ project.android.productFlavors { targetSdkVersion rootProject.ext.android.targetSdkVersionPadLenovo // 应用包名 applicationId rootProject.ext.android.fLauncherApplicationId - dimension "product" + dimension "pattern" + // 和 och/mogo-och-bus-passenger 的flavors的m2对应 matchingFallbacks = ['m2'] // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0 buildConfigField 'int', 'CAR_MACHINE_TYPE', '2' //高德地图鉴权信息 - manifestPlaceholders = [AMAP_API_VALUE: rootProject.ext.android.fLauncherAmapApiValue, CHANNEL_VALUE: "fPadLenovoOchBusPassenger",ACTIVITY_ROOT:true] + manifestPlaceholders = [AMAP_API_VALUE: rootProject.ext.android.fLauncherAmapApiValue, CHANNEL_VALUE: "fOchBusPassenger",ACTIVITY_ROOT:true] // 是否需要实时上报坐标 buildConfigField 'boolean', 'IS_NEED_UPLOAD_COORDINATES_IN_TIME', 'true' diff --git a/app/productFlavors/fPadLenovoOchBusShuttle.gradle b/app/productFlavors/fOchShuttle.gradle similarity index 85% rename from app/productFlavors/fPadLenovoOchBusShuttle.gradle rename to app/productFlavors/fOchShuttle.gradle index f6869ae54f..23b4abf485 100644 --- a/app/productFlavors/fPadLenovoOchBusShuttle.gradle +++ b/app/productFlavors/fOchShuttle.gradle @@ -1,6 +1,6 @@ project.android.productFlavors { // 衡阳-联想Pad-网约车-小巴车 - fPadLenovoOchBusShuttle { + fOchShuttle { externalNativeBuild { ndk { // 设置支持的SO库架构 @@ -13,13 +13,14 @@ project.android.productFlavors { versionName rootProject.versionName // 应用包名 applicationId rootProject.ext.android.fLauncherApplicationId - dimension "product" + dimension "pattern" + // 和 och/mogo-och-bus-passenger 的flavors的shuttle对应 matchingFallbacks = ['shuttle'] // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0 buildConfigField 'int', 'CAR_MACHINE_TYPE', '2' //高德地图鉴权信息 - manifestPlaceholders = [AMAP_API_VALUE: rootProject.ext.android.fLauncherAmapApiValue, CHANNEL_VALUE: "fPadLenovoOchBus",ACTIVITY_ROOT:true] + manifestPlaceholders = [AMAP_API_VALUE: rootProject.ext.android.fLauncherAmapApiValue, CHANNEL_VALUE: "fOchShuttle",ACTIVITY_ROOT:true] // 是否基于地图 buildConfigField 'boolean', 'IS_MAP_BASED', 'true' @@ -30,7 +31,7 @@ project.android.productFlavors { buildConfigField 'int', 'GPS_PROVIDER', "1" // 构建的应用身份类型，具体查看 README.md APP_IDENTITY_MODE规则 - buildConfigField 'String', 'APP_IDENTITY_MODE', "\"Bus_Driver_Shuttle\"" + buildConfigField 'String', 'APP_IDENTITY_MODE', "\"Shuttle_Driver_JL\"" // 连接的工控机IP地址 buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.8.103\"" // 构建的是否是演示（美化）模式 diff --git a/app/productFlavors/fPadLenovoOchBusShuttlePassenger.gradle b/app/productFlavors/fOchShuttlePassenger.gradle similarity index 86% rename from app/productFlavors/fPadLenovoOchBusShuttlePassenger.gradle rename to app/productFlavors/fOchShuttlePassenger.gradle index 91b24202ee..93f3337864 100644 --- a/app/productFlavors/fPadLenovoOchBusShuttlePassenger.gradle +++ b/app/productFlavors/fOchShuttlePassenger.gradle @@ -1,6 +1,6 @@ project.android.productFlavors { // 衡阳-联想Pad-网约车-小巴车-乘客端 - fPadLenovoOchBusShuttlePassenger { + fOchShuttlePassenger { externalNativeBuild { ndk { // 设置支持的SO库架构 @@ -11,13 +11,13 @@ project.android.productFlavors { targetSdkVersion rootProject.ext.android.targetSdkVersionPadLenovo // 应用包名 applicationId rootProject.ext.android.fLauncherApplicationId - dimension "product" + dimension "pattern" matchingFallbacks = ['shuttle'] // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0 buildConfigField 'int', 'CAR_MACHINE_TYPE', '2' //高德地图鉴权信息 - manifestPlaceholders = [AMAP_API_VALUE: rootProject.ext.android.fLauncherAmapApiValue, CHANNEL_VALUE: "fPadLenovoOchBusPassenger",ACTIVITY_ROOT:true] + manifestPlaceholders = [AMAP_API_VALUE: rootProject.ext.android.fLauncherAmapApiValue, CHANNEL_VALUE: "fOchShuttlePassenger",ACTIVITY_ROOT:true] // 是否基于地图 buildConfigField 'boolean', 'IS_MAP_BASED', 'true' @@ -28,7 +28,7 @@ project.android.productFlavors { buildConfigField 'int', 'GPS_PROVIDER', "1" // 构建的应用身份类型，具体查看 README.md APP_IDENTITY_MODE规则 - buildConfigField 'String', 'APP_IDENTITY_MODE', "\"Bus_Passenger_Shuttle\"" + buildConfigField 'String', 'APP_IDENTITY_MODE', "\"Shuttle_Passenger_JL\"" // 连接的工控机IP地址 buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.8.103\"" // 构建的是否是演示（美化）模式 diff --git a/app/productFlavors/fPadLenovoOchSweeper.gradle b/app/productFlavors/fOchSweeper.gradle similarity index 91% rename from app/productFlavors/fPadLenovoOchSweeper.gradle rename to app/productFlavors/fOchSweeper.gradle index 29688ff909..6aae05ea54 100644 --- a/app/productFlavors/fPadLenovoOchSweeper.gradle +++ b/app/productFlavors/fOchSweeper.gradle @@ -1,6 +1,6 @@ project.android.productFlavors { // 衡阳-联想Pad-网约车-小巴车 - fPadLenovoOchSweeper { + fOchSweeper { externalNativeBuild { ndk { // 设置支持的SO库架构 @@ -13,12 +13,12 @@ project.android.productFlavors { versionName rootProject.versionName // 应用包名 applicationId rootProject.ext.android.fLauncherApplicationId - dimension "product" + dimension "pattern" // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0 buildConfigField 'int', 'CAR_MACHINE_TYPE', '2' //高德地图鉴权信息 - manifestPlaceholders = [AMAP_API_VALUE: rootProject.ext.android.fLauncherAmapApiValue, CHANNEL_VALUE: "fPadLenovoOchSweeper",ACTIVITY_ROOT:true] + manifestPlaceholders = [AMAP_API_VALUE: rootProject.ext.android.fLauncherAmapApiValue, CHANNEL_VALUE: "fOchSweeper",ACTIVITY_ROOT:true] // 是否需要实时上报坐标 buildConfigField 'boolean', 'IS_NEED_UPLOAD_COORDINATES_IN_TIME', 'true' diff --git a/app/productFlavors/fPadLenovoOchTaxi.gradle b/app/productFlavors/fOchTaxi.gradle similarity index 91% rename from app/productFlavors/fPadLenovoOchTaxi.gradle rename to app/productFlavors/fOchTaxi.gradle index 8b03a2ae79..6d0c0b7f9a 100644 --- a/app/productFlavors/fPadLenovoOchTaxi.gradle +++ b/app/productFlavors/fOchTaxi.gradle @@ -1,7 +1,7 @@ project.android.productFlavors { // 衡阳-联想Pad-网约车-出租车 - fPadLenovoOchTaxi { + fOchTaxi { externalNativeBuild { ndk { // 设置支持的SO库架构 @@ -14,12 +14,12 @@ project.android.productFlavors { versionName rootProject.versionName // 应用包名 applicationId rootProject.ext.android.fLauncherApplicationId - dimension "product" + dimension "pattern" // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0 buildConfigField 'int', 'CAR_MACHINE_TYPE', '2' //高德地图鉴权信息 - manifestPlaceholders = [AMAP_API_VALUE: rootProject.ext.android.fLauncherAmapApiValue, CHANNEL_VALUE: "fPadLenovoOchTaxi",ACTIVITY_ROOT:true] + manifestPlaceholders = [AMAP_API_VALUE: rootProject.ext.android.fLauncherAmapApiValue, CHANNEL_VALUE: "fOchTaxi",ACTIVITY_ROOT:true] // 是否需要实时上报坐标 buildConfigField 'boolean', 'IS_NEED_UPLOAD_COORDINATES_IN_TIME', 'true' @@ -27,7 +27,7 @@ project.android.productFlavors { buildConfigField 'int', 'GPS_PROVIDER', "1" // 构建的应用身份类型，具体查看 README.md APP_IDENTITY_MODE规则 - buildConfigField 'String', 'APP_IDENTITY_MODE', "\"Taxi_Driver_Base\"" + buildConfigField 'String', 'APP_IDENTITY_MODE', "\"Taxi_Driver_DFHQ\"" // 连接的工控机IP地址 buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.1.102\"" // 构建的是否是演示（美化）模式 diff --git a/app/productFlavors/fPadLenovoOchTaxiPassenger.gradle b/app/productFlavors/fOchTaxiPassenger.gradle similarity index 90% rename from app/productFlavors/fPadLenovoOchTaxiPassenger.gradle rename to app/productFlavors/fOchTaxiPassenger.gradle index 0ea289b89d..12967729ec 100644 --- a/app/productFlavors/fPadLenovoOchTaxiPassenger.gradle +++ b/app/productFlavors/fOchTaxiPassenger.gradle @@ -1,6 +1,6 @@ project.android.productFlavors { // 衡阳-联想Pad-网约车-出租车-乘客端 - fPadLenovoOchTaxiPassenger { + fOchTaxiPassenger { externalNativeBuild { ndk { // 设置支持的SO库架构 @@ -13,12 +13,12 @@ project.android.productFlavors { versionName rootProject.versionName // 应用包名 applicationId rootProject.ext.android.fLauncherApplicationId - dimension "product" + dimension "pattern" // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0 buildConfigField 'int', 'CAR_MACHINE_TYPE', '2' //高德地图鉴权信息 - manifestPlaceholders = [AMAP_API_VALUE: rootProject.ext.android.fLauncherAmapApiValue, CHANNEL_VALUE: "fPadLenovoOchTaxiPassenger",ACTIVITY_ROOT:false] + manifestPlaceholders = [AMAP_API_VALUE: rootProject.ext.android.fLauncherAmapApiValue, CHANNEL_VALUE: "fOchTaxiPassenger",ACTIVITY_ROOT:false] // 是否需要实时上报坐标 buildConfigField 'boolean', 'IS_NEED_UPLOAD_COORDINATES_IN_TIME', 'true' @@ -26,7 +26,7 @@ project.android.productFlavors { buildConfigField 'int', 'GPS_PROVIDER', "1" // 构建的应用身份类型，具体查看 README.md APP_IDENTITY_MODE规则 - buildConfigField 'String', 'APP_IDENTITY_MODE', "\"Taxi_Passenger_Base\"" + buildConfigField 'String', 'APP_IDENTITY_MODE', "\"Taxi_Passenger_DFHQ\"" // 连接的工控机IP地址 buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.1.103\"" // 构建的是否是演示（美化）模式 diff --git a/app/productFlavors/fPadLenovo.gradle b/app/productFlavors/fPadLenovo.gradle index 3f81f59165..5ea0511ed4 100644 --- a/app/productFlavors/fPadLenovo.gradle +++ b/app/productFlavors/fPadLenovo.gradle @@ -11,7 +11,7 @@ project.android.productFlavors { targetSdkVersion rootProject.ext.android.targetSdkVersionPadLenovo // 应用包名 applicationId rootProject.ext.android.fLauncherApplicationId - dimension "product" + dimension "pattern" // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0 buildConfigField 'int', 'CAR_MACHINE_TYPE', '2' @@ -24,7 +24,7 @@ project.android.productFlavors { buildConfigField 'int', 'GPS_PROVIDER', "1" // 构建的应用身份类型，具体查看 README.md APP_IDENTITY_MODE规则 - buildConfigField 'String', 'APP_IDENTITY_MODE', "\"Taxi_Driver_Base\"" + buildConfigField 'String', 'APP_IDENTITY_MODE', "\"Taxi_Driver_DFHQ\"" // 连接的工控机IP地址 buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.1.104\"" // 构建的是否是演示（美化）模式 diff --git a/app/regroup.gradle b/app/regroup.gradle index 64ad37e011..13d8b8fcc4 100644 --- a/app/regroup.gradle +++ b/app/regroup.gradle @@ -3,11 +3,15 @@ afterEvaluate { def launcher = [ "fPadLenovo", - "fPadLenovoOchSweeper", - "fPadLenovoOchTaxi", - "fPadLenovoOchBus", - "fPadLenovoOchBusPassenger", - "fPadLenovoOchTaxiPassenger", + "fOchSweeper", + "fOchTaxi", + "fOchBus", + "fOchBusPassenger", + "fOchBusPassengerM1", + "fOchBusPassengerM2", + "fOchShuttle", + "fOchShuttlePassenger", + "fOchTaxiPassenger", "MultiDisplayOchBus", "MultiDisplayOchTaxi"] diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/AutoPilotAndCheckView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/AutoPilotAndCheckView.kt index 77e12619af..6db1781226 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/AutoPilotAndCheckView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/AutoPilotAndCheckView.kt @@ -166,19 +166,6 @@ internal class AutoPilotAndCheckView @JvmOverloads constructor( } actvLoginout.visibility = View.VISIBLE toolBusOperationView.showBusOperation() - - // TODO 这里判断方式可以替换为使用 AppIdentityModeUtils.isBus(FunctionBuildConfig.appIdentityMode)等进行替换 - when (DebugConfig.getProductFlavor()) { - "fPadLenovoOchTaxi" -> { - //出租车司机 - } - "fPadLenovoOchBus" ->{ - //小巴车司机 - } - else -> { - - } - } } private fun killApp() {