[gradle 渠道名修改]

[接驳车乘客端和bus乘客端代码合并通过AppIdentityModeUtils 来判断]

OCH/mogo-och-bus-passenger/build.gradle

@@ -41,51 +41,24 @@ android {
         }
     }
 
-    flavorDimensions "pattern"
+    flavorDimensions "vehicle"
     productFlavors {
         // 车型：金旅星辰、开沃 小巴业务
         jinlvvan {
-            dimension "pattern"
+            dimension "vehicle"
             buildConfigField 'int', 'NEW_TEST', '0'
         }
         // 车型：金旅m1 小巴业务
         m1 {
-            dimension "pattern"
+            dimension "vehicle"
             buildConfigField 'int', 'NEW_TEST', '1'
         }
 
         // 车型：金旅m1 小巴业务
         m2 {
-            dimension "pattern"
+            dimension "vehicle"
             buildConfigField 'int', 'NEW_TEST', '1'
         }
-
-        // 业务：接驳车 bus乘客屏高度耦合、暂时放到这里
-        // 后期会和module mogo-och-bus-passenger 放到同一级别
-        shuttle {
-            dimension "pattern"
-            buildConfigField 'int', 'NEW_TEST', '1'
-        }
-    }
-    sourceSets {
-        // 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']
-            java.srcDirs=['src/m1/java']
-        }
-        m2 {
-            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',]
-        }
     }
 }
 

OCH/mogo-och-bus-passenger/src/basecommon/java/com/mogo/och/bus/passenger/network/BusPassengerServiceManager.kt

@@ -1,65 +0,0 @@
-package com.mogo.och.bus.passenger.network
-
-import android.content.Context
-import com.mogo.eagle.core.function.call.telematic.CallerTelematicManager.getServerToken
-import com.mogo.och.bus.passenger.bean.BusPassengerRoutesResponse
-import com.mogo.cloud.passport.MoGoAiCloudClientConfig
-import com.mogo.och.bus.passenger.bean.BusPassengerQueryLineRequest
-import com.mogo.och.bus.passenger.bean.BusPassengerOperationStatusResponse
-import com.mogo.eagle.core.network.MoGoRetrofitFactory
-import com.mogo.och.bus.passenger.constant.URLConst.Companion.getBaseUrl
-import com.mogo.och.common.module.biz.network.OchCommonServiceCallback
-import com.mogo.och.common.module.biz.network.OchCommonSubscribeImpl
-import com.mogo.och.common.module.biz.network.interceptor.transformTry
-
-/**
- * Created on 2022/3/31
- */
-object BusPassengerServiceManager {
-
-    private var mBusPassengerServiceApi = MoGoRetrofitFactory.getInstance(getBaseUrl())
-        .create(PassengerServiceApi::class.java)
-
-    /**
-     * 获取Bus司机端的sn
-     * @return
-     */
-    private val driverAppSn: String
-        get() = getServerToken()
-    /**
-     * 查询绑定行驶的小巴车路线
-     * @param context
-     * @param callback
-     */
-    @JvmStatic
-    fun queryDriverSiteByCoordinate(
-        context: Context, callback: OchCommonServiceCallback<BusPassengerRoutesResponse>?
-    ) {
-        mBusPassengerServiceApi.queryDriverSiteByCoordinate(
-            MoGoAiCloudClientConfig.getInstance().serviceAppId,
-            MoGoAiCloudClientConfig.getInstance().token,
-            BusPassengerQueryLineRequest(
-                driverAppSn
-            )
-        )
-            .transformTry()
-            .subscribe(OchCommonSubscribeImpl(context, callback, "queryDriverSiteByCoordinate"))
-    }
-
-    /**
-     * 查询司机端出车收车状态，以及车牌号
-     * @param context
-     * @param callback
-     */
-    @JvmStatic
-    fun queryDriverOperationStatus(
-        context: Context,
-        callback: OchCommonServiceCallback<BusPassengerOperationStatusResponse>?) {
-        mBusPassengerServiceApi.queryDriverOperationStatus(
-            MoGoAiCloudClientConfig.getInstance().serviceAppId,
-            MoGoAiCloudClientConfig.getInstance().token,
-            driverAppSn)
-            .transformTry()
-            .subscribe(OchCommonSubscribeImpl(context, callback, "queryDriverOperationStatus"))
-    }
-}

OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/bean/BusPassengerQueryLineRequest.java

@@ -1,7 +1,5 @@
 package com.mogo.och.bus.passenger.bean;
 
-import com.mogo.cloud.passport.MoGoAiCloudClientConfig;
-
 public
 /**
  * @author congtaowang

OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/callback/IBusPassengerAutopilotPlanningCallback.java

@@ -1,7 +1,6 @@
 package com.mogo.och.bus.passenger.callback;
 
 import com.amap.api.maps.model.LatLng;
-import com.mogo.eagle.core.data.map.MogoLatLng;
 
 import java.util.List;
 

OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/callback/IBusPassengerRouteLineInfoCallback.java

@@ -10,7 +10,7 @@ import java.util.List;
  */
 public interface IBusPassengerRouteLineInfoCallback {
     void updateLineInfo(String lineName, String lineDurTime);
-    void updateStationsInfo(List<BusPassengerStation> stations,int currentStationIndex,boolean isArrived);
+    void updateStationsInfo(List<BusPassengerStation> stations, int currentStationIndex, boolean isArrived);
     void showNoTaskView();
     void hideNoTaskView();
 }

OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/constant/URLConst.kt

@@ -1,26 +1,42 @@
 package com.mogo.och.bus.passenger.constant
 
 import com.mogo.commons.debug.DebugConfig
+import com.mogo.eagle.core.data.config.FunctionBuildConfig
+import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils
 
 /**
  * Created on 2021/12/6
  */
 class URLConst {
     companion object {
+        // shettle 接驳车域名
+        private const val Shettle_BASE_URL_OCH_DEV = "https://och-driver-dev.zhidaozhixing.com"
+        private const val Shettle_BASE_URL_OCH_QA = "https://och-driver-qa.zhidaozhixing.com"
+        private const val Shettle_BASE_URL_OCH_RELEASE = "https://och-driver.zhidaozhixing.com"
 
         private const val BASE_URL_OCH_DEV = "http://tech-dev.zhidaohulian.com"
         private const val BASE_URL_OCH_QA = "https://tech-qa.zhidaohulian.com"
         private const val BASE_URL_OCH_RELEASE = "https://tech.zhidaohulian.com"
 
+
         @JvmStatic
         fun getBaseUrl(): String {
-            return when (DebugConfig.getNetMode()) {
-                DebugConfig.NET_MODE_DEV, DebugConfig.NET_MODE_DEMO -> BASE_URL_OCH_DEV
-                DebugConfig.NET_MODE_QA -> BASE_URL_OCH_QA
-                DebugConfig.NET_MODE_RELEASE -> BASE_URL_OCH_RELEASE
-                else -> BASE_URL_OCH_RELEASE
+            return if(AppIdentityModeUtils.isShuttle(FunctionBuildConfig.appIdentityMode)){
+                when (DebugConfig.getNetMode()) {
+                    DebugConfig.NET_MODE_DEV, DebugConfig.NET_MODE_DEMO -> Shettle_BASE_URL_OCH_DEV
+                    DebugConfig.NET_MODE_QA -> Shettle_BASE_URL_OCH_QA
+                    DebugConfig.NET_MODE_RELEASE -> Shettle_BASE_URL_OCH_RELEASE
+                    else -> Shettle_BASE_URL_OCH_RELEASE
+                }
+            }else{
+                when (DebugConfig.getNetMode()) {
+                    DebugConfig.NET_MODE_DEV, DebugConfig.NET_MODE_DEMO -> BASE_URL_OCH_DEV
+                    DebugConfig.NET_MODE_QA -> BASE_URL_OCH_QA
+                    DebugConfig.NET_MODE_RELEASE -> BASE_URL_OCH_RELEASE
+                    else -> BASE_URL_OCH_RELEASE
+                }
             }
-        }
 
+        }
     }
 }

OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/network/BusPassengerServiceManager.kt

@@ -0,0 +1,92 @@
+package com.mogo.och.bus.passenger.network
+
+import android.content.Context
+import com.mogo.eagle.core.function.call.telematic.CallerTelematicManager.getServerToken
+import com.mogo.och.bus.passenger.bean.BusPassengerRoutesResponse
+import com.mogo.cloud.passport.MoGoAiCloudClientConfig
+import com.mogo.eagle.core.data.config.FunctionBuildConfig
+import com.mogo.och.bus.passenger.bean.BusPassengerQueryLineRequest
+import com.mogo.och.bus.passenger.bean.BusPassengerOperationStatusResponse
+import com.mogo.eagle.core.network.MoGoRetrofitFactory
+import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils
+import com.mogo.och.bus.passenger.constant.URLConst.Companion.getBaseUrl
+import com.mogo.och.common.module.biz.network.OchCommonServiceCallback
+import com.mogo.och.common.module.biz.network.OchCommonSubscribeImpl
+import com.mogo.och.common.module.biz.network.interceptor.transformTry
+
+/**
+ * Created on 2022/3/31
+ */
+object BusPassengerServiceManager {
+
+    private var mShuttleBusPassengerServiceApi =
+        MoGoRetrofitFactory.getInstance(getBaseUrl()).create(ShettlePassengerServiceApi::class.java)
+    private var mBusPassengerServiceApi =
+        MoGoRetrofitFactory.getInstance(getBaseUrl()).create(PassengerServiceApi::class.java)
+
+    /**
+     * 获取Bus司机端的sn
+     * @return
+     */
+    private val driverAppSn: String
+        get() = getServerToken()
+
+    /**
+     * 查询绑定行驶的小巴车路线
+     * @param context
+     * @param callback
+     */
+    @JvmStatic
+    fun queryDriverSiteByCoordinate(
+        context: Context, callback: OchCommonServiceCallback<BusPassengerRoutesResponse>?
+    ) {
+        if (AppIdentityModeUtils.isShuttle(FunctionBuildConfig.appIdentityMode)) {
+            mShuttleBusPassengerServiceApi.queryDriverSiteByCoordinate(
+                MoGoAiCloudClientConfig.getInstance().serviceAppId,
+                MoGoAiCloudClientConfig.getInstance().token,
+                BusPassengerQueryLineRequest(
+                    driverAppSn
+                )
+            ).transformTry()
+                .subscribe(OchCommonSubscribeImpl(context, callback, "queryDriverSiteByCoordinate"))
+        } else {
+            mBusPassengerServiceApi.queryDriverSiteByCoordinate(
+                MoGoAiCloudClientConfig.getInstance().serviceAppId,
+                MoGoAiCloudClientConfig.getInstance().token,
+                BusPassengerQueryLineRequest(
+                    driverAppSn
+                )
+            ).transformTry()
+                .subscribe(OchCommonSubscribeImpl(context, callback, "queryDriverSiteByCoordinate"))
+        }
+    }
+
+    /**
+     * 查询司机端出车收车状态，以及车牌号
+     * @param context
+     * @param callback
+     */
+    @JvmStatic
+    fun queryDriverOperationStatus(
+        context: Context,
+        callback: OchCommonServiceCallback<BusPassengerOperationStatusResponse>?
+    ) {
+        if (AppIdentityModeUtils.isShuttle(FunctionBuildConfig.appIdentityMode)) {
+            mShuttleBusPassengerServiceApi.queryDriverOperationStatus(
+                MoGoAiCloudClientConfig.getInstance().serviceAppId,
+                MoGoAiCloudClientConfig.getInstance().token,
+                driverAppSn
+            )
+                .transformTry()
+                .subscribe(OchCommonSubscribeImpl(context, callback, "queryDriverOperationStatus"))
+        } else {
+            mBusPassengerServiceApi.queryDriverOperationStatus(
+                MoGoAiCloudClientConfig.getInstance().serviceAppId,
+                MoGoAiCloudClientConfig.getInstance().token,
+                driverAppSn
+            )
+                .transformTry()
+                .subscribe(OchCommonSubscribeImpl(context, callback, "queryDriverOperationStatus"))
+        }
+    }
+}

OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/network/ShettlePassengerServiceApi.java

@@ -17,7 +17,7 @@ import retrofit2.http.Query;
  *
  * Bus乘客端接口定义
  */
-interface PassengerServiceApi {
+interface ShettlePassengerServiceApi {
     /**
      * 查询bus司机端绑定路线
      * @return 接口返回数据

OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/presenter/BaseBusPassengerPresenter.java

@@ -8,7 +8,6 @@ import androidx.lifecycle.LifecycleOwner;
 import com.amap.api.maps.model.LatLng;
 import com.mogo.commons.AbsMogoApplication;
 import com.mogo.commons.mvp.Presenter;
-import com.mogo.eagle.core.data.map.MogoLocation;
 import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener;
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
 import com.mogo.eagle.core.utilcode.util.UiThreadHandler;
@@ -133,7 +132,7 @@ public class BaseBusPassengerPresenter extends Presenter<BusPassengerRouteFragme
     }
 
     @Override
-    public void updateStationsInfo(List<BusPassengerStation> stations,int currentStationIndex,boolean isArrived) {
+    public void updateStationsInfo(List<BusPassengerStation> stations, int currentStationIndex, boolean isArrived) {
         runOnUIThread(() -> mView.updateStationsInfo(stations,currentStationIndex, isArrived));
     }
 

OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPassengerBaseFragment.java

@@ -22,7 +22,6 @@ import com.mogo.eagle.core.utilcode.util.UiThreadHandler;
 import com.mogo.och.bus.passenger.R;
 import com.mogo.och.bus.passenger.constant.BusPassengerConst;
 import com.mogo.och.common.module.utils.NumberFormatUtil;
-import com.mogo.och.common.module.wigets.OCHBorderShadowLayout;
 
 /**
  * Created on 2022/3/31

OCH/mogo-och-bus-passenger/src/shuttle/java/com/mogo/och/bus/passenger/constant/URLConst.kt

@@ -1,25 +0,0 @@
-package com.mogo.och.bus.passenger.constant
-
-import com.mogo.commons.debug.DebugConfig
-
-/**
- * Created on 2021/12/6
- */
-class URLConst {
-    companion object {
-
-        private const val BASE_URL_OCH_DEV = "https://och-driver-dev.zhidaozhixing.com"
-        private const val BASE_URL_OCH_QA = "https://och-driver-qa.zhidaozhixing.com"
-        private const val BASE_URL_OCH_RELEASE = "https://och-driver.zhidaozhixing.com"
-
-        @JvmStatic
-        fun getBaseUrl(): String {
-            return when (DebugConfig.getNetMode()) {
-                DebugConfig.NET_MODE_DEV, DebugConfig.NET_MODE_DEMO -> BASE_URL_OCH_DEV
-                DebugConfig.NET_MODE_QA -> BASE_URL_OCH_QA
-                DebugConfig.NET_MODE_RELEASE -> BASE_URL_OCH_RELEASE
-                else -> BASE_URL_OCH_RELEASE
-            }
-        }
-    }
-}

OCH/mogo-och-bus/build.gradle

@@ -40,17 +40,18 @@ android {
     }
 
 
-    flavorDimensions "pattern"
+    flavorDimensions "vehicle"
     productFlavors {
 
         jinlvvan {
-            dimension "pattern"
+            dimension "vehicle"
             buildConfigField 'int', 'NEW_TEST', '0'
         }
 
-        // 接驳车
+        // 小巴车 接驳车  这个维度应该放入的最外层 但是和小巴的代码耦合的太严重放到了这个地方
+        // 乘客端删除了这个flavors 是因为乘客端这个地方比较简单
         shuttle {
-            dimension "pattern"
+            dimension "vehicle"
             buildConfigField 'int', 'NEW_TEST', '1'
         }
     }

app/build.gradle

@@ -196,8 +196,8 @@ android {
     }
     // 项目 business
     // 业务线 product
-    // 车型 pattern
-    flavorDimensions "project","product","pattern" ,"basic", "env"
+    // 车型 vehicle
+    flavorDimensions "project","product","vehicle" ,"basic", "env"
     productFlavors {
         // launcher app
         launcher {
@@ -319,8 +319,6 @@ android {
                 } 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)
                 }
@@ -363,8 +361,6 @@ android {
                 } 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)
                 }

app/productFlavors/fMultiDisplayOchBus.gradle

@@ -13,7 +13,7 @@ project.android.productFlavors {
         versionName rootProject.versionName
         // 应用包名
         applicationId rootProject.ext.android.fLauncherApplicationId
-        dimension "pattern"
+        dimension "vehicle"
         // 和 och/mogo-och-bus-passenger 的flavors的m1对应
         matchingFallbacks = ['jinlvvan']
 

app/productFlavors/fMultiDisplayOchTaxi.gradle

@@ -13,7 +13,7 @@ project.android.productFlavors {
         versionName rootProject.versionName
         // 应用包名
         applicationId rootProject.ext.android.fLauncherApplicationId
-        dimension "pattern"
+        dimension "vehicle"
 
         // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0
         buildConfigField 'int', 'CAR_MACHINE_TYPE', '2'

app/productFlavors/fOchBus.gradle

@@ -13,7 +13,7 @@ project.android.productFlavors {
         versionName rootProject.versionName
         // 应用包名
         applicationId rootProject.ext.android.fLauncherApplicationId
-        dimension "pattern"
+        dimension "vehicle"
         matchingFallbacks = ['jinlvvan']
 
         // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0

app/productFlavors/fOchBusPassenger.gradle

@@ -11,7 +11,7 @@ project.android.productFlavors {
         targetSdkVersion rootProject.ext.android.targetSdkVersionPadLenovo
         // 应用包名
         applicationId rootProject.ext.android.fLauncherApplicationId
-        dimension "pattern"
+        dimension "vehicle"
         // 和 och/mogo-och-bus-passenger 的flavors的jinlvvan对应
         matchingFallbacks = ['jinlvvan']
 

app/productFlavors/fOchBusPassengerM1.gradle

@@ -11,7 +11,7 @@ project.android.productFlavors {
         targetSdkVersion rootProject.ext.android.targetSdkVersionPadLenovo
         // 应用包名
         applicationId rootProject.ext.android.fLauncherApplicationId
-        dimension "pattern"
+        dimension "vehicle"
         // 和 och/mogo-och-bus-passenger 的flavors的m1对应
         matchingFallbacks = ['m1']
 

app/productFlavors/fOchBusPassengerM2.gradle

@@ -11,7 +11,7 @@ project.android.productFlavors {
         targetSdkVersion rootProject.ext.android.targetSdkVersionPadLenovo
         // 应用包名
         applicationId rootProject.ext.android.fLauncherApplicationId
-        dimension "pattern"
+        dimension "vehicle"
         // 和 och/mogo-och-bus-passenger 的flavors的m2对应
         matchingFallbacks = ['m2']
 

app/productFlavors/fOchShuttle.gradle

@@ -13,7 +13,7 @@ project.android.productFlavors {
         versionName rootProject.versionName
         // 应用包名
         applicationId rootProject.ext.android.fLauncherApplicationId
-        dimension "pattern"
+        dimension "vehicle"
         // 和 och/mogo-och-bus-passenger 的flavors的shuttle对应
         matchingFallbacks = ['shuttle']
 

app/productFlavors/fOchShuttlePassenger.gradle

@@ -11,8 +11,8 @@ project.android.productFlavors {
         targetSdkVersion rootProject.ext.android.targetSdkVersionPadLenovo
         // 应用包名
         applicationId rootProject.ext.android.fLauncherApplicationId
-        dimension "pattern"
-        matchingFallbacks = ['shuttle']
+        dimension "vehicle"
+        matchingFallbacks = ['jinlvvan']
 
         // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0
         buildConfigField 'int', 'CAR_MACHINE_TYPE', '2'

app/productFlavors/fOchSweeper.gradle

@@ -13,7 +13,7 @@ project.android.productFlavors {
         versionName rootProject.versionName
         // 应用包名
         applicationId rootProject.ext.android.fLauncherApplicationId
-        dimension "pattern"
+        dimension "vehicle"
 
         // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0
         buildConfigField 'int', 'CAR_MACHINE_TYPE', '2'

app/productFlavors/fOchTaxi.gradle

@@ -14,7 +14,7 @@ project.android.productFlavors {
         versionName rootProject.versionName
         // 应用包名
         applicationId rootProject.ext.android.fLauncherApplicationId
-        dimension "pattern"
+        dimension "vehicle"
 
         // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0
         buildConfigField 'int', 'CAR_MACHINE_TYPE', '2'

app/productFlavors/fOchTaxiPassenger.gradle

@@ -13,7 +13,7 @@ project.android.productFlavors {
         versionName rootProject.versionName
         // 应用包名
         applicationId rootProject.ext.android.fLauncherApplicationId
-        dimension "pattern"
+        dimension "vehicle"
 
         // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0
         buildConfigField 'int', 'CAR_MACHINE_TYPE', '2'

app/productFlavors/fPadLenovo.gradle

@@ -11,7 +11,7 @@ project.android.productFlavors {
         targetSdkVersion rootProject.ext.android.targetSdkVersionPadLenovo
         // 应用包名
         applicationId rootProject.ext.android.fLauncherApplicationId
-        dimension "pattern"
+        dimension "vehicle"
 
         // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0
         buildConfigField 'int', 'CAR_MACHINE_TYPE', '2'