diff --git a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt index ace1d003fa..6cbb266c46 100644 --- a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt +++ b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt @@ -119,6 +119,8 @@ object CharterPassengerModel { private var subscribeCountDown: Disposable?=null var switchLine5minWait: Disposable?=null + private var newCheckSite:SiteInfoResponse.SiteInfo? = null + fun init() { initListeners() queryLoginStatus() @@ -647,6 +649,9 @@ object CharterPassengerModel { /** * 结束启动路距计算 + * ① 订单结束 + * ② 选择站点司机端同意后 + * ③ 到站成功后 */ private fun endCalculateDistanceLoop() { BusPassengerModelLoopManager.removeLoopFunction(TAGDISTANCE) @@ -659,6 +664,11 @@ object CharterPassengerModel { //mLocation gcj坐标 mLocationGCJ02?.let { orderInfo?.let { order -> + newCheckSite?.let { + if(it.siteId!=order.siteId){ + return + } + } // 启动轨迹计算 var lastSumLength = 0f val orderLonLat = @@ -970,11 +980,12 @@ object CharterPassengerModel { private fun isSuccess(requestSuccessSign: String) = broadcastList[requestSuccessSign] == null || broadcastList[requestSuccessSign] == false - fun cleanbroadcastListInfo(){ + fun cleanbroadcastListInfo(checkSite: SiteInfoResponse.SiteInfo?) { switchLine5minWait = RxUtils.createSubscribe(5 * 60 * 1000) { CallerLogger.d(M_BUS_P + BaseDPMsg.TAG, "5分钟倒计时可以选择线路了") } broadcastList.clear() + newCheckSite = checkSite // 到站结束自驾 CallerAutoPilotControlManager.cancelAutoPilot() // 停止路距计算