[charter]

[3.2.0]
[站点保存和切换判断]

OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/bean/response/OrderInfoResponse.kt

@@ -16,7 +16,7 @@ data class OrderInfoResponse(val data: OrderInfo?) : BaseData() {
         var startSiteName: String?,
         var startSiteNameKr: String?,
         var siteId: Long?,//站点id
-        val siteName: String?,//站点名称
+        var siteName: String?,//站点名称
         val siteNameKr: String?,//站点名称
         var wgs84Lat: Double?,
         var wgs84Lon: Double?,
@@ -25,7 +25,7 @@ data class OrderInfoResponse(val data: OrderInfo?) : BaseData() {
         val startTime: Long?,//开始时间
         val endTime: Long?,//结束时间
         val passengerPhone: String?,//乘客手机号
-        val arriveStatus:Int?,//1:未到达 2:到达
+        var arriveStatus:Int?,//1:未到达 2:到达
     )
     companion object{
         val ARRIVING = 1

OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt

@@ -121,6 +121,9 @@ object CharterPassengerModel {
     private var subscribeCountDown: Disposable?=null
     var switchLine5minWait: Disposable?=null
 
+    @Volatile
+    var newCheckedSite: SiteInfoResponse.SiteInfo? = null
+
     fun init() {
         initListeners()
         queryLoginStatus()
@@ -368,6 +371,7 @@ object CharterPassengerModel {
         BusPassengerServiceManager.queryOrderInfo(
             mContext, object : OchCommonServiceCallback<OrderInfoResponse> {
                 override fun onSuccess(data: OrderInfoResponse?) {
+                    CallerLogger.d(M_BUS_P+TAG,"订单信息:$data")
                     if (data?.data == null){
                         if(orderInfo!=null){
                             // 启动车辆服务状态
@@ -674,6 +678,11 @@ object CharterPassengerModel {
                 ){
                     return
                 }
+                newCheckedSite?.let {
+                    if(it.siteId!=order.siteId){
+                        return
+                    }
+                }
                 // 启动轨迹计算
                 var lastSumLength = 0f
                 val orderLonLat =
@@ -945,7 +954,7 @@ object CharterPassengerModel {
                     order.startSiteId ?: 0,
                     order.startSiteName ?: "",
                     siteId.toInt(),
-                    order.siteName,
+                    order.siteName?:"",
                     true,
                     OrderInfoResponse.ARRIVED,
                     currentTimeStamp
@@ -998,16 +1007,19 @@ 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分钟倒计时可以选择线路了")
         }
+        newCheckedSite = checkSite
         cleanRoutePoints()
         broadcastList.clear()
         orderInfo?.let {
-            it.siteId = 0
-            it.wgs84Lon = 0.0
-            it.wgs84Lat = 0.0
+            it.siteId = checkSite?.siteId
+            it.wgs84Lon = checkSite?.Wgs84Lon
+            it.wgs84Lat = checkSite?.Wgs84Lat
+            it.siteName = checkSite?.siteName
+            it.arriveStatus = OrderInfoResponse.ARRIVING
         }
         // 到站结束自驾
         CallerAutoPilotControlManager.cancelAutoPilot()

OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/net/BusPassengerModelLoopManager.kt

@@ -69,7 +69,7 @@ object BusPassengerModelLoopManager {
                         if (it % loopInfo.interval == 0L) {
                             try {
                                 loopInfo.function.invoke()
-                                CallerLogger.d(TAG, "${aLong}正在执行方法${tag}")
+                                CallerLogger.d(TAG, "${aLong}对象${loopInfo}正在执行方法${tag}")
                             }catch (e:Throwable){
                                 e.printStackTrace()
                                 CallerLogger.e(TAG,"$tag:--$e")

OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionOrderPresenter.kt

@@ -221,7 +221,7 @@ class BusPassengerFunctionOrderPresenter(view: M1OrderLineFragment?) :
                                 mView?.lineAdapterSubmit(it)
                             }
                             mView?.hideDataDriverAgree()
-                            CharterPassengerModel.cleanbroadcastListInfo()
+                            CharterPassengerModel.cleanbroadcastListInfo(checkSite)
                             CharterPassengerModel.queryOrder()
                         } else {
                             ToastCharterUtils.showShort("司机端拒绝请重新选择")