From 95d138ed4dad2ddab3247723487249b82463eeda Mon Sep 17 00:00:00 2001
From: wangmingjun <wangmingjun@zhidaoauto.com>
Date: Wed, 1 Mar 2023 11:01:56 +0800
Subject: [PATCH] =?UTF-8?q?[charter]=20=E5=8F=B8=E6=9C=BA=E7=AB=AF?=
 =?UTF-8?q?=E5=88=B0=E8=BD=AE=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../och/charter/model/DriverM1LooperManager.kt     | 14 ++++++++------
 .../magic/mogo/och/charter/model/DriverM1Model.kt  |  2 ++
 .../och/charter/presenter/DriverM1Presenter.kt     |  4 ++--
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/model/DriverM1LooperManager.kt b/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/model/DriverM1LooperManager.kt
index 9b559d7109..dcdcff4420 100644
--- a/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/model/DriverM1LooperManager.kt
+++ b/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/model/DriverM1LooperManager.kt
@@ -30,9 +30,10 @@ object DriverM1LooperManager {
         )
             .map { aLong: Long -> aLong + 1 }
             .subscribeOn(Schedulers.io())
-            .observeOn(AndroidSchedulers.mainThread())
-            .subscribe {
-                DriverM1Model.get().queryCurrentServiceStatus()
+            .subscribe { aLong: Long? ->
+                aLong?.let {
+                    DriverM1Model.get().queryCurrentServiceStatus()
+                }
             }
     }
 
@@ -55,9 +56,10 @@ object DriverM1LooperManager {
         )
             .map { aLong: Long -> aLong + 1 }
             .subscribeOn(Schedulers.io())
-            .observeOn(AndroidSchedulers.mainThread())
-            .subscribe {
-                DriverM1Model.get().checkOrderCountDown()
+            .subscribe {aLong: Long? ->
+                aLong?.let {
+                    DriverM1Model.get().checkOrderCountDown()
+                }
             }
     }
 
diff --git a/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/model/DriverM1Model.kt b/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/model/DriverM1Model.kt
index ca7cdca25d..c455028ca4 100644
--- a/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/model/DriverM1Model.kt
+++ b/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/model/DriverM1Model.kt
@@ -377,6 +377,7 @@ class DriverM1Model {
     }
 
     private fun onArriveAt() {
+        isArrivedStation = true
        // todo 需要告诉前后外屏到站
     }
 
@@ -559,6 +560,7 @@ class DriverM1Model {
                     if (data == null || data.code != 0){
                         return
                     }
+                    stopQueryCurrentOrder()
                     d(SceneConstant.M_CHARTER_D + TAG, "queryCurrentServiceStatus success = "
                       + GsonUtils.toJson(data.data))
 
diff --git a/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/presenter/DriverM1Presenter.kt b/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/presenter/DriverM1Presenter.kt
index 7adc772c21..3be5cf11ad 100644
--- a/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/presenter/DriverM1Presenter.kt
+++ b/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/presenter/DriverM1Presenter.kt
@@ -68,12 +68,12 @@ class DriverM1Presenter(view: DriverM1Fragment?) :
             // 查询服务状态
             DriverM1Model.get().queryCurrentServiceStatus()
         } else {
-            DriverM1Model.get().stopQueryCurrentOrder()
+            DriverM1Model.get().startQueryCurrentOrder()
         }
     }
 
     override fun loginFail(isLogin: Boolean) {
-        DriverM1Model.get().stopQueryCurrentOrder()
+        DriverM1Model.get().startQueryCurrentOrder()
     }
 
     // 登出