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 081bf8dcfd..7609d3c5b6 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 @@ -106,24 +106,18 @@ class BusPassengerFunctionSoftFragment : if(!buttonView.isPressed){ return@setOnCheckedChangeListener } - if(isChecked){ - tv_aircondition_switch.setText("关闭空调") - }else{ - tv_aircondition_switch.setText("打开空调") - } SoundPoolHelper.getSoundPoolHelper().playSoundWithRedId(context, R.raw.bus_di) - if (rg_setting_pattern.checkedRadioButtonId == R.id.rb_pattern_heating) { - if (isChecked) {// 打开暖风机 - openHeater() - } else {// 关闭暖风机 - closeHeater() - } - } else { - if (isChecked) {// 打开空调 - openAircondition() - } else {//关闭空调 - closeAircondition() + if(isChecked){//打开 + tv_aircondition_switch.setText("关闭空调") + if (rg_setting_pattern.checkedRadioButtonId == R.id.rb_pattern_heating) { + openHeater()// 打开暖风机 + } else { + openAircondition()// 打开空调 } + }else{// 关闭 + tv_aircondition_switch.setText("打开空调") + closeHeater()// 关闭暖风机 + closeAircondition()//关闭空调 } } // 模式调节