[2.13.2]

[feature]
[接驳车和base添加重用代码basecommon文件夹]

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

@@ -63,6 +63,24 @@ android {
             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',
+            ]
+        }
+    }
 }
 
 dependencies {

OCH/mogo-och-bus-passenger/src/base/java/com/mogo/och/bus/passenger/network/BusPassengerServiceApi.java

@@ -1,40 +0,0 @@
-package com.mogo.och.bus.passenger.network;
-
-import com.mogo.och.bus.passenger.bean.BusPassengerOperationStatusResponse;
-import com.mogo.och.bus.passenger.bean.BusPassengerQueryLineRequest;
-import com.mogo.och.bus.passenger.bean.BusPassengerRoutesResponse;
-
-import io.reactivex.Observable;
-import retrofit2.http.Body;
-import retrofit2.http.GET;
-import retrofit2.http.Header;
-import retrofit2.http.Headers;
-import retrofit2.http.POST;
-import retrofit2.http.Query;
-
-/**
- * Created on 2022/3/31
- *
- * Bus乘客端接口定义
- */
-interface BusPassengerServiceApi {
-    /**
-     * 查询bus司机端绑定路线
-     * @return 接口返回数据
-     */
-    @Headers( {"Content-Type:application/json;charset=UTF-8"} )
-    @POST( "/autopilot-car-hailing/line/v2/driver/bus/passenger/lineDataWithDriver/query" )
-    Observable<BusPassengerRoutesResponse> queryDriverSiteByCoordinate(@Header("appId") String appId, @Header("ticket") String ticket, @Body BusPassengerQueryLineRequest request);
-
-    /**
-     * 查询司机端的登陆状态
-     * @param sn
-     * @return
-     */
-    @Headers({"Content-type:application/json;charset=UTF-8"})
-//    @GET("/autopilot-car-hailing/car/v2/driver/bus/passenger/takeOrderStatus/query")
-    @GET("/autopilot-car-hailing/operation/v1/driver/bus/passenger/loginStatus")
-    Observable<BusPassengerOperationStatusResponse> queryDriverOperationStatus(@Header ("appId") String appId, @Header("ticket") String ticket, @Query("sn") String sn);
-
-
-}

OCH/mogo-och-bus/build.gradle

@@ -43,7 +43,7 @@ android {
     flavorDimensions "product"
     productFlavors {
 
-        basc {
+        base {
             dimension "product"
             buildConfigField 'int', 'NEW_TEST', '0'
         }

app/build.gradle

@@ -295,6 +295,8 @@ android {
             }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)
             }

app/productFlavors/fPadLenovoOchBus.gradle

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

app/productFlavors/fPadLenovoOchBusShuttle.gradle

@@ -30,7 +30,7 @@ project.android.productFlavors {
         buildConfigField 'int', 'GPS_PROVIDER', "1"
 
         // 构建的应用身份类型，具体查看  README.md APP_IDENTITY_MODE规则
-        buildConfigField 'String', 'APP_IDENTITY_MODE', "\"Bus_Shuttle\""
+        buildConfigField 'String', 'APP_IDENTITY_MODE', "\"Bus_Driver_Shuttle\""
         // 连接的工控机IP地址
         buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.8.103\""
         // 构建的是否是演示（美化）模式

app/productFlavors/fPadLenovoOchBusShuttlePassenger.gradle

@@ -28,7 +28,7 @@ project.android.productFlavors {
         buildConfigField 'int', 'GPS_PROVIDER', "1"
 
         // 构建的应用身份类型，具体查看  README.md APP_IDENTITY_MODE规则
-        buildConfigField 'String', 'APP_IDENTITY_MODE', "\"Bus_Shuttle_Passenger\""
+        buildConfigField 'String', 'APP_IDENTITY_MODE', "\"Bus_Passenger_Shuttle\""
         // 连接的工控机IP地址
         buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.8.103\""
         // 构建的是否是演示（美化）模式