diff --git a/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/BusPassengerFunctionDeviceFragment.kt b/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/BusPassengerFunctionDeviceFragment.kt index 17ec57fd98..0640ef7376 100644 --- a/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/BusPassengerFunctionDeviceFragment.kt +++ b/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/BusPassengerFunctionDeviceFragment.kt @@ -5,6 +5,7 @@ import com.mogo.commons.mvp.MvpFragment import com.mogo.eagle.core.utilcode.kotlin.onClick import com.mogo.och.bus.passenger.R import com.mogo.och.bus.passenger.presenter.BusPassengerFunctionDevicePresenter +import com.mogo.och.common.module.utils.SoundPoolHelper import com.zhidao.support.adas.high.AdasManager import kotlinx.android.synthetic.m1.bus_p_function_setting_devices_fragment.* @@ -28,17 +29,21 @@ class BusPassengerFunctionDeviceFragment : // 自动驾驶状态中: AdasManager.getInstance().sendPlanningCmd(2); // 没有在自动驾驶中:启动自动驾驶 CallerAutoPilotControlManager.INSTANCE.startAutoPilot(parameters); mPresenter?.startStopSide() + SoundPoolHelper.getSoundPoolHelper().playSoundWithRedId(context, R.raw.bus_di) } tv_car_setting_stopside.setOnClickListener { // 执行靠边停车 AdasManager.getInstance().sendPlanningCmd(1); AdasManager.getInstance().sendPlanningCmd(1); + SoundPoolHelper.getSoundPoolHelper().playSoundWithRedId(context, R.raw.bus_di) } tv_car_setting_opendoor.onClick { // 开门 AdasManager.getInstance().sendRoboBusJinlvM1FrontDoorCmd(2); AdasManager.getInstance().sendRoboBusJinlvM1FrontDoorCmd(1); + SoundPoolHelper.getSoundPoolHelper().playSoundWithRedId(context, R.raw.bus_di) } tv_car_setting_closedoor.onClick { AdasManager.getInstance().sendRoboBusJinlvM1FrontDoorCmd(2); + SoundPoolHelper.getSoundPoolHelper().playSoundWithRedId(context, R.raw.bus_di) } } 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 d2562de6c7..a4bd19fd0a 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 @@ -123,7 +123,7 @@ class BusPassengerFunctionSoftFragment : val pickerLayoutManager = PickerLayoutManager(requireContext(), PickerLayoutManager.HORIZONTAL, false) pickerLayoutManager.isChangeAlpha = true - pickerLayoutManager.scaleDownBy = 0.99f + pickerLayoutManager.scaleDownBy = 0.39f pickerLayoutManager.scaleDownDistance = 0.8f val adapter = TemperatureAdapter(requireContext(), getData(), rv_aircondition_temperature) @@ -131,16 +131,14 @@ class BusPassengerFunctionSoftFragment : snapHelper.attachToRecyclerView(rv_aircondition_temperature) rv_aircondition_temperature.layoutManager = pickerLayoutManager rv_aircondition_temperature.adapter = adapter - rv_aircondition_temperature.addItemDecoration(HorizontalDecoration(0)) + rv_aircondition_temperature.addItemDecoration(HorizontalDecoration(20)) - pickerLayoutManager.setOnScrollStopListener(object : PickerLayoutManager.onScrollStopListener { - override fun selectedView(view: View) { - if(view is TextView) { - ToastUtils.showShort(view.text) - } + pickerLayoutManager.setOnScrollStopListener { view -> + if (view is TextView) { + ToastUtils.showShort(view.text) } - }) + } } private fun getData(): MutableList { @@ -188,7 +186,7 @@ class BusPassengerFunctionSoftFragment : R.id.rb_wind_speed_high -> windSpeedCmd = 3 // 3档 else -> {} } - mPresenter?.sendRoboBusJinlvM1AirConditionerCmd(1,modeCmd,windSpeedCmd,18) + mPresenter?.sendRoboBusJinlvM1AirConditionerCmd(1,modeCmd,windSpeedCmd,20) } /** diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/layout/bus_p_function_setting_soft_fragment.xml b/OCH/mogo-och-bus-passenger/src/m1/res/layout/bus_p_function_setting_soft_fragment.xml index 31344acdaf..36988bbded 100644 --- a/OCH/mogo-och-bus-passenger/src/m1/res/layout/bus_p_function_setting_soft_fragment.xml +++ b/OCH/mogo-och-bus-passenger/src/m1/res/layout/bus_p_function_setting_soft_fragment.xml @@ -270,7 +270,7 @@ android:layout_width="0dp" android:layout_height="0dp" android:scaleType="centerCrop" - android:src="@drawable/bus_p_function_light_middle_selected" + android:src="@drawable/bus_p_function_light_nor" app:layout_constraintEnd_toStartOf="@+id/gl_right" app:layout_constraintHeight_percent="0.5" app:layout_constraintStart_toEndOf="@+id/gl_left"