[m1]

[倒计时]
[添加到站记录项：1、底盘传递2订单轮训3距离展示(新增)]

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

@@ -710,6 +710,9 @@ object CharterPassengerModel {
                 "---lastSumLength: " + lastSumLength + "----lastTime : " + lastTime
                         + " thread = " + Thread.currentThread().name
             )
+            if (lastSumLength < CharterPassengerConst.ARRIVE_AT_START_STATION_DISTANCE) {
+                arriveDest()
+            }
             iDistanceTimeCallback?.setDistancecAndTime(lastSumLength.toLong(), lastTime.toLong())
         }
     }

OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/view/LineSiteView.kt

@@ -255,6 +255,11 @@ class LineSiteView @JvmOverloads constructor(
                     TAGLINELOOP,
                     LoopInfo(3, ::checkServerStatus)
                 )
+                RxUtils.disposeSubscribe(subscribeSelectLine)
+                subscribeSelectLine= RxUtils.createSubscribe(120_000){
+                    ToastUtils.showShort("请联系安全员确认")
+                    endAni()
+                }
             }
         }
         tv_site_submit.onClick {
@@ -288,8 +293,8 @@ class LineSiteView @JvmOverloads constructor(
                     TAGLINELOOP,
                     LoopInfo(3, ::checkServerStatus)
                 )
-                RxUtils.disposeSubscribe(subscribeSelectLine)
-                subscribeSelectLine= RxUtils.createSubscribe(120_000){
+                RxUtils.disposeSubscribe(subscribeSelectSite)
+                subscribeSelectSite = RxUtils.createSubscribe(120_000){
                     ToastUtils.showShort("请联系安全员确认")
                     endAni()
                 }