From e892bbdbab01ec80e156de1254479b4359c4c8b6 Mon Sep 17 00:00:00 2001
From: yangyakun <yangyakun@zhidaoauto.com>
Date: Thu, 23 Feb 2023 14:43:20 +0800
Subject: [PATCH] =?UTF-8?q?[m1]=20[1.0.2]=20[=E7=A9=BA=E8=B0=83=E5=92=8C?=
 =?UTF-8?q?=E6=9A=96=E9=A3=8E=E6=9C=BA=E7=AD=89=E5=BE=85=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E6=94=BE=E5=A4=A7=E5=88=B015s]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../presenter/BusPassengerFunctionSoftPresenter.kt   | 12 ++++++------
 .../passenger/ui/BusPassengerFunctionSoftFragment.kt |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionSoftPresenter.kt b/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionSoftPresenter.kt
index 5509d06e44..cfb76d85a3 100644
--- a/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionSoftPresenter.kt
+++ b/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionSoftPresenter.kt
@@ -136,7 +136,7 @@ class BusPassengerFunctionSoftPresenter(view: BusPassengerFunctionSoftFragment?)
                 "打开空调，模式$modeCmd--档位${windSpeedCmd}--温度:$temperatureCmd")
         CallerAutoPilotControlManager.sendRoboBusJinlvM1AirConditionerCmd(1,modeCmd,windSpeedCmd,temperatureCmd)
         disposeSubscribe(airconditionDisposable)
-        airconditionDisposable = createSubscribe(5000){
+        airconditionDisposable = createSubscribe(15000){
             if (!OCHM1LightAirconditionDoorStatusManager.airconditionStatus.isOpen&&
                 OCHM1LightAirconditionDoorStatusManager.airconditionStatus.windSpeed!=windSpeedCmd&&
                 OCHM1LightAirconditionDoorStatusManager.airconditionStatus.temperature!=temperatureCmd&&
@@ -149,7 +149,7 @@ class BusPassengerFunctionSoftPresenter(view: BusPassengerFunctionSoftFragment?)
         CallerLogger.d(SceneConstant.M_BUS_P + TAG, "关闭空调")
         CallerAutoPilotControlManager.sendRoboBusJinlvM1AirConditionerCmd(2,0,0,0)
         disposeSubscribe(airconditionDisposable)
-        airconditionDisposable = createSubscribe(5000){
+        airconditionDisposable = createSubscribe(15000){
             if (OCHM1LightAirconditionDoorStatusManager.airconditionStatus.isOpen) {
                 ToastUtils.showShort("空调操作未生效，请稍后重试吧～")
             }
@@ -162,7 +162,7 @@ class BusPassengerFunctionSoftPresenter(view: BusPassengerFunctionSoftFragment?)
         CallerLogger.d(SceneConstant.M_BUS_P + TAG, "打开暖风机、档位${windSpeedCmd}")
         CallerAutoPilotControlManager.sendRoboBusJinlvM1HeaderCmd(1,windSpeedCmd)
         disposeSubscribe(heaterDisposable)
-        heaterDisposable = createSubscribe(5000){
+        heaterDisposable = createSubscribe(15000){
             if (!OCHM1LightAirconditionDoorStatusManager.heaterStatue.isOpen&&
                 OCHM1LightAirconditionDoorStatusManager.heaterStatue.windSpeed!=windSpeedCmd) {
                 ToastUtils.showShort("暖风机操作未生效，请稍后重试吧～")
@@ -174,9 +174,9 @@ class BusPassengerFunctionSoftPresenter(view: BusPassengerFunctionSoftFragment?)
         CallerLogger.d(SceneConstant.M_BUS_P + TAG, "关闭暖风机")
         CallerAutoPilotControlManager.sendRoboBusJinlvM1HeaderCmd(2,0)
         disposeSubscribe(heaterDisposable)
-        heaterDisposable = createSubscribe(5000){
-            if (!OCHM1LightAirconditionDoorStatusManager.heaterStatue.isOpen) {
-                ToastUtils.showShort("暖风机操作未生效，请稍后重试吧～")
+        heaterDisposable = createSubscribe(15000){
+            if (OCHM1LightAirconditionDoorStatusManager.heaterStatue.isOpen) {
+                ToastUtils.showShort("暖风机操作未生效，请稍后重试吧～")//还是开着的
             }
         }
     }
diff --git a/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/BusPassengerFunctionSoftFragment.kt b/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/BusPassengerFunctionSoftFragment.kt
index 8f7137cde6..04359a9e16 100644
--- a/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/BusPassengerFunctionSoftFragment.kt
+++ b/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/BusPassengerFunctionSoftFragment.kt
@@ -125,7 +125,7 @@ class BusPassengerFunctionSoftFragment :
         loadingAni.target = iv_loading
         loadingAni.start()
         g_aircondition_setting.visibility = View.GONE
-        subscribeAnimator = Observable.timer(5000, TimeUnit.MILLISECONDS)
+        subscribeAnimator = Observable.timer(15000, TimeUnit.MILLISECONDS)
             .observeOn(AndroidSchedulers.mainThread())
             .subscribe {
                 loadingAni.cancel()