[3.2.0] 1、更换M2自车模型 2、修复M1 5分钟还车提示偶现2次问题

OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/fragment/DriverM1Fragment.kt

@@ -73,6 +73,7 @@ class DriverM1Fragment : CharterBaseFragment<DriverM1Fragment?, DriverM1Presente
 
     fun updateOrderUI(orderStatus: QueryCurrentOrderResponse.Result){
         requireActivity().runOnUiThread {
+            isReturn5MTip = false
             showOrHideOrderUI(true)
 
             passenger_phone.text = String.format(resources.getString(R.string.passenger_phone)
@@ -104,6 +105,7 @@ class DriverM1Fragment : CharterBaseFragment<DriverM1Fragment?, DriverM1Presente
         if (minutes >= 0){
             startCountDownTimer(minutes,LOOP_PERIOD_60S)
         }else{
+            isReturn5MTip = false
             clearCountDownTimer()
         }
     }
@@ -203,6 +205,7 @@ class DriverM1Fragment : CharterBaseFragment<DriverM1Fragment?, DriverM1Presente
 
     fun updateReturnCarStatus(returnSuccess: Boolean) {
         requireActivity().runOnUiThread {
+            isReturn5MTip = false
             group_stations_panel.visibility = GONE
             no_line_data_view.visibility = VISIBLE
             no_order_data_tv.text = resources.getString(R.string.bus_no_task_tip)
@@ -216,6 +219,8 @@ class DriverM1Fragment : CharterBaseFragment<DriverM1Fragment?, DriverM1Presente
     }
 
 
+    private var isReturn5MTip: Boolean = false
+
     private fun startCountDownTimer(total: Long, countDownInterval:Long){
         clearCountDownTimer()
         countDownTimer = object : CountDownTimer(total,countDownInterval){
@@ -226,8 +231,9 @@ class DriverM1Fragment : CharterBaseFragment<DriverM1Fragment?, DriverM1Presente
                     resources.getString(R.string.count_down_txt)
                     ,minute.roundToInt())
 
-                if(minute.toInt() == 5){//还车提示
+                if(minute.roundToInt() == 5 && !isReturn5MTip){//还车提示
                     mPresenter?.carReturnTip()
+                    isReturn5MTip = true
                 }
                 d(SceneConstant.M_CHARTER_D + TAG, "倒计时分钟 = ${minute.roundToInt()}" )
             }

OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/model/DriverM1LooperManager.kt

@@ -51,7 +51,7 @@ object DriverM1LooperManager {
         CallerLogger.i(SceneConstant.M_CHARTER_D + TAG, "starCountDownLoop()")
         mQueryCountDownDisposable = Observable.interval(
             CharterConst.LOOP_DELAY,
-            CharterConst.LOOP_3M, TimeUnit.MILLISECONDS
+            CharterConst.LOOP_5M, TimeUnit.MILLISECONDS
         )
             .map { aLong: Long -> aLong + 1 }
             .subscribeOn(Schedulers.io())

OCH/mogo-och-charter/src/main/java/com/magic/mogo/och/charter/constant/CharterConst.kt

@@ -49,7 +49,7 @@ class CharterConst {
         const val ARRIVE_AT_END_STATION_DISTANCE = 10
 
         // 轮询
-        const val LOOP_3M = 5 * 60 * 1000L
+        const val LOOP_5M = 5 * 60 * 1000L
         const val LOOP_2S = 2 * 1000L
         const val LOOP_1S = 1 * 1000L
         const val LOOP_DELAY_500 = 500L

OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/model/PM2DrivingModel.kt

@@ -362,7 +362,7 @@ class PM2DrivingModel private constructor() {
 
                         if (data == null || data.result == null){
                             if (routesResult != null) {
-                                routesResult == null
+                                routesResult = null
                                 updateLocalOrder()
                                 d(SceneConstant.M_BUS_P+TAG, "queryDriverSiteByCoordinate= result is null")
                                 return