From afc7f020e076b97ef8098a136e17bd54ea0574da Mon Sep 17 00:00:00 2001
From: yangyakun <yangyakun@zhidaoauto.com>
Date: Mon, 22 May 2023 11:14:29 +0800
Subject: [PATCH] =?UTF-8?q?[gradle]=20[3.2.0]=20[=E9=80=9F=E5=BA=A6?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=BA=E5=B9=B3=E5=9D=87=E9=80=9F=E5=BA=A6?=
 =?UTF-8?q?=E3=80=81=E5=90=AF=E5=8A=A8=E8=87=AA=E5=8A=A8=E9=A9=BE=E9=A9=B6?=
 =?UTF-8?q?=E5=A4=B1=E8=B4=A5=E5=90=8E=E5=BC=B9=E7=9A=84=E5=90=90=E5=8F=B8?=
 =?UTF-8?q?]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../passenger/model/CharterPassengerModel.kt  |  2 +-
 .../ui/view/bottom/impl/GoViewWithArrive.kt   | 26 +++++++------------
 2 files changed, 11 insertions(+), 17 deletions(-)

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 f095ddfb2f..08e8267759 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
@@ -687,7 +687,7 @@ object CharterPassengerModel {
                         )
                 }
 
-                val lastTime: Double = lastSumLength / it.gnssSpeed * 3.6 //秒
+                val lastTime: Double = lastSumLength / CharterPassengerConst.Charter_AVERAGE_SPEED * 3.6 //秒
 
                 CallerLogger.d(M_BUS_P + "calculateDistance",
                     "---lastSumLength: " + lastSumLength + "----lastTime : " + lastTime
diff --git a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/view/bottom/impl/GoViewWithArrive.kt b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/view/bottom/impl/GoViewWithArrive.kt
index cb20a12286..fde8730cdb 100644
--- a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/view/bottom/impl/GoViewWithArrive.kt
+++ b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/view/bottom/impl/GoViewWithArrive.kt
@@ -82,10 +82,7 @@ class GoViewWithArrive @JvmOverloads constructor(
                 ToastUtils.showShort("设备未就绪请稍等")
             }
             IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_ENABLE -> {//
-                CallerAutoPilotControlManager.sendPlanningCmd(2)
-                CharterPassengerModel.startAutopilot()
                 onceRegisterAutoStatus()
-                CharterPassengerModel.sendTripInfo()
             }
             IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING -> {
                 // 重新起步
@@ -102,14 +99,13 @@ class GoViewWithArrive @JvmOverloads constructor(
 
     override fun onDetachedFromWindow() {
         super.onDetachedFromWindow()
-        startAutoTimeOut?.let {
-            if (!it.isDisposed) {
-                it.dispose()
-            }
-        }
+        RxUtils.disposeSubscribe(startAutoTimeOut)
     }
 
     private fun onceRegisterAutoStatus() {
+        CallerAutoPilotControlManager.sendPlanningCmd(2)
+        CharterPassengerModel.startAutopilot()
+        CharterPassengerModel.sendTripInfo()
         CharterPassengerModel.setAutoStatusCallback(TAG,null)
         CharterPassengerModel.setAutoStatusCallback(TAG,object :ICharterPassengerAutoStatusChangeCallback{
             override fun onAutoStatusChange(newState: Int) {
@@ -119,15 +115,13 @@ class GoViewWithArrive @JvmOverloads constructor(
                 CharterPassengerModel.setAutoStatusCallback(TAG,null)
             }
         })
-        startAutoTimeOut?.let {
-            if (!it.isDisposed) {
-                it.dispose()
-            }
-        }
+        RxUtils.disposeSubscribe(startAutoTimeOut)
         startAutoTimeOut = RxUtils.createSubscribe(20_000) {
-            val string = AbsMogoApplication.getApp().getString(R.string.m1_start_auto_fail)
-            ToastUtils.showLong(string)
-            CharterPassengerModel.setAutoStatusCallback(TAG,null)
+            if (CallerAutoPilotStatusListenerManager.getAutoPilotStatusInfo().state != IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING) {
+                val string = AbsMogoApplication.getApp().getString(R.string.m1_start_auto_fail)
+                ToastUtils.showLong(string)
+            }
+            CharterPassengerModel.setAutoStatusCallback(TAG, null)
         }
     }
 }
\ No newline at end of file