From ee0c1cbdd32d92f1289ae35382e3326b8c6ac4c2 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Fri, 17 Feb 2023 12:08:05 +0800 Subject: [PATCH] =?UTF-8?q?[m2]=20[1.0.1]=20[=E6=B7=BB=E5=8A=A0=E5=90=90?= =?UTF-8?q?=E5=8F=B8=E6=8F=90=E7=A4=BA]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusPassengerFunctionDevicePresenter.kt | 12 +++++----- .../BusPassengerFunctionSoftPresenter.kt | 8 +++---- .../ui/BusPassengerFunctionSoftFragment.kt | 15 +++++++++---- ...OCHM1LightAirconditionDoorStatusManager.kt | 22 +++++++++---------- 4 files changed, 33 insertions(+), 24 deletions(-) diff --git a/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionDevicePresenter.kt b/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionDevicePresenter.kt index 60b00eb555..cc337dddd0 100644 --- a/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionDevicePresenter.kt +++ b/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionDevicePresenter.kt @@ -50,11 +50,13 @@ class BusPassengerFunctionDevicePresenter(view: BusPassengerFunctionDeviceFragme disposeSubscribe(subscribeDoorStatus) } - override fun onDoorStatusCallback(isOpen: Boolean) { - if (isOpen) { - ToastUtils.showShort("已开启车门") - } else { - ToastUtils.showShort("已关门车门") + override fun onDoorStatusCallback(isOpen: Boolean,isFirst: Boolean) { + if(isFirst) { + if (isOpen) { + ToastUtils.showShort("已开启车门") + } else { + ToastUtils.showShort("已关门车门") + } } } 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 7eba86e84d..400443c6e9 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 @@ -37,7 +37,7 @@ class BusPassengerFunctionSoftPresenter(view: BusPassengerFunctionSoftFragment?) /** * 空调状态变化 */ - override fun onAirconditionStatusCallback(heaterIsOpen: Boolean,airconditionStatus: OCHM1LightAirconditionDoorStatusManager.AirconditionStatus) { + override fun onAirconditionStatusCallback(heaterIsOpen: Boolean,airconditionStatus: OCHM1LightAirconditionDoorStatusManager.AirconditionStatus,isFirst: Boolean) { CallerLogger.d(SceneConstant.M_BUS_P + TAG, "回写--空调开关:${OCHM1LightAirconditionDoorStatusManager.airconditionStatus.isOpen}、" + "空调温度:${OCHM1LightAirconditionDoorStatusManager.airconditionStatus.temperature}" + @@ -54,7 +54,7 @@ class BusPassengerFunctionSoftPresenter(view: BusPassengerFunctionSoftFragment?) /** * 暖风机状态变化 */ - override fun onHeaterStatusCallback(airconditionIsOpen:Boolean,heaterStatue: OCHM1LightAirconditionDoorStatusManager.HeaterStatue) { + override fun onHeaterStatusCallback(airconditionIsOpen:Boolean,heaterStatue: OCHM1LightAirconditionDoorStatusManager.HeaterStatue,isFirst: Boolean) { CallerLogger.d(SceneConstant.M_BUS_P + TAG, "回写--暖风机开关:${heaterStatue.isOpen}、" + "风速:${heaterStatue.windSpeed}") @@ -69,12 +69,12 @@ class BusPassengerFunctionSoftPresenter(view: BusPassengerFunctionSoftFragment?) /** * 灯状态变化 */ - override fun onLightCallback(lightStatus: OCHM1LightAirconditionDoorStatusManager.LightStatus) { + override fun onLightCallback(lightStatus: OCHM1LightAirconditionDoorStatusManager.LightStatus,isFirst: Boolean) { CallerLogger.d(SceneConstant.M_BUS_P + TAG, "回写--顶灯1开关:${lightStatus.isOpenLight1}、" + "顶灯2开关:${lightStatus.isOpenLight2}、" + "氛围灯开关:${lightStatus.isOpenatmosphere}、") - mView?.setLightView(lightStatus.isOpenLight1,lightStatus.isOpenLight2,lightStatus.isOpenatmosphere) + mView?.setLightView(lightStatus.isOpenLight1,lightStatus.isOpenLight2,lightStatus.isOpenatmosphere,isFirst) } /** 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 98e144f6b3..155b600e9d 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 @@ -18,6 +18,7 @@ import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr import com.mogo.eagle.core.utilcode.util.ClickUtils +import com.mogo.eagle.core.utilcode.util.ToastUtils import com.mogo.eagle.core.utilcode.util.UiThreadHandler import com.mogo.och.bus.passenger.R import com.mogo.och.bus.passenger.bean.Temperature @@ -390,7 +391,7 @@ class BusPassengerFunctionSoftFragment : } SoundPoolHelper.getSoundPoolHelper().playSoundWithRedId(context, R.raw.bus_di) mPresenter?.setLightData1(isChecked) - setLightView(isChecked, tv_light_top_02.isChecked, tv_light_atmosphere.isChecked) + setLightView(isChecked, tv_light_top_02.isChecked, tv_light_atmosphere.isChecked,true) } tv_light_top_02.setOnCheckedChangeListener { buttonView, isChecked -> if(!buttonView.isPressed){ @@ -404,7 +405,7 @@ class BusPassengerFunctionSoftFragment : } SoundPoolHelper.getSoundPoolHelper().playSoundWithRedId(context, R.raw.bus_di) mPresenter?.setLightData2(isChecked) - setLightView(tv_light_top_01.isChecked, isChecked, tv_light_atmosphere.isChecked) + setLightView(tv_light_top_01.isChecked, isChecked, tv_light_atmosphere.isChecked,true) } tv_light_atmosphere.setOnCheckedChangeListener { buttonView, isChecked -> if(!buttonView.isPressed){ @@ -418,7 +419,7 @@ class BusPassengerFunctionSoftFragment : } SoundPoolHelper.getSoundPoolHelper().playSoundWithRedId(context, R.raw.bus_di) mPresenter?.setAtmosphereLightData2(isChecked) - setLightView(tv_light_top_01.isChecked, tv_light_top_02.isChecked, isChecked) + setLightView(tv_light_top_01.isChecked, tv_light_top_02.isChecked, isChecked,true) } } @@ -435,23 +436,27 @@ class BusPassengerFunctionSoftFragment : /** * 灯的UI发生变化 */ - fun setLightView(leftLight: Boolean, rightLight: Boolean, atmosphereLight: Boolean) { + fun setLightView(leftLight: Boolean, rightLight: Boolean, atmosphereLight: Boolean,isFirst: Boolean) { tv_light_top_01.tag = touchTag tv_light_top_02.tag = touchTag tv_light_atmosphere.tag = touchTag if (leftLight) { tv_light_top_01.text = requireContext().getString(R.string.bus_p_m1_close_light1) tv_light_top_01.isChecked = true + if(!isFirst) ToastUtils.showShort("打开顶灯1") } else { tv_light_top_01.text = requireContext().getString(R.string.bus_p_m1_open_light1) tv_light_top_01.isChecked = false + if(!isFirst) ToastUtils.showShort("关闭顶灯1") } if (rightLight) { tv_light_top_02.text = requireContext().getString(R.string.bus_p_m1_close_light2) tv_light_top_02.isChecked = true + if(!isFirst) ToastUtils.showShort("打开顶灯2") } else { tv_light_top_02.text = requireContext().getString(R.string.bus_p_m1_open_light2) tv_light_top_02.isChecked = false + if(!isFirst) ToastUtils.showShort("关闭顶灯2") } if (leftLight && rightLight) { iv_top_light_setting.setImageResource(R.drawable.bus_p_function_light_middle_selected)// 都打开 @@ -469,10 +474,12 @@ class BusPassengerFunctionSoftFragment : tv_light_atmosphere.text = requireContext().getString(R.string.bus_p_m1_close_atmosphere) tv_light_atmosphere.isChecked = true iv_bottom_light_setting.setImageResource(R.drawable.bus_p_function_atmosphere_select) + if(!isFirst) ToastUtils.showShort("打开氛围灯") } else { tv_light_atmosphere.text = requireContext().getString(R.string.bus_p_m1_open_atmosphere) tv_light_atmosphere.isChecked = false iv_bottom_light_setting.setImageResource(R.drawable.bus_p_function_atmosphere_nor) + if(!isFirst) ToastUtils.showShort("关闭氛围灯") } } // endregion diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/OCHM1LightAirconditionDoorStatusManager.kt b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/OCHM1LightAirconditionDoorStatusManager.kt index aad34ffe3c..b31b90ad2a 100644 --- a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/OCHM1LightAirconditionDoorStatusManager.kt +++ b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/OCHM1LightAirconditionDoorStatusManager.kt @@ -29,9 +29,9 @@ object OCHM1LightAirconditionDoorStatusManager : IMoGoRoboBusJinlvM1StatesListen return } M_LISTENERS[tag] = listener - listener.onLightCallback(lightStatus) - listener.onAirconditionStatusCallback(heaterStatue.isOpen,airconditionStatus) - listener.onHeaterStatusCallback(airconditionStatus.isOpen,heaterStatue) + listener.onLightCallback(lightStatus,true) + listener.onAirconditionStatusCallback(heaterStatue.isOpen,airconditionStatus,true) + listener.onHeaterStatusCallback(airconditionStatus.isOpen,heaterStatue,true) } fun removeListener(tag: String) { @@ -59,13 +59,13 @@ object OCHM1LightAirconditionDoorStatusManager : IMoGoRoboBusJinlvM1StatesListen interface OCHM1LightAirconditionDoorCallback { - fun onAirconditionStatusCallback(heaterIsOpen:Boolean,airconditionStatus: AirconditionStatus){} + fun onAirconditionStatusCallback(heaterIsOpen:Boolean,airconditionStatus: AirconditionStatus,isFirst: Boolean){} - fun onHeaterStatusCallback(airconditionIsOpen: Boolean,heaterStatue: HeaterStatue){} + fun onHeaterStatusCallback(airconditionIsOpen: Boolean,heaterStatue: HeaterStatue,isFirst: Boolean){} - fun onDoorStatusCallback(isOpen: Boolean){} + fun onDoorStatusCallback(isOpen: Boolean,isFirst: Boolean){} - fun onLightCallback(lightStatus: LightStatus){} + fun onLightCallback(lightStatus: LightStatus,isFirst: Boolean){} } @@ -99,7 +99,7 @@ object OCHM1LightAirconditionDoorStatusManager : IMoGoRoboBusJinlvM1StatesListen M_LISTENERS.forEach { val tag = it.key val listener = it.value - listener.onAirconditionStatusCallback(heaterState.isOn,airconditionStatus) + listener.onAirconditionStatusCallback(heaterState.isOn,airconditionStatus,false) } } if (heaterState.isOn != heaterStatue.isOpen || @@ -110,7 +110,7 @@ object OCHM1LightAirconditionDoorStatusManager : IMoGoRoboBusJinlvM1StatesListen M_LISTENERS.forEach { val tag = it.key val listener = it.value - listener.onHeaterStatusCallback(airConditionerState.isOn,heaterStatue) + listener.onHeaterStatusCallback(airConditionerState.isOn,heaterStatue,false) } } if (states.frontDoorState.isOn != doorStatus.isOpen) { @@ -118,7 +118,7 @@ object OCHM1LightAirconditionDoorStatusManager : IMoGoRoboBusJinlvM1StatesListen M_LISTENERS.forEach { val tag = it.key val listener = it.value - listener.onDoorStatusCallback(doorStatus.isOpen) + listener.onDoorStatusCallback(doorStatus.isOpen,false) } } if (states.mainLamp1State.isOn != lightStatus.isOpenLight1|| @@ -130,7 +130,7 @@ object OCHM1LightAirconditionDoorStatusManager : IMoGoRoboBusJinlvM1StatesListen M_LISTENERS.forEach { val tag = it.key val listener = it.value - listener.onLightCallback(lightStatus) + listener.onLightCallback(lightStatus,false) } } }