Merge branch 'dev_robobus-d_230707_3.3.2' into 'master'

Dev robobus d 230707 3.3.2 See merge request SCA/L4HA/AndroidApp/MoGoEagleEye!807
2023-07-17 10:19:25 +00:00
parent c1e453c92a 97546ddb02
commit cc434b7d42
21 changed files with 706 additions and 236 deletions
--- a/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/network/BusPassengerServiceManager.kt
+++ b/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/network/BusPassengerServiceManager.kt
@@ -4,6 +4,7 @@ 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.commons.debug.DebugConfig
 import com.mogo.och.bus.passenger.bean.BusPassengerQueryLineRequest
 import com.mogo.och.bus.passenger.bean.BusPassengerOperationStatusResponse
 import com.mogo.eagle.core.network.MoGoRetrofitFactory
@@ -19,6 +20,9 @@ object BusPassengerServiceManager {

    private var driverSnCache = ""

+    private var mBusPassengerSaasServiceApi =
+        MoGoRetrofitFactory.getInstance(OchCommonConst.getBaseUrl()).create(PassengerSAASServiceApi::class.java)
+
    private var mBusPassengerServiceApi =
        MoGoRetrofitFactory.getInstance(OchCommonConst.getBaseUrl()).create(PassengerServiceApi::class.java)

@@ -44,14 +48,23 @@ object BusPassengerServiceManager {
    fun queryDriverSiteByCoordinate(
        context: Context, callback: OchCommonServiceCallback<BusPassengerRoutesResponse>?
    ) {
-        mBusPassengerServiceApi.queryDriverSiteByCoordinate(
-            MoGoAiCloudClientConfig.getInstance().serviceAppId,
-            MoGoAiCloudClientConfig.getInstance().token,
-            BusPassengerQueryLineRequest(
+        if (DebugConfig.getProjectFlavor().contains("saas")){
+            mBusPassengerSaasServiceApi.queryDriverSiteByCoordinate(
+                MoGoAiCloudClientConfig.getInstance().serviceAppId,
+                MoGoAiCloudClientConfig.getInstance().token,
                driverAppSn
-            )
-        ).transformTry()
-            .subscribe(OchCommonSubscribeImpl(context, callback, "queryDriverSiteByCoordinate"))
+            ).transformTry()
+                .subscribe(OchCommonSubscribeImpl(context, callback, "queryDriverSiteByCoordinate"))
+        }else{
+            mBusPassengerServiceApi.queryDriverSiteByCoordinate(
+                MoGoAiCloudClientConfig.getInstance().serviceAppId,
+                MoGoAiCloudClientConfig.getInstance().token,
+                BusPassengerQueryLineRequest(
+                    driverAppSn
+                )
+            ).transformTry()
+                .subscribe(OchCommonSubscribeImpl(context, callback, "queryDriverSiteByCoordinate"))
+        }
    }

    /**
@@ -64,12 +77,23 @@ object BusPassengerServiceManager {
        context: Context,
        callback: OchCommonServiceCallback<BusPassengerOperationStatusResponse>?
    ) {
-        mBusPassengerServiceApi.queryDriverOperationStatus(
-            MoGoAiCloudClientConfig.getInstance().serviceAppId,
-            MoGoAiCloudClientConfig.getInstance().token,
-            driverAppSn
-        )
-            .transformTry()
-            .subscribe(OchCommonSubscribeImpl(context, callback, "queryDriverOperationStatus"))
+
+        if (DebugConfig.getProjectFlavor().contains("saas")){
+            mBusPassengerSaasServiceApi.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"))
+        }
    }
 }
--- a/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/network/PassengerSAASServiceApi.java
+++ b/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/network/PassengerSAASServiceApi.java
@@ -0,0 +1,41 @@
+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 PassengerSAASServiceApi {
+    /**
+     * 查询bus司机端绑定路线
+     * @return 接口返回数据
+     */
+    @Headers( {"Content-Type:application/json;charset=UTF-8"} )
+//    @POST( "/autopilot-car-hailing/line/v2/driver/bus/passenger/lineDataWithDriver/query" )
+    @GET( "/och-bus-cabin/api/business/v1/driver/bus/lineDataWithDriver/query" )
+    Observable<BusPassengerRoutesResponse> queryDriverSiteByCoordinate(@Header("appId") String appId, @Header("ticket") String ticket, @Query("sn") String sn);
+
+    /**
+     * 查询司机端的登陆状态
+     * @param sn
+     * @return
+     */
+    @Headers({"Content-type:application/json;charset=UTF-8"})
+//    @GET("/autopilot-car-hailing/operation/v1/driver/bus/passenger/loginStatus")
+    @GET("/och-bus-cabin/api/business/v1/loginStatus")
+    Observable<BusPassengerOperationStatusResponse> queryDriverOperationStatus(@Header ("appId") String appId, @Header("ticket") String ticket, @Query("sn") String sn);
+
+
+}
--- a/OCH/mogo-och-bus/src/jinlvvan/java/com/mogo/och/bus/net/ISAASApiService.java
+++ b/OCH/mogo-och-bus/src/jinlvvan/java/com/mogo/och/bus/net/ISAASApiService.java
@@ -0,0 +1,165 @@
+package com.mogo.och.bus.net;
+
+import com.mogo.eagle.core.data.BaseData;
+import com.mogo.och.bus.bean.BusCloseTaskRequest;
+import com.mogo.och.bus.bean.BusOrdersResponse;
+import com.mogo.och.bus.bean.BusQueryLineStationsRequest;
+import com.mogo.och.bus.bean.BusQueryLineTaskResponse;
+import com.mogo.och.bus.bean.BusQueryLinesResponse;
+import com.mogo.och.bus.bean.BusQueryWriteOffPassengersResponse;
+import com.mogo.och.bus.bean.BusResetDrivingLineRequest;
+import com.mogo.och.bus.bean.BusRoutePlanningUpdateReqBean;
+import com.mogo.och.bus.bean.BusRoutesResponse;
+import com.mogo.och.bus.bean.BusUpdateSiteStatusRequest;
+import com.mogo.och.bus.bean.BusWriteOffPassengersQueryRequest;
+import com.mogo.och.bus.bean.CarHeartbeatReqBean;
+import com.mogo.och.bus.bean.QueryLeaveAwayPassengersRequest;
+import com.mogo.och.bus.bean.QueryLeaveAwayPassengersResponse;
+
+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;
+
+/**
+ * 小巴车相关接口
+ *
+ * @author tongchenfei
+ * <p>
+ * wiki: http://wiki.zhidaohulian.com/pages/viewpage.action?pageId=48970072
+ */
+public interface ISAASApiService {
+    /**
+     * 根据车机坐标获取所在区域全部站点信息
+     *
+     * @param request 请求参数
+     * @return 接口返回数据
+     */
+    @Headers( {"Content-Type:application/json;charset=UTF-8"} )
+//    @POST( "/autopilot-car-hailing/line/v2/driver/bus/lineDataWithDriver/query" )
+    @GET( "/och-bus-cabin/api/business/v1/driver/bus/lineDataWithDriver/query" )
+    Observable<BusRoutesResponse> queryBusRoutes(@Header ("appId") String appId, @Header("ticket") String ticket, @Query("sn") String sn);
+
+    /**
+     * @param request 请求参数{"destLine":1,"sn":"F803EB2046PZD00229"} 这个接口是重置bus线路的， 不是重置线路中站点的
+     * @return 返回值是重置后的车站列表
+     * 开始路线
+     */
+    @Headers( {"Content-Type:application/json;charset=UTF-8"} )
+//    @POST( "/autopilot-car-hailing/cab/flow/v1/bus/driver/bus/startTask" )
+    @POST( "/och-bus-cabin/cab/flow/v1/bus/driver/startTask" )
+    Observable<BusRoutesResponse> switchLine(@Header ("appId") String appId, @Header("ticket") String ticket, @Body BusResetDrivingLineRequest request);
+
+    /**
+     * 离站，通知服务器
+     * @param request
+     * @return
+     */
+    @Headers({"Content-Type:application/json;charset=UTF-8"})
+//    @POST("/autopilot-car-hailing/cab/flow/v1/bus/driver/bus/leave")
+    @POST("/och-bus-cabin/cab/flow/v1/bus/driver/leave")
+    Observable<BaseData> leaveStation(@Header ("appId") String appId, @Header("ticket") String ticket, @Body BusUpdateSiteStatusRequest request);
+
+    /**
+     * 到站 更新到站信息
+     * @param request
+     * @return
+     */
+    @Headers({"Content-type:application/json;charset=UTF-8"})
+//    @POST("/autopilot-car-hailing/cab/flow/v1/bus/driver/bus/arrive")
+    @POST("/och-bus-cabin/cab/flow/v1/bus/driver/arrive")
+    Observable< BaseData > arriveSiteStation(@Header ("appId") String appId,@Header("ticket") String ticket,@Body BusUpdateSiteStatusRequest request);
+
+
+    /**
+     * 到站查询下车乘客
+     * @param request
+     * @return
+     */
+    @Headers({"Content-type:application/json;charset=UTF-8"})
+//    @POST("/autopilot-car-hailing/order/v2/driver/bus/driving/siteArrivedOrders")
+    @POST("/och-bus-cabin/api/business/v1/siteArrivedOrders")
+    Observable< QueryLeaveAwayPassengersResponse > queryStationLeaveAwayPassengers(@Header ("appId") String appId,@Header("ticket") String ticket,@Body QueryLeaveAwayPassengersRequest request);
+
+    @Headers({"Content-type:application/json;charset=UTF-8"})
+//    @GET("/autopilot-car-hailing/order/v2/driver/bus/servicingOrders/query")
+    @GET("/och-bus-cabin/api/business/v1/servicingOrders/query")
+    Observable<BusOrdersResponse> queryBusOrders(@Header ("appId") String appId, @Header("ticket") String ticket, @Query("sn") String sn);
+
+    /**
+     * 车机端上传心跳数据（只在出车状态时上传）：包含高德坐标系经纬度
+     * @param data
+     * @return
+     */
+    @Headers( {"Content-type:application/json;charset=UTF-8"} )
+    @POST( "/autopilot-car-hailing/location/v2/driver/bus/heartbeat" )
+    Observable<BaseData> runCarHeartbeat(@Header ("appId") String appId,@Header("ticket") String ticket,@Body CarHeartbeatReqBean data);
+
+    /**
+     * 查询车辆配置的所有路线
+     * @param appId
+     * @param ticket
+     * @param sn
+     * @return
+     */
+    @Headers( {"Content-type:application/json;charset=UTF-8"} )
+    //    @GET("/autopilot-car-hailing/line/v2/driver/bus/bindLine/query")
+    @GET("/och-bus-cabin/api/business/v1/driver/BusBindLine")
+    Observable<BusQueryLinesResponse> queryBusLines(@Header ("appId") String appId, @Header("ticket") String ticket, @Query("sn") String sn);
+
+    /**
+     * 查询路线当天的任务
+     * @param appId
+     * @param ticket
+     * @param lineId 线路id
+     * @return
+     */
+    @Headers( {"Content-type:application/json;charset=UTF-8"} )
+    //    @GET("/autopilot-car-hailing/line/v2/driver/bus/task/query")
+    @GET("/och-bus-cabin/api/business/v1/driver/bus/task/query")
+    Observable<BusQueryLineTaskResponse> queryBusTaskByLineId(@Header ("appId") String appId, @Header("ticket") String ticket, @Query("lineId") String lineId);
+
+
+    @Headers( {"Content-type:application/json;charset=UTF-8"} )
+    @POST( "/autopilot-car-hailing/location/v2/driver/bus/saveLineCoordinate" )
+    Observable<BaseData> updateOrderRoute(@Header ("appId") String appId, @Header("ticket") String ticket, @Body BusRoutePlanningUpdateReqBean data);
+
+    /**
+     * 中止任务
+     * @param appId
+     * @param ticket
+     * @param data
+     * @return
+     */
+    @Headers( {"Content-type:application/json;charset=UTF-8"} )
+    //    @POST("/autopilot-car-hailing/cab/flow/v1/bus/driver/bus/abortTask")
+    @POST("/och-bus-cabin/cab/flow/v1/bus/driver/abortTask")
+    Observable<BaseData> abortTask(@Header ("appId") String appId, @Header("ticket") String ticket, @Body BusCloseTaskRequest data);
+
+    /**
+     * 任务正常跑完结束
+     * @param appId
+     * @param ticket
+     * @param data
+     * @return
+     */
+    @Headers( {"Content-type:application/json;charset=UTF-8"} )
+//    @POST("/autopilot-car-hailing/cab/flow/v1/bus/driver/bus/endTask")
+    @POST("/och-bus-cabin/cab/flow/v1/bus/driver/endTask")
+    Observable<BaseData> endTask(@Header ("appId") String appId, @Header("ticket") String ticket, @Body BusCloseTaskRequest data);
+
+    /**
+     * 查询核销乘客，目前不再使用，改为后台下发核销的乘客
+     * @param appId
+     * @param ticket
+     * @param data
+     * @return
+     */
+    @Headers( {"Content-type:application/json;charset=UTF-8"} )
+    @POST("/autopilot-car-hailing/operation/v1/driver/order/verificationResult")
+    Observable<BusQueryWriteOffPassengersResponse> queryWriteOffPassengers(@Header ("appId") String appId, @Header("ticket") String ticket, @Body BusWriteOffPassengersQueryRequest data);
+}
+
--- a/OCH/mogo-och-bus/src/jinlvvan/java/com/mogo/och/bus/net/OrderServiceManager.kt
+++ b/OCH/mogo-och-bus/src/jinlvvan/java/com/mogo/och/bus/net/OrderServiceManager.kt
@@ -2,6 +2,7 @@ package com.mogo.och.bus.net

 import android.content.Context
 import com.mogo.cloud.passport.MoGoAiCloudClientConfig
+import com.mogo.commons.debug.DebugConfig
 import com.mogo.eagle.core.data.BaseData
 import com.mogo.eagle.core.network.MoGoRetrofitFactory
 import com.mogo.och.bus.bean.*
@@ -20,6 +21,10 @@ object OrderServiceManager {
        IBascApiService::class.java
    )

+    private val M_SAAS_SERVICE: ISAASApiService = MoGoRetrofitFactory.getInstance(OchCommonConst.getBaseUrl()).create(
+        ISAASApiService::class.java
+    )
+
    /**
     * 查询小巴车当前任务
     * @param context
@@ -28,13 +33,25 @@ object OrderServiceManager {
    @JvmStatic
    fun queryBusRoutes(context: Context, callback: OchCommonServiceCallback<BusRoutesResponse>?) {
        //获取当前高德坐标
-        M_SERVICE.queryBusRoutes(
-            MoGoAiCloudClientConfig.getInstance().serviceAppId,
-            MoGoAiCloudClientConfig.getInstance().token,
-            BusQueryLineStationsRequest()
-        )
-            .transformTry()
-            .subscribe(OchCommonSubscribeImpl(context, callback, "queryBusRoutes"))
+        if (DebugConfig.getProjectFlavor().contains("saas")){
+            M_SAAS_SERVICE.queryBusRoutes(
+                MoGoAiCloudClientConfig.getInstance().serviceAppId,
+                MoGoAiCloudClientConfig.getInstance().token,
+                MoGoAiCloudClientConfig.getInstance().sn
+            )
+                .transformTry()
+                .subscribe(OchCommonSubscribeImpl(context, callback, "queryBusRoutes"))
+
+        }else{
+            M_SERVICE.queryBusRoutes(
+                MoGoAiCloudClientConfig.getInstance().serviceAppId,
+                MoGoAiCloudClientConfig.getInstance().token,
+                BusQueryLineStationsRequest()
+            )
+                .transformTry()
+                .subscribe(OchCommonSubscribeImpl(context, callback, "queryBusRoutes"))
+        }
+
    }

    /**
@@ -49,13 +66,24 @@ object OrderServiceManager {
        taskId: Int,
        callback: OchCommonServiceCallback<BusRoutesResponse>?
    ) {
-        M_SERVICE.switchLine(
-            MoGoAiCloudClientConfig.getInstance().serviceAppId,
-            MoGoAiCloudClientConfig.getInstance().token,
-            BusResetDrivingLineRequest(taskId)
-        )
-            .transformTry()
-            .subscribe(OchCommonSubscribeImpl(context, callback, "switchLine"))
+
+        if (DebugConfig.getProjectFlavor().contains("saas")){
+            M_SAAS_SERVICE.switchLine(
+                MoGoAiCloudClientConfig.getInstance().serviceAppId,
+                MoGoAiCloudClientConfig.getInstance().token,
+                BusResetDrivingLineRequest(taskId)
+            )
+                .transformTry()
+                .subscribe(OchCommonSubscribeImpl(context, callback, "switchLine"))
+        }else{
+            M_SERVICE.switchLine(
+                MoGoAiCloudClientConfig.getInstance().serviceAppId,
+                MoGoAiCloudClientConfig.getInstance().token,
+                BusResetDrivingLineRequest(taskId)
+            )
+                .transformTry()
+                .subscribe(OchCommonSubscribeImpl(context, callback, "switchLine"))
+        }
    }

    /**
@@ -66,13 +94,24 @@ object OrderServiceManager {
     */
    @JvmStatic
    fun abortTask(context: Context, taskId: Int, callback: OchCommonServiceCallback<BaseData>?) {
-        M_SERVICE.abortTask(
-            MoGoAiCloudClientConfig.getInstance().serviceAppId,
-            MoGoAiCloudClientConfig.getInstance().token,
-            BusCloseTaskRequest(taskId)
-        )
-            .transformTry()
-            .subscribe(OchCommonSubscribeImpl(context, callback, "abortTask"))
+
+        if (DebugConfig.getProjectFlavor().contains("saas")){
+            M_SAAS_SERVICE.abortTask(
+                MoGoAiCloudClientConfig.getInstance().serviceAppId,
+                MoGoAiCloudClientConfig.getInstance().token,
+                BusCloseTaskRequest(taskId)
+            )
+                .transformTry()
+                .subscribe(OchCommonSubscribeImpl(context, callback, "abortTask"))
+        }else{
+            M_SERVICE.abortTask(
+                MoGoAiCloudClientConfig.getInstance().serviceAppId,
+                MoGoAiCloudClientConfig.getInstance().token,
+                BusCloseTaskRequest(taskId)
+            )
+                .transformTry()
+                .subscribe(OchCommonSubscribeImpl(context, callback, "abortTask"))
+        }
    }

    /**
@@ -83,13 +122,24 @@ object OrderServiceManager {
     */
    @JvmStatic
    fun endTask(context: Context, taskId: Int, callback: OchCommonServiceCallback<BaseData>?) {
-        M_SERVICE.endTask(
-            MoGoAiCloudClientConfig.getInstance().serviceAppId,
-            MoGoAiCloudClientConfig.getInstance().token,
-            BusCloseTaskRequest(taskId)
-        )
-            .transformTry()
-            .subscribe(OchCommonSubscribeImpl(context, callback, "endTask"))
+        if (DebugConfig.getProjectFlavor().contains("saas")){
+            M_SAAS_SERVICE.endTask(
+                MoGoAiCloudClientConfig.getInstance().serviceAppId,
+                MoGoAiCloudClientConfig.getInstance().token,
+                BusCloseTaskRequest(taskId)
+            )
+                .transformTry()
+                .subscribe(OchCommonSubscribeImpl(context, callback, "endTask"))
+        }else{
+            M_SERVICE.endTask(
+                MoGoAiCloudClientConfig.getInstance().serviceAppId,
+                MoGoAiCloudClientConfig.getInstance().token,
+                BusCloseTaskRequest(taskId)
+            )
+                .transformTry()
+                .subscribe(OchCommonSubscribeImpl(context, callback, "endTask"))
+        }
+
    }

    /**
@@ -107,13 +157,23 @@ object OrderServiceManager {
        taskId: Int,
        callback: OchCommonServiceCallback<BaseData>?
    ) {
-        M_SERVICE.leaveStation(
-            MoGoAiCloudClientConfig.getInstance().serviceAppId,
-            MoGoAiCloudClientConfig.getInstance().token,
-            BusUpdateSiteStatusRequest(taskId, siteId, seq)
-        )
-            .transformTry()
-            .subscribe(OchCommonSubscribeImpl(context, callback, "leaveStation"))
+        if (DebugConfig.getProjectFlavor().contains("saas")){
+            M_SAAS_SERVICE.leaveStation(
+                MoGoAiCloudClientConfig.getInstance().serviceAppId,
+                MoGoAiCloudClientConfig.getInstance().token,
+                BusUpdateSiteStatusRequest(taskId, siteId, seq)
+            )
+                .transformTry()
+                .subscribe(OchCommonSubscribeImpl(context, callback, "leaveStation"))
+        }else{
+            M_SERVICE.leaveStation(
+                MoGoAiCloudClientConfig.getInstance().serviceAppId,
+                MoGoAiCloudClientConfig.getInstance().token,
+                BusUpdateSiteStatusRequest(taskId, siteId, seq)
+            )
+                .transformTry()
+                .subscribe(OchCommonSubscribeImpl(context, callback, "leaveStation"))
+        }
    }

    /**
@@ -128,13 +188,23 @@ object OrderServiceManager {
        context: Context, seq: Int, siteId: Int, taskId: Int,
        callback: OchCommonServiceCallback<BaseData>?
    ) {
-        M_SERVICE.arriveSiteStation(
-            MoGoAiCloudClientConfig.getInstance().serviceAppId,
-            MoGoAiCloudClientConfig.getInstance().token,
-            BusUpdateSiteStatusRequest(taskId, siteId, seq)
-        )
-            .transformTry()
-            .subscribe(OchCommonSubscribeImpl(context, callback, "arriveSiteStation"))
+        if (DebugConfig.getProjectFlavor().contains("saas")){
+            M_SAAS_SERVICE.arriveSiteStation(
+                MoGoAiCloudClientConfig.getInstance().serviceAppId,
+                MoGoAiCloudClientConfig.getInstance().token,
+                BusUpdateSiteStatusRequest(taskId, siteId, seq)
+            )
+                .transformTry()
+                .subscribe(OchCommonSubscribeImpl(context, callback, "arriveSiteStation"))
+        }else{
+            M_SERVICE.arriveSiteStation(
+                MoGoAiCloudClientConfig.getInstance().serviceAppId,
+                MoGoAiCloudClientConfig.getInstance().token,
+                BusUpdateSiteStatusRequest(taskId, siteId, seq)
+            )
+                .transformTry()
+                .subscribe(OchCommonSubscribeImpl(context, callback, "arriveSiteStation"))
+        }
    }

    /**
@@ -190,23 +260,44 @@ object OrderServiceManager {
     */
    @JvmStatic
    fun queryBusOrders(context: Context, callback: OchCommonServiceCallback<BusOrdersResponse>?) {
-        M_SERVICE.queryBusOrders(
-            MoGoAiCloudClientConfig.getInstance().serviceAppId,
-            MoGoAiCloudClientConfig.getInstance().token,
-            MoGoAiCloudClientConfig.getInstance().sn
-        )
-            .transformTry()
-            .subscribe(OchCommonSubscribeImpl(context, callback, "queryBusOrders"))
+        if (DebugConfig.getProjectFlavor().contains("saas")){
+            M_SAAS_SERVICE.queryBusOrders(
+                MoGoAiCloudClientConfig.getInstance().serviceAppId,
+                MoGoAiCloudClientConfig.getInstance().token,
+                MoGoAiCloudClientConfig.getInstance().sn
+            )
+                .transformTry()
+                .subscribe(OchCommonSubscribeImpl(context, callback, "queryBusOrders"))
+        }else{
+            M_SERVICE.queryBusOrders(
+                MoGoAiCloudClientConfig.getInstance().serviceAppId,
+                MoGoAiCloudClientConfig.getInstance().token,
+                MoGoAiCloudClientConfig.getInstance().sn
+            )
+                .transformTry()
+                .subscribe(OchCommonSubscribeImpl(context, callback, "queryBusOrders"))
+        }
    }
    @JvmStatic
    fun queryBusLines(context: Context, callback: OchCommonServiceCallback<BusQueryLinesResponse>?) {
-        M_SERVICE.queryBusLines(
-            MoGoAiCloudClientConfig.getInstance().serviceAppId,
-            MoGoAiCloudClientConfig.getInstance().token,
-            MoGoAiCloudClientConfig.getInstance().sn
-        )
-            .transformTry()
-            .subscribe(OchCommonSubscribeImpl(context, callback, "queryBusLines"))
+        if (DebugConfig.getProjectFlavor().contains("saas")){
+            M_SAAS_SERVICE.queryBusLines(
+                MoGoAiCloudClientConfig.getInstance().serviceAppId,
+                MoGoAiCloudClientConfig.getInstance().token,
+                MoGoAiCloudClientConfig.getInstance().sn
+            )
+                .transformTry()
+                .subscribe(OchCommonSubscribeImpl(context, callback, "queryBusLines"))
+        }else{
+            M_SERVICE.queryBusLines(
+                MoGoAiCloudClientConfig.getInstance().serviceAppId,
+                MoGoAiCloudClientConfig.getInstance().token,
+                MoGoAiCloudClientConfig.getInstance().sn
+            )
+                .transformTry()
+                .subscribe(OchCommonSubscribeImpl(context, callback, "queryBusLines"))
+        }
+
    }
    @JvmStatic
    fun queryBusTaskByLineId(
@@ -214,13 +305,23 @@ object OrderServiceManager {
        lineId: String?,
        callback: OchCommonServiceCallback<BusQueryLineTaskResponse>?
    ) {
-        M_SERVICE.queryBusTaskByLineId(
-            MoGoAiCloudClientConfig.getInstance().serviceAppId,
-            MoGoAiCloudClientConfig.getInstance().token,
-            lineId
-        )
-            .transformTry()
-            .subscribe(OchCommonSubscribeImpl(context, callback, "queryBusLines"))
+        if (DebugConfig.getProjectFlavor().contains("saas")){
+            M_SAAS_SERVICE.queryBusTaskByLineId(
+                MoGoAiCloudClientConfig.getInstance().serviceAppId,
+                MoGoAiCloudClientConfig.getInstance().token,
+                lineId
+            )
+                .transformTry()
+                .subscribe(OchCommonSubscribeImpl(context, callback, "queryBusLines"))
+        }else{
+            M_SERVICE.queryBusTaskByLineId(
+                MoGoAiCloudClientConfig.getInstance().serviceAppId,
+                MoGoAiCloudClientConfig.getInstance().token,
+                lineId
+            )
+                .transformTry()
+                .subscribe(OchCommonSubscribeImpl(context, callback, "queryBusLines"))
+        }
    }
    @JvmStatic
    fun updateOrderRoute(
@@ -231,15 +332,27 @@ object OrderServiceManager {
        points: List<BusRoutePlanningUpdateReqBean.Result?>?,
        callback: OchCommonServiceCallback<BaseData>?
    ) {
-        M_SERVICE.updateOrderRoute(
-            MoGoAiCloudClientConfig.getInstance().serviceAppId,
-            MoGoAiCloudClientConfig.getInstance().token,
-            BusRoutePlanningUpdateReqBean(
-                MoGoAiCloudClientConfig.getInstance().sn, lineId, startSiteId, endSiteId, points
+        if (DebugConfig.getProjectFlavor().contains("saas")){
+            M_SAAS_SERVICE.updateOrderRoute(
+                MoGoAiCloudClientConfig.getInstance().serviceAppId,
+                MoGoAiCloudClientConfig.getInstance().token,
+                BusRoutePlanningUpdateReqBean(
+                    MoGoAiCloudClientConfig.getInstance().sn, lineId, startSiteId, endSiteId, points
+                )
            )
-        )
-            .transformTry()
-            .subscribe(OchCommonSubscribeImpl(context, callback, "updateOrderRoute"))
+                .transformTry()
+                .subscribe(OchCommonSubscribeImpl(context, callback, "updateOrderRoute"))
+        }else{
+            M_SERVICE.updateOrderRoute(
+                MoGoAiCloudClientConfig.getInstance().serviceAppId,
+                MoGoAiCloudClientConfig.getInstance().token,
+                BusRoutePlanningUpdateReqBean(
+                    MoGoAiCloudClientConfig.getInstance().sn, lineId, startSiteId, endSiteId, points
+                )
+            )
+                .transformTry()
+                .subscribe(OchCommonSubscribeImpl(context, callback, "updateOrderRoute"))
+        }
    }

    /**
@@ -254,15 +367,19 @@ object OrderServiceManager {
        context: Context, lon: Double, lat: Double,
        callback: OchCommonServiceCallback<BaseData>?
    ) {
-        M_SERVICE.runCarHeartbeat(
-            MoGoAiCloudClientConfig.getInstance().serviceAppId,
-            MoGoAiCloudClientConfig.getInstance().token,
-            CarHeartbeatReqBean(
-                MoGoAiCloudClientConfig.getInstance().sn, lon, lat
+        if (DebugConfig.getProjectFlavor().contains("saas")){
+
+        }else{
+            M_SERVICE.runCarHeartbeat(
+                MoGoAiCloudClientConfig.getInstance().serviceAppId,
+                MoGoAiCloudClientConfig.getInstance().token,
+                CarHeartbeatReqBean(
+                    MoGoAiCloudClientConfig.getInstance().sn, lon, lat
+                )
            )
-        )
-            .transformTry()
-            .subscribe(OchCommonSubscribeImpl(context, callback, "runCarHeartbeat"))
+                .transformTry()
+                .subscribe(OchCommonSubscribeImpl(context, callback, "runCarHeartbeat"))
+        }
    }

 }
--- a/OCH/mogo-och-bus/src/jinlvvan/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
@@ -9,6 +9,7 @@ import com.mogo.och.common.module.biz.bean.TaxiLogoutReqBean
 import com.mogo.och.common.module.biz.bean.DriverStatusQueryRespBean
 import com.mogo.och.common.module.biz.constant.OchCommonConst
 import com.mogo.cloud.passport.MoGoAiCloudClient
+import com.mogo.commons.debug.DebugConfig
 import com.mogo.eagle.core.data.BaseData
 import com.mogo.eagle.core.network.MoGoRetrofitFactory
 import com.mogo.och.common.module.biz.network.OchCommonServiceCallback
@@ -27,6 +28,11 @@ object OchCommonServiceManager {
            OchLoginServiceApi::class.java
        )

+    private val mLoginSaasServiceApi: OchSAASLoginServiceApi =
+        MoGoRetrofitFactory.getInstance(OchCommonConst.getBaseUrl()).create(
+            OchSAASLoginServiceApi::class.java
+        )
+
    /**
     * 获取手机验证码
     * @param context
@@ -37,12 +43,21 @@ object OchCommonServiceManager {
        context: Context, phone: String?,
        callback: OchCommonServiceCallback<BaseData>?
    ) {
-        mLoginServiceApi.getPhoneCode(
-            MoGoAiCloudClientConfig.getInstance().serviceAppId,
-            MoGoAiCloudClientConfig.getInstance().token,
-            TaxiLoginSmsReqBean(phone)
-        ).transformTry()
-            .subscribe(OchCommonSubscribeImpl(context, callback, "getPhoneCode"))
+        if (DebugConfig.getProjectFlavor().contains("saas")){
+            mLoginSaasServiceApi.getPhoneCode(
+                MoGoAiCloudClientConfig.getInstance().serviceAppId,
+                MoGoAiCloudClientConfig.getInstance().token,
+                TaxiLoginSmsReqBean(phone)
+            ).transformTry()
+                .subscribe(OchCommonSubscribeImpl(context, callback, "getPhoneCode"))
+        }else{
+            mLoginServiceApi.getPhoneCode(
+                MoGoAiCloudClientConfig.getInstance().serviceAppId,
+                MoGoAiCloudClientConfig.getInstance().token,
+                TaxiLoginSmsReqBean(phone)
+            ).transformTry()
+                .subscribe(OchCommonSubscribeImpl(context, callback, "getPhoneCode"))
+        }
    }

    /**
@@ -57,11 +72,20 @@ object OchCommonServiceManager {
        callback: OchCommonServiceCallback<TaxiLoginRespBean>?
    ) {
        val sn = MoGoAiCloudClientConfig.getInstance().sn
-        mLoginServiceApi.gotoLoginBycode4Bus(
-            MoGoAiCloudClientConfig.getInstance().serviceAppId,
-            MoGoAiCloudClientConfig.getInstance().token,
-            TaxiLoginReqBean(phone, code, sn, location4Login)
-        ).transformTry().subscribe(OchCommonSubscribeImpl(context, callback, "gotoLoginBycode"))
+
+        if (DebugConfig.getProjectFlavor().contains("saas")){
+            mLoginSaasServiceApi.gotoLoginBycode4Bus(
+                MoGoAiCloudClientConfig.getInstance().serviceAppId,
+                MoGoAiCloudClientConfig.getInstance().token,
+                TaxiLoginReqBean(phone, code, sn, location4Login)
+            ).transformTry().subscribe(OchCommonSubscribeImpl(context, callback, "gotoLoginBycode"))
+        }else{
+            mLoginServiceApi.gotoLoginBycode4Bus(
+                MoGoAiCloudClientConfig.getInstance().serviceAppId,
+                MoGoAiCloudClientConfig.getInstance().token,
+                TaxiLoginReqBean(phone, code, sn, location4Login)
+            ).transformTry().subscribe(OchCommonSubscribeImpl(context, callback, "gotoLoginBycode"))
+        }
    }

    /**
@@ -73,11 +97,19 @@ object OchCommonServiceManager {
        location4Login: TaxiLogoutReqBean.Location4Login?,
        callback: OchCommonServiceCallback<BaseData>?
    ) {
-        mLoginServiceApi.logout4Bus(
-            MoGoAiCloudClientConfig.getInstance().serviceAppId,
-            MoGoAiCloudClientConfig.getInstance().token,
-            TaxiLogoutReqBean(MoGoAiCloudClientConfig.getInstance().sn, location4Login)
-        ).transformTry().subscribe(OchCommonSubscribeImpl(context, callback, "logout"))
+        if (DebugConfig.getProjectFlavor().contains("saas")){
+            mLoginSaasServiceApi.logout4Bus(
+                MoGoAiCloudClientConfig.getInstance().serviceAppId,
+                MoGoAiCloudClientConfig.getInstance().token,
+                TaxiLogoutReqBean(MoGoAiCloudClientConfig.getInstance().sn, location4Login)
+            ).transformTry().subscribe(OchCommonSubscribeImpl(context, callback, "logout"))
+        }else{
+            mLoginServiceApi.logout4Bus(
+                MoGoAiCloudClientConfig.getInstance().serviceAppId,
+                MoGoAiCloudClientConfig.getInstance().token,
+                TaxiLogoutReqBean(MoGoAiCloudClientConfig.getInstance().sn, location4Login)
+            ).transformTry().subscribe(OchCommonSubscribeImpl(context, callback, "logout"))
+        }
    }

    /**
@@ -96,12 +128,22 @@ object OchCommonServiceManager {
            MoGoAiCloudClient.getInstance().refreshToken()
            return
        }
-        mLoginServiceApi.queryDriverServiceStatusAndLoginStatus(
-            MoGoAiCloudClientConfig.getInstance().serviceAppId,
-            MoGoAiCloudClientConfig.getInstance().token,
-            MoGoAiCloudClientConfig.getInstance().sn
-        ).transformTry()
-            .subscribe(OchCommonSubscribeImpl(context, callback, "queryDriverServiceStatus"))
+        if (DebugConfig.getProjectFlavor().contains("saas")){
+            mLoginSaasServiceApi.queryDriverServiceStatusAndLoginStatus(
+                MoGoAiCloudClientConfig.getInstance().serviceAppId,
+                MoGoAiCloudClientConfig.getInstance().token,
+                MoGoAiCloudClientConfig.getInstance().sn
+            ).transformTry()
+                .subscribe(OchCommonSubscribeImpl(context, callback, "queryDriverServiceStatus"))
+        }else{
+            mLoginServiceApi.queryDriverServiceStatusAndLoginStatus(
+                MoGoAiCloudClientConfig.getInstance().serviceAppId,
+                MoGoAiCloudClientConfig.getInstance().token,
+                MoGoAiCloudClientConfig.getInstance().sn
+            ).transformTry()
+                .subscribe(OchCommonSubscribeImpl(context, callback, "queryDriverServiceStatus"))
+        }
+
    }

 }
--- a/OCH/mogo-och-bus/src/jinlvvan/java/com/mogo/och/bus/net/login/OchSAASLoginServiceApi.java
+++ b/OCH/mogo-och-bus/src/jinlvvan/java/com/mogo/och/bus/net/login/OchSAASLoginServiceApi.java
@@ -0,0 +1,66 @@
+package com.mogo.och.bus.net.login;
+
+import com.mogo.eagle.core.data.BaseData;
+import com.mogo.och.common.module.biz.bean.DriverStatusQueryRespBean;
+import com.mogo.och.common.module.biz.bean.TaxiLoginReqBean;
+import com.mogo.och.common.module.biz.bean.TaxiLoginRespBean;
+import com.mogo.och.common.module.biz.bean.TaxiLoginSmsReqBean;
+import com.mogo.och.common.module.biz.bean.TaxiLogoutReqBean;
+
+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 by pangfan on 2021/8/19
+ * <p>
+ * 网约车-出租车接口定义
+ */
+interface OchSAASLoginServiceApi {
+    /**
+     * 获取手机验证码
+     *
+     * @return
+     */
+    @Headers({"Content-type:application/json;charset=UTF-8"})
+    @POST("/och-bus-cabin/api/sms/v1/driver/sendSms")
+    Observable<DriverStatusQueryRespBean> getPhoneCode(@Header("appId") String appId
+            , @Header("ticket") String ticket, @Body TaxiLoginSmsReqBean data);
+
+    /**
+     * 通过验证码登录
+     *
+     * @param appId
+     * @param ticket
+     * @param data
+     * @return
+     */
+    @Headers({"Content-type:application/json;charset=UTF-8"})
+    @POST("/och-bus-cabin/cab/flow/v1/bus/driver/startOperation")
+    Observable<TaxiLoginRespBean> gotoLoginBycode4Bus(@Header("appId") String appId
+            , @Header("ticket") String ticket, @Body TaxiLoginReqBean data);
+
+    /**
+     * 登出接口
+     */
+    @Headers({"Content-type:application/json;charset=UTF-8"})
+    @POST("/och-bus-cabin/cab/flow/v1/bus/driver/endOperation")
+    Observable<BaseData> logout4Bus(@Header("appId") String appId, @Header("ticket") String ticket,
+                                    @Body TaxiLogoutReqBean data);
+
+    /**
+     * 接单状态和登录状态查询 出租车司机端、小巴车司机端、小巴车乘客端
+     *
+     * @param sn
+     * @return
+     */
+    @Headers({"Content-type:application/json;charset=UTF-8"})
+    @GET("/och-bus-cabin/api/business/v1/loginStatus")
+    Observable<DriverStatusQueryRespBean> queryDriverServiceStatusAndLoginStatus(@Header("appId") String appId
+            , @Header("ticket") String ticket, @Query("sn") String sn);
+
+}
--- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/BusPresenter.java
+++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/BusPresenter.java
@@ -204,6 +204,12 @@ public class BusPresenter extends Presenter<BusFragment>
    public void startOpenAutopilot() {
        //非美化模式下启动动画
        runOnUIThread(() -> mView.startAutopilotAnimation());
+
+        //中间站点再次开启自驾时， 自动驾驶状态是2未改变， 此次鹰眼底层不再返给业务，需优化按钮动画显示
+        if (IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING
+                == CallerAutoPilotStatusListenerManager.INSTANCE.getState()){
+            mView.onAutopilotStatusChanged(CallerAutoPilotStatusListenerManager.INSTANCE.getState());
+        }
    }

    private void runOnUIThread(Runnable executor) {
--- a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPassengerBaseFragment.java
+++ b/OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPassengerBaseFragment.java
@@ -58,7 +58,7 @@ public abstract class BusPassengerBaseFragment<V extends IView, P extends Presen
        mapBizView = findViewById(R.id.mapBizView);
        romaPView = findViewById(R.id.romaPView);
        if(DeviceUtils.isLenovoModel() || DeviceUtils.isEB5Model()){
-            romaPView.setVisibility(View.VISIBLE);
+            romaPView.setVisibility(View.GONE);
        }else{
            romaPView.setVisibility(View.GONE);
        }
--- a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/layout/bus_p_base_fragment.xml
+++ b/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/layout/bus_p_base_fragment.xml
@@ -60,10 +60,10 @@
    <com.mogo.eagle.core.function.hmi.ui.msgbox.BusPassengerMsgBoxBubbleView
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_100"
-        android:layout_marginRight="@dimen/dp_40"
-        app:layout_constraintRight_toLeftOf="@+id/bus_p_route_panel"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        android:layout_marginLeft="@dimen/dp_40"
+        android:layout_marginTop="@dimen/dp_100" />

    <!--pnc行为决策-->
    <com.mogo.eagle.core.function.hmi.ui.vehicle.PncActionsView
--- a/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/fragment/BaseBusTabFragment.java
+++ b/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/fragment/BaseBusTabFragment.java
@@ -469,9 +469,9 @@ public abstract class BaseBusTabFragment<V extends IView, P extends Presenter<V>
     * 展示【自动驾驶】按钮
     */
    public void showAutopilotBiz() {
-        getActivity().runOnUiThread(() -> {
-            ctvAutopilotStatus.setVisibility(View.VISIBLE);
-        });
+//        getActivity().runOnUiThread(() -> {
+//            ctvAutopilotStatus.setVisibility(View.VISIBLE);
+//        });
    }

    public SlidePanelView.OnSlidePanelMoveToEndListener getSlidePanelOnEndListener() {
--- a/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/presenter/BusPresenter.java
+++ b/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/presenter/BusPresenter.java
@@ -55,7 +55,6 @@ public class BusPresenter extends Presenter<BusFragment>

    private static final String TAG = "BusPresenter";

-    private int currentAutopilotStatus = -1;
    private List<BusStationBean> mStationList = new ArrayList<>();
    private int mCurrentStation = 0;

@@ -104,16 +103,12 @@ public class BusPresenter extends Presenter<BusFragment>
    }

    public void autoDriveToNextStation() {
-        currentAutopilotStatus = -1;
        OrderModel.getInstance().autoDriveToNextStation();
-//        isRestartAutopilot = false;
    }

    public void restartAutopilot() {
        if (OrderModel.getInstance().isGoingToNextStation()){
-            currentAutopilotStatus = -1;
            OrderModel.getInstance().restartAutopilot();
-//            isRestartAutopilot = true;
        }
    }

@@ -177,34 +172,7 @@ public class BusPresenter extends Presenter<BusFragment>
    public void onAutopilotStatusResponse(int state) {
        switch (state) {
            case IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_ENABLE:
-                if (currentAutopilotStatus != IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_ENABLE) {
-                    // 设置UI【自动驾驶】按钮是否展示
-                    runOnUIThread(() -> mView.onAutopilotEnableChange(true));
-                }
-                if (FunctionBuildConfig.isDemoMode
-                        && (
-                        (mCurrentStation >= 0 && mCurrentStation <= mStationList.size() - 1)
-                                && OrderModel.getInstance().isGoingToNextStation()
-                )
-                ) {
-                    CallerLogger.INSTANCE.d(M_BUS + "BusOrderModel=", "有美化功能");
-                    return;
-                }
-                if (currentAutopilotStatus != IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_ENABLE) {
-                    currentAutopilotStatus = IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_ENABLE;
-                }
-                // 改变UI自动驾驶状态
-                runOnUIThread(() -> mView.onAutopilotStatusChanged(currentAutopilotStatus));
-                break;
-            case IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING:
-                if (currentAutopilotStatus != IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING) {
-                    currentAutopilotStatus = IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING;
-                    OrderModel.getInstance().triggerStartServiceEvent(
-                            OrderModel.getInstance().isRestartAutopilot(), true);
-                }
-                // 改变UI自动驾驶状态
-                runOnUIThread(() -> mView.onAutopilotStatusChanged(currentAutopilotStatus));
-                break;
+            case IMoGoAutopilotStatusListener.STATUS_PARALLEL_DRIVING:
            case IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_DISABLE:
                if (FunctionBuildConfig.isDemoMode
                        && (
@@ -215,25 +183,14 @@ public class BusPresenter extends Presenter<BusFragment>
                    CallerLogger.INSTANCE.d(M_BUS + "BusOrderModel=", "有美化功能");
                    return;
                }
-                if (currentAutopilotStatus != IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_DISABLE) {
-                    currentAutopilotStatus = IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_DISABLE;
-                }
-                runOnUIThread(() -> mView.onAutopilotStatusChanged(currentAutopilotStatus));
+                // 改变UI自动驾驶状态
+                runOnUIThread(() -> mView.onAutopilotStatusChanged(state));
                break;
-            case IMoGoAutopilotStatusListener.STATUS_PARALLEL_DRIVING:
-                if (FunctionBuildConfig.isDemoMode
-                        && (
-                        (mCurrentStation >= 0 && mCurrentStation <= mStationList.size() - 1)
-                                && OrderModel.getInstance().isGoingToNextStation()
-                )
-                ) {
-                    CallerLogger.INSTANCE.d(M_BUS + "BusOrderModel=", "有美化功能");
-                    return;
-                }
-                if (currentAutopilotStatus != IMoGoAutopilotStatusListener.STATUS_PARALLEL_DRIVING) {
-                    currentAutopilotStatus = IMoGoAutopilotStatusListener.STATUS_PARALLEL_DRIVING;
-                }
-                runOnUIThread(() -> mView.onAutopilotStatusChanged(currentAutopilotStatus));
+            case IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING:
+                OrderModel.getInstance().triggerStartServiceEvent(
+                            OrderModel.getInstance().isRestartAutopilot(), true);
+                // 改变UI自动驾驶状态
+                runOnUIThread(() -> mView.onAutopilotStatusChanged(state));
                break;
            default:
                runOnUIThread(() -> mView.onAutopilotEnableChange(false));
@@ -257,6 +214,12 @@ public class BusPresenter extends Presenter<BusFragment>
    public void startOpenAutopilot() {
        //非美化模式下启动动画
        runOnUIThread(() -> mView.startAutopilotAnimation());
+
+        //中间站点再次开启自驾时， 自动驾驶状态是2未改变， 此次鹰眼底层不再返给业务，需优化按钮动画显示
+        if (IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING
+                == CallerAutoPilotStatusListenerManager.INSTANCE.getState()){
+            mView.onAutopilotStatusChanged(CallerAutoPilotStatusListenerManager.INSTANCE.getState());
+        }
    }

    private void runOnUIThread(Runnable executor) {
--- a/app/src/main/java/com/mogo/launcher/startup/ConfigStartUp.kt
+++ b/app/src/main/java/com/mogo/launcher/startup/ConfigStartUp.kt
@@ -81,6 +81,7 @@ object ConfigStartUp {
        DebugConfig.setLauncher(BuildConfig.IS_LAUNCHER)
        DebugConfig.setCarMachineType(BuildConfig.CAR_MACHINE_TYPE)
        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)
--- a/config.gradle
+++ b/config.gradle
@@ -218,7 +218,7 @@ ext {

            weak_network                 : "com.mogo.weak:network:1.0.0",

-            mofang_runtime               : "com.mogo.eagle.core.mofang:runtime:2.0.5",
+            mofang_runtime               : "com.mogo.eagle.core.mofang:runtime:2.0.6",
            log_runtime                  : "com.mogo.eagle.core.log.record:runtime:1.0.6"
    ]
    android = [
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/lookaround/M1LookAroundView.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/lookaround/M1LookAroundView.kt
@@ -200,7 +200,7 @@ class M1LookAroundView: SurfaceView, SurfaceHolder.Callback, Runnable, IMoGoChas
                        val outerAngle = abs(steering * 1.0 / VEHICLE_STEERING_RATIO)
                        val radians = Math.toRadians(outerAngle)
                        val d = (newTargetHeight / tan(radians)).toFloat()
-                        if (steering < 0) {
+                        if (steering > 0) {
                            // 左打轮
                            // 将坐标原点平移到圆心
                            canvas.translate(newTargetX - (d - newTargetWidth), newTargetY + newTargetHeight)
@@ -215,7 +215,7 @@ class M1LookAroundView: SurfaceView, SurfaceHolder.Callback, Runnable, IMoGoChas
                            canvas.drawArc(innerRect, -innerAngle.toFloat(), -60f, false, routerPaint)
                        }

-                        if (steering > 0) {
+                        if (steering < 0) {
                            //右打轮
                            // 将坐标原点平移到圆心
                            canvas.translate(newTargetX + d, newTargetY + newTargetHeight)
--- 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
@@ -81,9 +81,11 @@ internal class AutoPilotAndCheckView @JvmOverloads constructor(
                            keyBoardUtil?.hideKeyboard()
                            etInputSpeed.clearFocus()
                            // 设置自动驾驶速度
-                            val isSuccess = CallerAutoPilotControlManager.setAutoPilotSpeed(speed)
+                            speedLimit = speed
+                            val isSuccess = CallerAutoPilotControlManager.setAutoPilotSpeed(speedLimit)
                            when {
                                isSuccess -> {
+                                    etInputSpeed.setText(speedLimit.toString())
                                    ToastUtils.showShort("车速设置成功，立即生效")
                                }
                                else -> {
@@ -113,7 +115,9 @@ internal class AutoPilotAndCheckView @JvmOverloads constructor(

                    }
                    etInputSpeed.setText(speedLimit.toString())
-                    etInputSpeed.setSelection(speedLimit.toString().length)
+                    try{
+                        etInputSpeed.setSelection(speedLimit.toString().length)
+                    }catch (_:Exception){}
                }
            }

@@ -161,7 +165,9 @@ internal class AutoPilotAndCheckView @JvmOverloads constructor(
                return@setOnTouchListener true
            }
            etInputSpeed.isFocusableInTouchMode = true
-            etInputSpeed.setSelection(speedLimit.toString().length)
+            try {
+                etInputSpeed.setSelection(speedLimit.toString().length)
+            }catch (_:Exception){}
            if (keyBoardUtil == null) {
                keyBoardUtil = KeyBoardUtil(sKeyBoardView, etInputSpeed)
            }
@@ -189,7 +195,9 @@ internal class AutoPilotAndCheckView @JvmOverloads constructor(
            } else{
                ToastUtils.showShort("车速不能再减了")
            }
-            etInputSpeed.setSelection(speedLimit.toString().length)
+            try{
+                etInputSpeed.setSelection(speedLimit.toString().length)
+            }catch (_:Exception){}
        }

        ivSpeedAdd.setOnClickListener {
@@ -202,7 +210,9 @@ internal class AutoPilotAndCheckView @JvmOverloads constructor(
            } else{
                ToastUtils.showShort("车速不能再加了")
            }
-            etInputSpeed.setSelection(speedLimit.toString().length)
+            try{
+                etInputSpeed.setSelection(speedLimit.toString().length)
+            }catch (_:Exception){}
        }

        //速度确认
@@ -223,7 +233,9 @@ internal class AutoPilotAndCheckView @JvmOverloads constructor(
                    ToastUtils.showShort("设置车速失败，请启动域控制器")
                }
            }
-            etInputSpeed.setSelection(speedLimit.toString().length)
+            try {
+                etInputSpeed.setSelection(speedLimit.toString().length)
+            }catch (_:Exception){}
        }

        initOchView()
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/RomaBusView.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/RomaBusView.kt
@@ -10,6 +10,8 @@ import com.mogo.eagle.core.function.api.map.roma.IMoGoRomaListener
 import com.mogo.eagle.core.function.call.map.CallerMapIdentifyManager.romaTrigger
 import com.mogo.eagle.core.function.call.map.CallerMapRomaListener
 import com.mogo.eagle.core.function.hmi.R
+import com.mogo.eagle.core.utilcode.util.ClickUtils
+import com.mogo.eagle.core.utilcode.util.ThreadUtils
 import com.mogo.eagle.core.utilcode.util.ToastUtils
 import kotlinx.android.synthetic.main.view_roma_bus_bg.view.ivRomaView
 import kotlinx.android.synthetic.main.view_roma_bus_bg.view.ll_roma_bg
@@ -55,6 +57,9 @@ class RomaBusView @JvmOverloads constructor(
        }

        setOnClickListener {
+            if (ClickUtils.isClickTooFrequent(this,1200)) {
+                return@setOnClickListener
+            }
            if(!click){
                return@setOnClickListener
            }
@@ -71,23 +76,25 @@ class RomaBusView @JvmOverloads constructor(
    }

    override fun romaStatus(status: Boolean) {
-        click = true
-        if (status) {
-            romaMode = true
-            if(openRes!=0){
-                ll_roma_bg.setBackgroundResource(openRes)
-            }else{
-                ll_roma_bg.setBackgroundResource(R.drawable.romabg_press_select_bg)
+        ThreadUtils.runOnUiThread {
+            click = true
+            if (status) {
+                romaMode = true
+                if(openRes!=0){
+                    ll_roma_bg.setBackgroundResource(openRes)
+                }else{
+                    ll_roma_bg.setBackgroundResource(R.drawable.romabg_press_select_bg)
+                }
+                ivRomaView.setBackgroundResource(R.drawable.roma_press_select_bg)
+            } else {
+                romaMode = false
+                if(normalRes!=0){
+                    ll_roma_bg.setBackgroundResource(normalRes)
+                }else{
+                    ll_roma_bg.setBackgroundResource(R.drawable.roma_bg_selector)
+                }
+                ivRomaView.setBackgroundResource(R.drawable.romafront_select_bg)
            }
-            ivRomaView.setBackgroundResource(R.drawable.roma_press_select_bg)
-        } else {
-            romaMode = false
-            if(normalRes!=0){
-                ll_roma_bg.setBackgroundResource(normalRes)
-            }else{
-                ll_roma_bg.setBackgroundResource(R.drawable.roma_bg_selector)
-            }
-            ivRomaView.setBackgroundResource(R.drawable.romafront_select_bg)
        }
    }

--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/RomaPassengerView.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/RomaPassengerView.kt
@@ -9,7 +9,9 @@ import com.mogo.eagle.core.function.api.map.roma.IMoGoRomaListener
 import com.mogo.eagle.core.function.call.map.CallerMapIdentifyManager.romaTrigger
 import com.mogo.eagle.core.function.call.map.CallerMapRomaListener
 import com.mogo.eagle.core.function.hmi.R
+import com.mogo.eagle.core.utilcode.util.ClickUtils
 import com.mogo.eagle.core.utilcode.util.DeviceUtils
+import com.mogo.eagle.core.utilcode.util.ThreadUtils
 import com.mogo.eagle.core.utilcode.util.ToastUtils

 class RomaPassengerView @JvmOverloads constructor(
@@ -40,6 +42,9 @@ class RomaPassengerView @JvmOverloads constructor(
            normalRes = a.getResourceId(R.styleable.RomaPassengerView_roma_close, 0)
            a.recycle()
            setOnClickListener {
+                if (ClickUtils.isClickTooFrequent(this,1200)) {
+                    return@setOnClickListener
+                }
                if(!click){
                    return@setOnClickListener
                }
@@ -62,16 +67,18 @@ class RomaPassengerView @JvmOverloads constructor(
    }

    override fun romaStatus(status: Boolean) {
-        click = true
-        if (status) {
-            romaMode = true
-            if (openRes != 0) {
-                setBackgroundResource(openRes)
-            }
-        } else {
-            romaMode = false
-            if (normalRes != 0) {
-                setBackgroundResource(normalRes)
+        ThreadUtils.runOnUiThread {
+            click = true
+            if (status) {
+                romaMode = true
+                if (openRes != 0) {
+                    setBackgroundResource(openRes)
+                }
+            } else {
+                romaMode = false
+                if (normalRes != 0) {
+                    setBackgroundResource(normalRes)
+                }
            }
        }
    }
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/RomaTaxiView.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/RomaTaxiView.kt
@@ -10,7 +10,7 @@ import com.mogo.eagle.core.function.api.map.roma.IMoGoRomaListener
 import com.mogo.eagle.core.function.call.map.CallerMapIdentifyManager.romaTrigger
 import com.mogo.eagle.core.function.call.map.CallerMapRomaListener
 import com.mogo.eagle.core.function.hmi.R
-import com.mogo.eagle.core.utilcode.util.ToastUtils
+import com.mogo.eagle.core.utilcode.util.*
 import kotlinx.android.synthetic.main.view_roma_taxi_bg.view.ivRomaView
 import kotlinx.android.synthetic.main.view_roma_taxi_bg.view.ll_roma_bg

@@ -55,6 +55,9 @@ class RomaTaxiView @JvmOverloads constructor(
        }

        setOnClickListener {
+            if (ClickUtils.isClickTooFrequent(this,1200)) {
+                return@setOnClickListener
+            }
            if(!click){
                return@setOnClickListener
            }
@@ -71,23 +74,25 @@ class RomaTaxiView @JvmOverloads constructor(
    }

    override fun romaStatus(status: Boolean) {
-        click = true
-        if (status) {
-            romaMode = true
-            if(openRes!=0){
-                ll_roma_bg.setBackgroundResource(openRes)
-            }else{
-                ll_roma_bg.setBackgroundResource(R.drawable.romabg_press_select_bg)
+        ThreadUtils.runOnUiThread {
+            click = true
+            if (status) {
+                romaMode = true
+                if(openRes!=0){
+                    ll_roma_bg.setBackgroundResource(openRes)
+                }else{
+                    ll_roma_bg.setBackgroundResource(R.drawable.romabg_press_select_bg)
+                }
+                ivRomaView.setBackgroundResource(R.drawable.roma_press_select_bg)
+            } else {
+                romaMode = false
+                if(normalRes!=0){
+                    ll_roma_bg.setBackgroundResource(normalRes)
+                }else{
+                    ll_roma_bg.setBackgroundResource(R.drawable.roma_bg_selector)
+                }
+                ivRomaView.setBackgroundResource(R.drawable.romafront_select_bg)
            }
-            ivRomaView.setBackgroundResource(R.drawable.roma_press_select_bg)
-        } else {
-            romaMode = false
-            if(normalRes!=0){
-                ll_roma_bg.setBackgroundResource(normalRes)
-            }else{
-                ll_roma_bg.setBackgroundResource(R.drawable.roma_bg_selector)
-            }
-            ivRomaView.setBackgroundResource(R.drawable.romafront_select_bg)
        }
    }

--- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/ai/AiCloudIdentifyDataManager.kt
+++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/ai/AiCloudIdentifyDataManager.kt
@@ -219,7 +219,7 @@ class AiCloudIdentifyDataManager : IMoGoPlanningRottingListener,
                    // 请求地图开始漫游
                    MogoMapUIController.getInstance().setRomaMode(FunctionBuildConfig.romaModeStyle)
                    CallerMapRomaListener.invokeMapRoma(true)
-                } else {
+                }else{
                    CallerMapRomaListener.invokeMapRoma(false)
                }
            },
@@ -296,6 +296,7 @@ class AiCloudIdentifyDataManager : IMoGoPlanningRottingListener,
        if (showAiCloud.get()) {
            showAiCloud.set(false)
            aiCloudDataChange.set(false)
+            MapIdentifySubscriber.instance.clearAiCloudRoma()
            FunctionBuildConfig.isDrawIdentifyData = true
            if (invokeCloud) {
                closeRoma(false)
--- 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
@@ -124,6 +124,7 @@ public class DebugConfig {
    }

    private static String sProductFlavor;
+    private static String sProjectFlavor = "";

    public static String getProductFlavor() {
        return sProductFlavor;
@@ -138,6 +139,18 @@ public class DebugConfig {
        DebugConfig.sProductFlavor = sProductFlavor;
    }

+    /**
+     * project flavor
+     * @param projectFlavor
+     */
+    public static void setProjectFlavor(String projectFlavor) {
+        DebugConfig.sProjectFlavor = projectFlavor;
+    }
+
+    public static String getProjectFlavor() {
+        return sProjectFlavor;
+    }
+
    private static String sSocketAppId;

    public static void setSocketAppId(String sSocketAppId) {
--- a/gradle.properties
+++ b/gradle.properties
@@ -85,7 +85,7 @@ MOGO_LOCATION_VERSION=1.4.7.9
 MOGO_TELEMATIC_VERSION=1.4.7.9
 ######## MogoAiCloudSDK Version ########
 # 自研地图
-MAP_SDK_VERSION=2.13.1.5
+MAP_SDK_VERSION=2.14.0.8
 MAP_SDK_OPERATION_VERSION=1.1.4.1
 # websocket
 WEBSOCKET_VERSION=1.1.7
@@ -155,21 +155,21 @@ MATRIX_VERSION=2.0.8
 # 测试模式司机端版本号
 NOOP_DRIVER_VERSION=3.2.0
 # 公交模式司机端版本号
-BUS_DRIVER_VERSION=3.3.0
+BUS_DRIVER_VERSION=3.3.2
 # 公交模式乘客端端版本号
-BUS_PASSENGER_VERSION=2.3.0
+BUS_PASSENGER_VERSION=2.3.2
 # 接驳模式司机端版本号
-SHUTTLE_DRIVER_VERSION=3.2.0
+SHUTTLE_DRIVER_VERSION=3.3.2
 # 接驳模式乘客端端版本号
-SHUTTLE_PASSENGER_VERSION=2.2.0
+SHUTTLE_PASSENGER_VERSION=2.3.2
 # 出租车模式司机端版本号
-TAXI_DRIVER_VERSION=3.3.0
+TAXI_DRIVER_VERSION=3.3.2
 # 出租车模式乘客端端版本号
-TAXI_PASSENGER_VERSION=2.3.0
+TAXI_PASSENGER_VERSION=2.3.2
 # 包车模式司机端版本号
-CHARTER_DRIVER_VERSION=3.1.0
+CHARTER_DRIVER_VERSION=3.3.2
 # 包车模式乘客端端版本号
-CHARTER_PASSENGER_VERSION=2.2.0
+CHARTER_PASSENGER_VERSION=2.3.2
 # 支持云控清扫车模式司机端版本号
 SWEEPERCLOUD_DRIVER_VERSION=3.1.4
 # 清扫车模式司机端版本号