yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[m1]

Browse Source 
[1.0.2]
[默认速度、空调2s后进行失败提示]
This commit is contained in:
yangyakun
2023-02-15 16:40:21 +08:00
parent 5116cf369b
commit 00204b31ed
2 changed files with 33 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionSoftPresenter.kt
View File

@@ -21,6 +21,9 @@ class BusPassengerFunctionSoftPresenter(view: BusPassengerFunctionSoftFragment?)
private var subscribeLightTop2: Disposable?=null
private var subscribeLightAtmosphere: Disposable?=null
private var airconditionDisposable: Disposable?=null
private var heaterDisposable: Disposable?=null
override fun onCreate(owner: LifecycleOwner) {
super.onCreate(owner)
OCHM1LightAirconditionDoorStatusManager.addListener(TAG, this)
@@ -81,10 +84,25 @@ class BusPassengerFunctionSoftPresenter(view: BusPassengerFunctionSoftFragment?)
CallerLogger.d(SceneConstant.M_BUS_P + TAG, "" +
"打开空调，模式$modeCmd--档位${windSpeedCmd}--温度:$temperatureCmd")
AdasManager.getInstance().sendRoboBusJinlvM1AirConditionerCmd(1,modeCmd,windSpeedCmd,temperatureCmd)
disposeSubscribe(airconditionDisposable)
airconditionDisposable = createSubscribe(2000){
if (!OCHM1LightAirconditionDoorStatusManager.airconditionStatus.isOpen&&
OCHM1LightAirconditionDoorStatusManager.airconditionStatus.windSpeed!=windSpeedCmd&&
OCHM1LightAirconditionDoorStatusManager.airconditionStatus.temperature!=temperatureCmd&&
OCHM1LightAirconditionDoorStatusManager.airconditionStatus.pattert!=modeCmd) {
ToastUtils.showShort("操作未生效，请稍后重试吧～")
}
}
}
fun closeAircondition() {
CallerLogger.d(SceneConstant.M_BUS_P + TAG, "关闭空调")
AdasManager.getInstance().sendRoboBusJinlvM1AirConditionerCmd(2,0,0,0)
disposeSubscribe(airconditionDisposable)
airconditionDisposable = createSubscribe(2000){
if (OCHM1LightAirconditionDoorStatusManager.airconditionStatus.isOpen) {
ToastUtils.showShort("操作未生效，请稍后重试吧～")
}
}
}
/**
* 设置暖风
@@ -92,11 +110,24 @@ class BusPassengerFunctionSoftPresenter(view: BusPassengerFunctionSoftFragment?)
fun openAndSetHeader(windSpeedCmd: Int) {
CallerLogger.d(SceneConstant.M_BUS_P + TAG, "打开暖风机、档位${windSpeedCmd}")
AdasManager.getInstance().sendRoboBusJinlvM1HeaderCmd(1,windSpeedCmd)
disposeSubscribe(heaterDisposable)
heaterDisposable = createSubscribe(2000){
if (!OCHM1LightAirconditionDoorStatusManager.heaterStatue.isOpen&&
OCHM1LightAirconditionDoorStatusManager.heaterStatue.windSpeed!=windSpeedCmd&&) {
ToastUtils.showShort("操作未生效，请稍后重试吧～")
}
}
}
fun closeHeader(){
CallerLogger.d(SceneConstant.M_BUS_P + TAG, "关闭暖风机")
AdasManager.getInstance().sendRoboBusJinlvM1HeaderCmd(2,0)
disposeSubscribe(heaterDisposable)
heaterDisposable = createSubscribe(2000){
if (!OCHM1LightAirconditionDoorStatusManager.heaterStatue.isOpen) {
ToastUtils.showShort("操作未生效，请稍后重试吧～")
}
}
}
fun setLightData1(leftLight: Boolean){

5
OCH/mogo-och-bus-passenger/src/m1/res/layout/bus_p_fragment.xml
View File

@@ -44,11 +44,10 @@
android:layout_height="@dimen/dp_152">
<TextView
android:id="@+id/tv_speed"
android:text="68"
android:text="0"
android:textSize="@dimen/dp_60"
android:gravity="center"
android:textColor="@color/bus_p_m1_f5fbff"
android:includeFontPadding="false"
android:lineSpacingMultiplier="0.9"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
<TextView