From 6b5077b9ac46bdaef01e7610489f4c4ff302274f Mon Sep 17 00:00:00 2001 From: wangmingjun Date: Thu, 8 Jun 2023 19:56:09 +0800 Subject: [PATCH 01/20] =?UTF-8?q?[saas]=20saas=E6=8E=A5=E5=8F=A3=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../network/BusPassengerServiceManager.kt | 56 +++- .../network/PassengerSAASServiceApi.java | 41 +++ .../com/mogo/och/bus/net/ISAASApiService.java | 165 +++++++++++ .../mogo/och/bus/net/OrderServiceManager.kt | 275 +++++++++++++----- .../bus/net/login/OchCommonServiceManager.kt | 86 ++++-- .../bus/net/login/OchSAASLoginServiceApi.java | 69 +++++ .../mogo/launcher/startup/ConfigStartUp.kt | 1 + .../com/mogo/commons/debug/DebugConfig.java | 13 + 8 files changed, 590 insertions(+), 116 deletions(-) create mode 100644 OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/network/PassengerSAASServiceApi.java create mode 100644 OCH/mogo-och-bus/src/jinlvvan/java/com/mogo/och/bus/net/ISAASApiService.java create mode 100644 OCH/mogo-och-bus/src/jinlvvan/java/com/mogo/och/bus/net/login/OchSAASLoginServiceApi.java diff --git 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 index a09db90434..aa8d8842b8 100644 --- 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,25 @@ object BusPassengerServiceManager { fun queryDriverSiteByCoordinate( context: Context, callback: OchCommonServiceCallback? ) { - mBusPassengerServiceApi.queryDriverSiteByCoordinate( - MoGoAiCloudClientConfig.getInstance().serviceAppId, - MoGoAiCloudClientConfig.getInstance().token, - BusPassengerQueryLineRequest( - driverAppSn - ) - ).transformTry() - .subscribe(OchCommonSubscribeImpl(context, callback, "queryDriverSiteByCoordinate")) + if (DebugConfig.getProjectFlavor().contains("saas")){ + mBusPassengerSaasServiceApi.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")) + } } /** @@ -64,12 +79,23 @@ object BusPassengerServiceManager { context: Context, callback: OchCommonServiceCallback? ) { - 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")) + } } } \ No newline at end of file diff --git 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 new file mode 100644 index 0000000000..c1dd487df2 --- /dev/null +++ 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" ) + @POST( "/autopilot-car-hailing/line/v2/driver/bus/lineDataWithDriver/query" ) + Observable 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/operation/v1/driver/bus/passenger/loginStatus") + @GET("/och-bus-cabin/api/business/v1/loginStatus") + Observable queryDriverOperationStatus(@Header ("appId") String appId, @Header("ticket") String ticket, @Query("sn") String sn); + + +} diff --git 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 new file mode 100644 index 0000000000..43b4bb06ba --- /dev/null +++ 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 + *

+ * 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 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 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 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 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 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 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 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 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 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 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 queryWriteOffPassengers(@Header ("appId") String appId, @Header("ticket") String ticket, @Body BusWriteOffPassengersQueryRequest data); +} + diff --git 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 index 9002603bb5..884d342eac 100644 --- 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?) { //获取当前高德坐标 - 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? ) { - 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?) { - 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?) { - 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? ) { - 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? ) { - 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?) { - 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?) { - 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? ) { - 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?, callback: OchCommonServiceCallback? ) { - 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? ) { - 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")) + } } } \ No newline at end of file diff --git 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 index 83f8dec4ee..6a52618adb 100644 --- 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? ) { - 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? ) { 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? ) { - 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")) + } + } } \ No newline at end of file diff --git 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 new file mode 100644 index 0000000000..5825f6f6eb --- /dev/null +++ b/OCH/mogo-och-bus/src/jinlvvan/java/com/mogo/och/bus/net/login/OchSAASLoginServiceApi.java @@ -0,0 +1,69 @@ +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 + *

+ * 网约车-出租车接口定义 + */ +interface OchSAASLoginServiceApi { + /** + * 获取手机验证码 + * + * @return + */ + @Headers({"Content-type:application/json;charset=UTF-8"}) + @POST("/autopilot-car-hailing/driver/v2/driver/taxi/sendSms") + Observable 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("/autopilot-car-hailing/cab/flow/v1/bus/driver/bus/startOperation") + @POST("/och-bus-cabin/cab/flow/v1/bus/driver/startOperation") + Observable gotoLoginBycode4Bus(@Header("appId") String appId + , @Header("ticket") String ticket, @Body TaxiLoginReqBean data); + + /** + * 登出接口 + */ + @Headers({"Content-type:application/json;charset=UTF-8"}) +// @POST("/autopilot-car-hailing/cab/flow/v1/bus/driver/bus/endOperation") + @POST("/och-bus-cabin/cab/flow/v1/bus/driver/endOperation") + Observable logout4Bus(@Header("appId") String appId, @Header("ticket") String ticket, + @Body TaxiLogoutReqBean data); + + /** + * 接单状态和登录状态查询 出租车司机端、小巴车司机端、小巴车乘客端 + * + * @param sn + * @return + */ + @Headers({"Content-type:application/json;charset=UTF-8"}) +// @GET("/autopilot-car-hailing/operation/v1/driver/bus/loginStatus") + @GET("/och-bus-cabin/api/business/v1/loginStatus") + Observable queryDriverServiceStatusAndLoginStatus(@Header("appId") String appId + , @Header("ticket") String ticket, @Query("sn") String sn); + +} diff --git a/app/src/main/java/com/mogo/launcher/startup/ConfigStartUp.kt b/app/src/main/java/com/mogo/launcher/startup/ConfigStartUp.kt index 5ccbec8187..2053f232d9 100644 --- a/app/src/main/java/com/mogo/launcher/startup/ConfigStartUp.kt +++ b/app/src/main/java/com/mogo/launcher/startup/ConfigStartUp.kt @@ -80,6 +80,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) diff --git a/foudations/mogo-commons/src/main/java/com/mogo/commons/debug/DebugConfig.java b/foudations/mogo-commons/src/main/java/com/mogo/commons/debug/DebugConfig.java index 4210cfb971..3056d07556 100644 --- a/foudations/mogo-commons/src/main/java/com/mogo/commons/debug/DebugConfig.java +++ b/foudations/mogo-commons/src/main/java/com/mogo/commons/debug/DebugConfig.java @@ -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) { From f335362e9881aa50b80303d4fc588176f376588c Mon Sep 17 00:00:00 2001 From: wangmingjun Date: Thu, 15 Jun 2023 14:18:16 +0800 Subject: [PATCH 02/20] =?UTF-8?q?[saas]=20bus=20=E4=B9=98=E5=AE=A2?= =?UTF-8?q?=E5=B1=8F=E5=B1=8Fsaas=E6=8E=A5=E5=8F=A3=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../och/bus/passenger/network/BusPassengerServiceManager.kt | 4 +--- .../och/bus/passenger/network/PassengerSAASServiceApi.java | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git 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 index aa8d8842b8..94ab982151 100644 --- 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 @@ -52,9 +52,7 @@ object BusPassengerServiceManager { mBusPassengerSaasServiceApi.queryDriverSiteByCoordinate( MoGoAiCloudClientConfig.getInstance().serviceAppId, MoGoAiCloudClientConfig.getInstance().token, - BusPassengerQueryLineRequest( - driverAppSn - ) + driverAppSn ).transformTry() .subscribe(OchCommonSubscribeImpl(context, callback, "queryDriverSiteByCoordinate")) }else{ diff --git 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 index c1dd487df2..1810e79298 100644 --- 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 @@ -24,8 +24,8 @@ interface PassengerSAASServiceApi { */ @Headers( {"Content-Type:application/json;charset=UTF-8"} ) // @POST( "/autopilot-car-hailing/line/v2/driver/bus/passenger/lineDataWithDriver/query" ) - @POST( "/autopilot-car-hailing/line/v2/driver/bus/lineDataWithDriver/query" ) - Observable queryDriverSiteByCoordinate(@Header("appId") String appId, @Header("ticket") String ticket, @Body BusPassengerQueryLineRequest request); + @GET( "/och-bus-cabin/api/business/v1/driver/bus/lineDataWithDriver/query" ) + Observable queryDriverSiteByCoordinate(@Header("appId") String appId, @Header("ticket") String ticket, @Query("sn") String sn); /** * 查询司机端的登陆状态 From 2acad166ddd7fa00882182d4627e0a956c2b24ca Mon Sep 17 00:00:00 2001 From: wangmingjun Date: Tue, 20 Jun 2023 10:58:35 +0800 Subject: [PATCH 03/20] =?UTF-8?q?[3.3.0]=20TextView=E8=B5=B0=E9=A9=AC?= =?UTF-8?q?=E7=81=AFgetLayout()=E4=B8=BA=E7=A9=BA=E5=BC=82=E5=B8=B8?= =?UTF-8?q?=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mogo/och/common/module/wigets/MarqueeTextView.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/MarqueeTextView.java b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/MarqueeTextView.java index 8b141d5ded..bd549f2888 100644 --- a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/MarqueeTextView.java +++ b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/MarqueeTextView.java @@ -105,6 +105,9 @@ public class MarqueeTextView extends androidx.appcompat.widget.AppCompatTextView } final int textWidth = getWidth() - getCompoundPaddingLeft() - getCompoundPaddingRight(); + + if (getLayout() == null) return; + final float lineWidth = getLayout().getLineWidth(0); final float gap = mCustomGap*textWidth; float ghostStart = lineWidth - textWidth + gap; From b392a0d149fe5b828450482fe8aa9b9b8de82792 Mon Sep 17 00:00:00 2001 From: wangmingjun Date: Fri, 30 Jun 2023 11:50:22 +0800 Subject: [PATCH 04/20] =?UTF-8?q?[saas]=20bus=E5=8F=B8=E6=9C=BA=E7=AB=AFsa?= =?UTF-8?q?as=E6=9B=B4=E6=8D=A2=E9=AA=8C=E8=AF=81=E7=A0=81=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mogo/och/bus/net/login/OchSAASLoginServiceApi.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git 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 index 5825f6f6eb..847d766400 100644 --- 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 @@ -27,7 +27,7 @@ interface OchSAASLoginServiceApi { * @return */ @Headers({"Content-type:application/json;charset=UTF-8"}) - @POST("/autopilot-car-hailing/driver/v2/driver/taxi/sendSms") + @POST("/och-bus-cabin/api/sms/v1/driver/sendSms") Observable getPhoneCode(@Header("appId") String appId , @Header("ticket") String ticket, @Body TaxiLoginSmsReqBean data); @@ -40,7 +40,6 @@ interface OchSAASLoginServiceApi { * @return */ @Headers({"Content-type:application/json;charset=UTF-8"}) -// @POST("/autopilot-car-hailing/cab/flow/v1/bus/driver/bus/startOperation") @POST("/och-bus-cabin/cab/flow/v1/bus/driver/startOperation") Observable gotoLoginBycode4Bus(@Header("appId") String appId , @Header("ticket") String ticket, @Body TaxiLoginReqBean data); @@ -49,7 +48,6 @@ interface OchSAASLoginServiceApi { * 登出接口 */ @Headers({"Content-type:application/json;charset=UTF-8"}) -// @POST("/autopilot-car-hailing/cab/flow/v1/bus/driver/bus/endOperation") @POST("/och-bus-cabin/cab/flow/v1/bus/driver/endOperation") Observable logout4Bus(@Header("appId") String appId, @Header("ticket") String ticket, @Body TaxiLogoutReqBean data); @@ -61,7 +59,6 @@ interface OchSAASLoginServiceApi { * @return */ @Headers({"Content-type:application/json;charset=UTF-8"}) -// @GET("/autopilot-car-hailing/operation/v1/driver/bus/loginStatus") @GET("/och-bus-cabin/api/business/v1/loginStatus") Observable queryDriverServiceStatusAndLoginStatus(@Header("appId") String appId , @Header("ticket") String ticket, @Query("sn") String sn); From a62c2df256cb491b8c25c2d6c4d2ab174ec3c47a Mon Sep 17 00:00:00 2001 From: pangfan Date: Fri, 7 Jul 2023 18:06:20 +0800 Subject: [PATCH 05/20] [3.3.2/2.3.2]Bus-MogoGoSaas version update --- gradle.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index d59a53879b..08e2b91a2a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -155,9 +155,9 @@ 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 # 接驳模式乘客端端版本号 From 451ce4349dfc7832a238613a56a3ea7aa7ae68ea Mon Sep 17 00:00:00 2001 From: pangfan Date: Mon, 10 Jul 2023 14:17:04 +0800 Subject: [PATCH 06/20] =?UTF-8?q?[3.3.2/2.3.2]=E6=9B=B4=E6=96=B0HD?= =?UTF-8?q?=E5=9C=B0=E5=9B=BE=E7=89=88=E6=9C=AC=EF=BC=9A2.14.0.8=EF=BC=9B?= =?UTF-8?q?=E6=89=A9=E5=A4=A7=E8=8C=83=E5=9B=B4=EF=BC=9AMogoTaxi/Bus?= =?UTF-8?q?=E3=80=81SaasBus?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gradle.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gradle.properties b/gradle.properties index 08e2b91a2a..0aaa2d21ed 100644 --- 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 @@ -163,9 +163,9 @@ SHUTTLE_DRIVER_VERSION=3.2.0 # 接驳模式乘客端端版本号 SHUTTLE_PASSENGER_VERSION=2.2.0 # 出租车模式司机端版本号 -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 # 包车模式乘客端端版本号 From f3cc63f90e6e6d04e9ff7e057a171f99ecdf1c49 Mon Sep 17 00:00:00 2001 From: pangfan Date: Mon, 10 Jul 2023 14:33:24 +0800 Subject: [PATCH 07/20] =?UTF-8?q?[3.3.0/2.3.0]Re-release:=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=A4=A7=E7=90=86M1=E5=8F=B8=E6=9C=BAapp=E9=AA=8C?= =?UTF-8?q?=E8=AF=81360=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gradle.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index 146ea7130c..cf8f456cb5 100644 --- a/gradle.properties +++ b/gradle.properties @@ -167,9 +167,9 @@ TAXI_DRIVER_VERSION=3.3.0 # 出租车模式乘客端端版本号 TAXI_PASSENGER_VERSION=2.3.0 # 包车模式司机端版本号 -CHARTER_DRIVER_VERSION=3.1.0 +CHARTER_DRIVER_VERSION=3.3.0 # 包车模式乘客端端版本号 -CHARTER_PASSENGER_VERSION=2.2.0 +CHARTER_PASSENGER_VERSION=2.3.0 # 支持云控清扫车模式司机端版本号 SWEEPERCLOUD_DRIVER_VERSION=3.1.0 # 清扫车模式司机端版本号 From 9507c211c956b710a6950d7d21f10f02bf051958 Mon Sep 17 00:00:00 2001 From: renwj Date: Tue, 11 Jul 2023 11:41:10 +0800 Subject: [PATCH 08/20] =?UTF-8?q?[3.3.0][=E9=AD=94=E6=96=B9]=20=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3=E9=AD=94=E6=96=B9=E5=88=9D=E5=A7=8B=E5=8C=96=E5=9B=A0?= =?UTF-8?q?=E6=9D=83=E9=99=90=E6=9C=AA=E6=8E=88=E4=BA=88=E5=AF=BC=E8=87=B4?= =?UTF-8?q?=E9=83=A8=E5=88=86=E6=9C=BA=E5=9E=8B=E5=B4=A9=E6=BA=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.gradle b/config.gradle index f237a3ad74..8de2d09d18 100644 --- 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 = [ From fcf0cf02fdb5c66cd2d776a061442d885749f350 Mon Sep 17 00:00:00 2001 From: renwj Date: Tue, 11 Jul 2023 11:56:02 +0800 Subject: [PATCH 09/20] =?UTF-8?q?[3.3.0][M1]=20=E7=8E=AF=E8=A7=86=E8=BD=AC?= =?UTF-8?q?=E5=90=91=E8=A7=92=E5=BC=84=E5=8F=8D=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../eagle/core/function/hmi/ui/lookaround/M1LookAroundView.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git 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 index 235049fa90..d11352ba45 100644 --- 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) From b8c9f7e3fbc42695a2dd959fd00db1afd509d63e Mon Sep 17 00:00:00 2001 From: wangmingjun Date: Tue, 11 Jul 2023 14:34:34 +0800 Subject: [PATCH 10/20] =?UTF-8?q?[3.3.2]=20saas=E6=8E=A5=E9=A9=B3=E5=8F=B8?= =?UTF-8?q?=E6=9C=BA=E7=AB=AF=E9=80=82=E9=85=8D=E8=87=AA=E5=8A=A8=E9=A9=BE?= =?UTF-8?q?=E9=A9=B6=E7=8A=B6=E6=80=81=E8=BF=94=E5=9B=9E=E5=8F=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mogo/och/bus/presenter/BusPresenter.java | 6 ++ .../res/layout/bus_p_base_fragment.xml | 8 +-- .../och/bus/fragment/BaseBusTabFragment.java | 6 +- .../mogo/och/bus/presenter/BusPresenter.java | 65 ++++--------------- 4 files changed, 27 insertions(+), 58 deletions(-) diff --git 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 index 5198e4dbca..34209e95b3 100644 --- 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 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) { diff --git 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 index aa903a44ce..c232a06a3f 100644 --- 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 @@ + app:layout_constraintLeft_toLeftOf="parent" + app:layout_constraintTop_toTopOf="parent" + android:layout_marginLeft="@dimen/dp_40" + android:layout_marginTop="@dimen/dp_100" /> * 展示【自动驾驶】按钮 */ public void showAutopilotBiz() { - getActivity().runOnUiThread(() -> { - ctvAutopilotStatus.setVisibility(View.VISIBLE); - }); +// getActivity().runOnUiThread(() -> { +// ctvAutopilotStatus.setVisibility(View.VISIBLE); +// }); } public SlidePanelView.OnSlidePanelMoveToEndListener getSlidePanelOnEndListener() { diff --git 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 index ea411d37b0..1d0c948311 100644 --- 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 private static final String TAG = "BusPresenter"; - private int currentAutopilotStatus = -1; private List mStationList = new ArrayList<>(); private int mCurrentStation = 0; @@ -104,16 +103,12 @@ public class BusPresenter extends Presenter } 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 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 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 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) { From 14214440ab6a5a060d911b4604caff11e575e8c9 Mon Sep 17 00:00:00 2001 From: xuxinchao Date: Tue, 11 Jul 2023 17:59:04 +0800 Subject: [PATCH 11/20] [3.3.2]fix AutoPilotAndCheckView etInputSpeed setSelection IndexOutOfBoundsException --- .../hmi/ui/tools/AutoPilotAndCheckView.kt | 20 ++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) 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 578be323dd..9de8165171 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 @@ -113,7 +113,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 +163,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 +193,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 +208,9 @@ internal class AutoPilotAndCheckView @JvmOverloads constructor( } else{ ToastUtils.showShort("车速不能再加了") } - etInputSpeed.setSelection(speedLimit.toString().length) + try{ + etInputSpeed.setSelection(speedLimit.toString().length) + }catch (_:Exception){} } //速度确认 @@ -223,7 +231,9 @@ internal class AutoPilotAndCheckView @JvmOverloads constructor( ToastUtils.showShort("设置车速失败，请启动域控制器") } } - etInputSpeed.setSelection(speedLimit.toString().length) + try { + etInputSpeed.setSelection(speedLimit.toString().length) + }catch (_:Exception){} } initOchView() From e41a83872197220c71f8d7d3f55b0abc9ff4df3d Mon Sep 17 00:00:00 2001 From: pangfan Date: Tue, 11 Jul 2023 18:12:32 +0800 Subject: [PATCH 12/20] =?UTF-8?q?[3.3.0/2.3.0]Re-release:M1=E5=9C=A82022?= =?UTF-8?q?=E5=B0=8F=E6=96=B0padpro=E5=8F=91=E7=8E=B0=E8=93=9D=E7=89=99?= =?UTF-8?q?=E6=9D=83=E9=99=90=E5=AF=BC=E8=87=B4=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gradle.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index 70c986b986..6240a28387 100644 --- a/gradle.properties +++ b/gradle.properties @@ -167,9 +167,9 @@ TAXI_DRIVER_VERSION=3.3.2 # 出租车模式乘客端端版本号 TAXI_PASSENGER_VERSION=2.3.2 # 包车模式司机端版本号 -CHARTER_DRIVER_VERSION=3.3.0 +CHARTER_DRIVER_VERSION=3.3.2 # 包车模式乘客端端版本号 -CHARTER_PASSENGER_VERSION=2.3.0 +CHARTER_PASSENGER_VERSION=2.3.2 # 支持云控清扫车模式司机端版本号 SWEEPERCLOUD_DRIVER_VERSION=3.1.4 # 清扫车模式司机端版本号 From d67c3ae2288a4d7c741085cc41f21f779a35e67a Mon Sep 17 00:00:00 2001 From: xuxinchao Date: Tue, 11 Jul 2023 19:22:45 +0800 Subject: [PATCH 13/20] =?UTF-8?q?[3.3.2]=E4=BF=AE=E5=A4=8D=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=E8=87=AA=E9=A9=BE=E6=9C=80=E5=A4=A7=E8=BD=A6=E9=80=9F?= =?UTF-8?q?=E6=98=BE=E7=A4=BABug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../eagle/core/function/hmi/ui/tools/AutoPilotAndCheckView.kt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 9de8165171..65e08ba9b9 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 @@ -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 -> { From ffb4fc9a9ade04580fa0a51c957daafe8bb9e0e0 Mon Sep 17 00:00:00 2001 From: zhongchao Date: Wed, 12 Jul 2023 18:38:31 +0800 Subject: [PATCH 14/20] [3.3.2] remove ai marker when map invoke ,plus it has time cache when network bad --- .../core/function/business/ai/AiCloudIdentifyDataManager.kt | 1 + 1 file changed, 1 insertion(+) diff --git 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 index 6c118379b5..5bf0a09b3a 100644 --- 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 @@ -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) From 5f054f9e2b7a22838703c5b8aa0960ad3c38902a Mon Sep 17 00:00:00 2001 From: zhongchao Date: Thu, 13 Jul 2023 17:17:30 +0800 Subject: [PATCH 15/20] [3.3.2] limit click duration to 1200 in roma view --- .../mogo/eagle/core/function/hmi/ui/widget/RomaBusView.kt | 5 +++++ .../eagle/core/function/hmi/ui/widget/RomaPassengerView.kt | 4 ++++ .../mogo/eagle/core/function/hmi/ui/widget/RomaTaxiView.kt | 4 ++++ 3 files changed, 13 insertions(+) diff --git 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 index baeda951f8..d40a38bbf6 100644 --- 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.kotlin.onClick +import com.mogo.eagle.core.utilcode.util.ClickUtils 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 } diff --git 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 index a261daa7e7..f5f898c69f 100644 --- 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,6 +9,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.ClickUtils import com.mogo.eagle.core.utilcode.util.DeviceUtils import com.mogo.eagle.core.utilcode.util.ToastUtils @@ -40,6 +41,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 } diff --git 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 index 06a718a775..e455c67d8f 100644 --- 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,6 +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.ClickUtils import com.mogo.eagle.core.utilcode.util.ToastUtils 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 +56,9 @@ class RomaTaxiView @JvmOverloads constructor( } setOnClickListener { + if (ClickUtils.isClickTooFrequent(this,1200)) { + return@setOnClickListener + } if(!click){ return@setOnClickListener } From 4e378e7e177b433493c67ea0150f60415494669b Mon Sep 17 00:00:00 2001 From: yangyakun Date: Thu, 13 Jul 2023 17:53:56 +0800 Subject: [PATCH 16/20] =?UTF-8?q?[3.3.2]=20[=E6=8E=A5=E9=A9=B3=20=E9=87=91?= =?UTF-8?q?=E6=97=85=20=E5=88=A0=E6=8E=89=E6=BC=AB=E6=B8=B8=E6=8C=89?= =?UTF-8?q?=E9=92=AE]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mogo/och/bus/passenger/ui/BusPassengerBaseFragment.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git 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 index 8f5bfed4cd..8685f237c3 100644 --- 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 Date: Fri, 14 Jul 2023 14:08:19 +0800 Subject: [PATCH 17/20] [3.3.2] change the time from 1200 to 1000 and invoke status from request to map invoke --- .../function/hmi/ui/widget/RomaBusView.kt | 38 +++++++++--------- .../hmi/ui/widget/RomaPassengerView.kt | 25 ++++++------ .../function/hmi/ui/widget/RomaTaxiView.kt | 39 ++++++++++--------- .../business/ai/AiCloudIdentifyDataManager.kt | 8 ++-- 4 files changed, 59 insertions(+), 51 deletions(-) diff --git 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 index d40a38bbf6..21077b9aaf 100644 --- 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,8 +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.kotlin.onClick 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 @@ -57,7 +57,7 @@ class RomaBusView @JvmOverloads constructor( } setOnClickListener { - if (ClickUtils.isClickTooFrequent(this,1200)) { + if (ClickUtils.isClickTooFrequent(this,1000)) { return@setOnClickListener } if(!click){ @@ -76,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) } } diff --git 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 index f5f898c69f..a613c48a60 100644 --- 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 @@ -11,6 +11,7 @@ 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( @@ -41,7 +42,7 @@ class RomaPassengerView @JvmOverloads constructor( normalRes = a.getResourceId(R.styleable.RomaPassengerView_roma_close, 0) a.recycle() setOnClickListener { - if (ClickUtils.isClickTooFrequent(this,1200)) { + if (ClickUtils.isClickTooFrequent(this,1000)) { return@setOnClickListener } if(!click){ @@ -66,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) + } } } } diff --git 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 index e455c67d8f..1dae638eca 100644 --- 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,8 +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.ClickUtils -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 @@ -56,7 +55,7 @@ class RomaTaxiView @JvmOverloads constructor( } setOnClickListener { - if (ClickUtils.isClickTooFrequent(this,1200)) { + if (ClickUtils.isClickTooFrequent(this,1000)) { return@setOnClickListener } if(!click){ @@ -75,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) } } diff --git 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 index 5bf0a09b3a..48846c8347 100644 --- 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 @@ -3,6 +3,7 @@ package com.mogo.eagle.core.function.business.ai import android.content.Context import android.os.Handler import android.os.Message +import android.util.Log import com.mogo.aicloud.services.socket.IMogoOnMessageListener import com.mogo.aicloud.services.socket.MogoAiCloudSocketManager import com.mogo.commons.debug.DebugConfig @@ -218,9 +219,6 @@ class AiCloudIdentifyDataManager : IMoGoPlanningRottingListener, if (dataReceive) { // 请求地图开始漫游 MogoMapUIController.getInstance().setRomaMode(FunctionBuildConfig.romaModeStyle) - CallerMapRomaListener.invokeMapRoma(true) - } else { - CallerMapRomaListener.invokeMapRoma(false) } }, { errorMsg -> @@ -249,6 +247,7 @@ class AiCloudIdentifyDataManager : IMoGoPlanningRottingListener, //status 0：进入漫游模式成功 1；进入漫游模式失败 2：正常结束漫游 3：切换视角结束漫游 override fun mapRomaStatus(status: Int, msg: String) { super.mapRomaStatus(status, msg) + Log.d("emArrow","Thread:${Thread.currentThread().name}") when (status) { 0 -> { MapBizTrace.log( @@ -259,6 +258,7 @@ class AiCloudIdentifyDataManager : IMoGoPlanningRottingListener, ) showAiCloud.set(true) FunctionBuildConfig.isDrawIdentifyData = false + CallerMapRomaListener.invokeMapRoma(true) // 5秒没有触发 则预警日志写入 handler.sendEmptyMessageDelayed(H_ERROR_CLOUD, H_DELAY_TIME) } @@ -267,6 +267,7 @@ class AiCloudIdentifyDataManager : IMoGoPlanningRottingListener, m.what = H_ERROR_MAP m.obj = msg handler.sendMessage(m) + CallerMapRomaListener.invokeMapRoma(false) closeRoma(false) } 2 -> { // 地图自动漫游结束，重置状态，调用close通知服务端 @@ -298,6 +299,7 @@ class AiCloudIdentifyDataManager : IMoGoPlanningRottingListener, aiCloudDataChange.set(false) MapIdentifySubscriber.instance.clearAiCloudRoma() FunctionBuildConfig.isDrawIdentifyData = true + CallerMapRomaListener.invokeMapRoma(false) if (invokeCloud) { closeRoma(false) } From 698e715da42b253f8e5e76b5f69d149f9148613a Mon Sep 17 00:00:00 2001 From: zhongchao Date: Fri, 14 Jul 2023 14:15:01 +0800 Subject: [PATCH 18/20] [3.3.2]removelog --- .../core/function/business/ai/AiCloudIdentifyDataManager.kt | 2 -- 1 file changed, 2 deletions(-) diff --git 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 index 48846c8347..79881fcaf7 100644 --- 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 @@ -3,7 +3,6 @@ package com.mogo.eagle.core.function.business.ai import android.content.Context import android.os.Handler import android.os.Message -import android.util.Log import com.mogo.aicloud.services.socket.IMogoOnMessageListener import com.mogo.aicloud.services.socket.MogoAiCloudSocketManager import com.mogo.commons.debug.DebugConfig @@ -247,7 +246,6 @@ class AiCloudIdentifyDataManager : IMoGoPlanningRottingListener, //status 0：进入漫游模式成功 1；进入漫游模式失败 2：正常结束漫游 3：切换视角结束漫游 override fun mapRomaStatus(status: Int, msg: String) { super.mapRomaStatus(status, msg) - Log.d("emArrow","Thread:${Thread.currentThread().name}") when (status) { 0 -> { MapBizTrace.log( From 3e7377412c2143a66f69c3fa6a169b017ae2b3da Mon Sep 17 00:00:00 2001 From: zhongchao Date: Fri, 14 Jul 2023 14:50:40 +0800 Subject: [PATCH 19/20] [3.3.2] revert the change --- .../mogo/eagle/core/function/hmi/ui/widget/RomaBusView.kt | 2 +- .../eagle/core/function/hmi/ui/widget/RomaPassengerView.kt | 2 +- .../mogo/eagle/core/function/hmi/ui/widget/RomaTaxiView.kt | 2 +- .../core/function/business/ai/AiCloudIdentifyDataManager.kt | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git 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 index 21077b9aaf..db0ec82a18 100644 --- 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 @@ -57,7 +57,7 @@ class RomaBusView @JvmOverloads constructor( } setOnClickListener { - if (ClickUtils.isClickTooFrequent(this,1000)) { + if (ClickUtils.isClickTooFrequent(this,1200)) { return@setOnClickListener } if(!click){ diff --git 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 index a613c48a60..1517ae014b 100644 --- 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 @@ -42,7 +42,7 @@ class RomaPassengerView @JvmOverloads constructor( normalRes = a.getResourceId(R.styleable.RomaPassengerView_roma_close, 0) a.recycle() setOnClickListener { - if (ClickUtils.isClickTooFrequent(this,1000)) { + if (ClickUtils.isClickTooFrequent(this,1200)) { return@setOnClickListener } if(!click){ diff --git 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 index 1dae638eca..e6040d4a8c 100644 --- 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 @@ -55,7 +55,7 @@ class RomaTaxiView @JvmOverloads constructor( } setOnClickListener { - if (ClickUtils.isClickTooFrequent(this,1000)) { + if (ClickUtils.isClickTooFrequent(this,1200)) { return@setOnClickListener } if(!click){ diff --git 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 index 79881fcaf7..38a12c9e6b 100644 --- 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 @@ -218,6 +218,9 @@ class AiCloudIdentifyDataManager : IMoGoPlanningRottingListener, if (dataReceive) { // 请求地图开始漫游 MogoMapUIController.getInstance().setRomaMode(FunctionBuildConfig.romaModeStyle) + CallerMapRomaListener.invokeMapRoma(true) + }else{ + CallerMapRomaListener.invokeMapRoma(false) } }, { errorMsg -> @@ -256,7 +259,6 @@ class AiCloudIdentifyDataManager : IMoGoPlanningRottingListener, ) showAiCloud.set(true) FunctionBuildConfig.isDrawIdentifyData = false - CallerMapRomaListener.invokeMapRoma(true) // 5秒没有触发 则预警日志写入 handler.sendEmptyMessageDelayed(H_ERROR_CLOUD, H_DELAY_TIME) } @@ -265,7 +267,6 @@ class AiCloudIdentifyDataManager : IMoGoPlanningRottingListener, m.what = H_ERROR_MAP m.obj = msg handler.sendMessage(m) - CallerMapRomaListener.invokeMapRoma(false) closeRoma(false) } 2 -> { // 地图自动漫游结束，重置状态，调用close通知服务端 @@ -297,7 +298,6 @@ class AiCloudIdentifyDataManager : IMoGoPlanningRottingListener, aiCloudDataChange.set(false) MapIdentifySubscriber.instance.clearAiCloudRoma() FunctionBuildConfig.isDrawIdentifyData = true - CallerMapRomaListener.invokeMapRoma(false) if (invokeCloud) { closeRoma(false) } From 97546ddb02c2e45be8eaec3d266ad142540e163b Mon Sep 17 00:00:00 2001 From: pangfan Date: Fri, 14 Jul 2023 15:11:13 +0800 Subject: [PATCH 20/20] =?UTF-8?q?[3.3.2/2.3.2]=E5=90=8C=E6=97=B6=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E6=8E=A5=E9=A9=B3app=E7=89=88=E6=9C=AC=E5=8F=B7?= =?UTF-8?q?=EF=BC=88Saas=E7=A6=8F=E5=B7=9EB1=E6=8E=A5=E9=A9=B3=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gradle.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index 6240a28387..13815adaa1 100644 --- a/gradle.properties +++ b/gradle.properties @@ -159,9 +159,9 @@ BUS_DRIVER_VERSION=3.3.2 # 公交模式乘客端端版本号 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.2 # 出租车模式乘客端端版本号