From 38c8a35556a2b662217da66d494d566589384e53 Mon Sep 17 00:00:00 2001
From: yangyakun <yangyakun@zhidaoauto.com>
Date: Thu, 9 Mar 2023 23:13:36 +0800
Subject: [PATCH] =?UTF-8?q?[m1]=20[1.1.2]=20[=E9=80=89=E6=8B=A9=E7=BA=BF?=
 =?UTF-8?q?=E8=B7=AF=E5=92=8C=E7=AB=99=E7=82=B9]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bus/passenger/model/CharterPassengerModel.kt  |  6 +++---
 .../passenger/presenter/BusPassengerPresenter.kt  |  5 ++++-
 .../och/bus/passenger/ui/view/LineSiteView.kt     | 15 +++++++++++----
 3 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt
index 87f5e7edbb..61c0e352ad 100644
--- a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt
+++ b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt
@@ -512,14 +512,14 @@ object CharterPassengerModel {
                                 it.dispose()
                             }
                         }
-                        val leadTime = endlast / 1000
+                        val leadTime = endlast / 1000+60
                         subscribeCountDown =
                         Observable.intervalRange(0L, leadTime, 0, 1, TimeUnit.SECONDS)
                             .map { aLong -> leadTime - aLong }
                             .subscribeOn(Schedulers.io())
                             .observeOn(Schedulers.io())
                             .subscribe{millisUntilFinished->
-                                if (millisUntilFinished <= 300L) {
+                                if (millisUntilFinished <= 360L) {
                                     orderInfo?.let {
                                         if (broadcastList.get("${it}$min5Speak") == null
                                             || broadcastList.get("${it}$min5Speak") == false
@@ -544,7 +544,7 @@ object CharterPassengerModel {
                                     }
                                     iDistanceTimeCallback?.setOrderTimeCallBack(-1)
                                 }else{
-                                    iDistanceTimeCallback?.setOrderTimeCallBack(millisUntilFinished+60)
+                                    iDistanceTimeCallback?.setOrderTimeCallBack(millisUntilFinished)
                                 }
                                 CallerLogger.d(
                                     M_BUS_P + TAG,
diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusPassengerPresenter.kt b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusPassengerPresenter.kt
index 578c629247..d39f78c6a9 100644
--- a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusPassengerPresenter.kt
+++ b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusPassengerPresenter.kt
@@ -158,7 +158,10 @@ class BusPassengerPresenter(view: MainFragment?) :
             setOrderTime("--","--")
             return
         }
-        val surplusTime = (timeInSecond / 60).toInt()
+        var surplusTime = (timeInSecond / 60).toInt()
+        if(surplusTime==0){
+            surplusTime = 1
+        }
 
         val beforeTime = Calendar.getInstance()
         beforeTime.add(Calendar.MINUTE, surplusTime)
diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/view/LineSiteView.kt b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/view/LineSiteView.kt
index ee41893145..2561332e9e 100644
--- a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/view/LineSiteView.kt
+++ b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/view/LineSiteView.kt
@@ -107,13 +107,13 @@ class LineSiteView @JvmOverloads constructor(
             checkSite = hasSetLineAndSite.second
             lineList.clear()
             resetData()
-            isChangeIngLineAndSite = true
         } else {
             queryLineList()
             setEnableLineStatus(true)
             setEnableSiteStatus(false)
             onlyChangeSite(false)
             setSiteAdapterEnable(false)
+            setSwitchEnable(false)
             isChangeIngLineAndSite = false
         }
 
@@ -137,6 +137,7 @@ class LineSiteView @JvmOverloads constructor(
                 setEnableSiteStatus(false)
                 onlyChangeSite(false)
                 setSiteAdapterEnable(true)
+                isChangeIngLineAndSite = true
                 lineAdapter.submitLine(it)
                 checkLine?.let {
                     querySitesByLineId(it.lineId.toString(),false)
@@ -210,12 +211,13 @@ class LineSiteView @JvmOverloads constructor(
 
         }
         tv_line_cancle.onClick {
-            isChangeIngLineAndSite = false
             resetData()
+            tempCheckLine = null
         }
         tv_site_cancle.onClick {
-            isChangeIngLineAndSite = false
             resetData()
+            tempCheckLine = null
+            tempCheckSite = null
         }
         tv_line_submit.onClick {
             if (tempCheckLine == null) {
@@ -333,6 +335,9 @@ class LineSiteView @JvmOverloads constructor(
             }
         }
     }
+    private fun setSwitchEnable(enable: Boolean){
+        tv_switch_line.isEnabled = enable
+    }
 
     /**
      * 接收司机屏反馈信息
@@ -353,6 +358,7 @@ class LineSiteView @JvmOverloads constructor(
                                 setEnableSiteStatus(true)
                                 onlyChangeSite(false)
                                 setSiteAdapterEnable(true)
+                                setSwitchEnable(false)
                                 tempCheckLineIsSubmit = true
                                 tempCheckLine?.let {
                                     lineAdapter.submitLine(it)
@@ -368,6 +374,7 @@ class LineSiteView @JvmOverloads constructor(
                                 setEnableSiteStatus(true)
                                 onlyChangeSite(false)
                                 setSiteAdapterEnable(true)
+                                setSwitchEnable(true)
                                 checkLine = tempCheckLine
                                 checkSite = tempCheckSite
                                 tempCheckLine = null
@@ -378,7 +385,7 @@ class LineSiteView @JvmOverloads constructor(
                                 }
                                 go2StartCar()
                             } else {
-                                tempCheckLineIsSubmit = false
+                                tempCheckLineIsSubmit = true
                                 ToastUtils.showShort("司机端拒绝请重新选择")
                             }
                         }