diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/DriverMoFangFunctionView.kt b/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/view/DriverMoFangFunctionView.kt similarity index 90% rename from OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/DriverMoFangFunctionView.kt rename to OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/view/DriverMoFangFunctionView.kt index 92f993947d..aed4ea1646 100644 --- a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/DriverMoFangFunctionView.kt +++ b/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/view/DriverMoFangFunctionView.kt @@ -1,12 +1,12 @@ -package com.mogo.och.common.module.wigets +package com.magic.mogo.och.charter.view import android.content.Context import android.util.AttributeSet import android.view.LayoutInflater import androidx.constraintlayout.widget.ConstraintLayout +import com.magic.mogo.och.charter.R import com.mogo.eagle.core.utilcode.kotlin.onClick import com.mogo.eagle.core.utilcode.util.ActivityUtils -import com.mogo.och.common.module.R import com.mogo.och.common.module.manager.DriverMoFangFunctionManager import com.mogo.och.common.module.manager.devicemanage.LightAirconditionDoorManager import com.mogo.och.common.module.utils.SoundPoolHelper @@ -48,11 +48,11 @@ class DriverMoFangFunctionView @JvmOverloads constructor( } openDoorIv.onClick { LightAirconditionDoorManager.go2OpenDoor(true) - SoundPoolHelper.getSoundPoolHelper().playSoundWithRedId(ActivityUtils.getActivityByContext(context), R.raw.beep) + SoundPoolHelper.getSoundPoolHelper().playSoundWithRedId(ActivityUtils.getActivityByContext(context), R.raw.m1_voice_di) } closeDoorIv.onClick { LightAirconditionDoorManager.go2OpenDoor(false) - SoundPoolHelper.getSoundPoolHelper().playSoundWithRedId(ActivityUtils.getActivityByContext(context), R.raw.beep) + SoundPoolHelper.getSoundPoolHelper().playSoundWithRedId(ActivityUtils.getActivityByContext(context), R.raw.m1_voice_di) } } diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/brake_stop.png b/OCH/charter/driver/src/main/res/drawable-xhdpi/charter_brake_stop.png similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable-nodpi/brake_stop.png rename to OCH/charter/driver/src/main/res/drawable-xhdpi/charter_brake_stop.png diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/brake_stop_un.png b/OCH/charter/driver/src/main/res/drawable-xhdpi/charter_brake_stop_un.png similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable-nodpi/brake_stop_un.png rename to OCH/charter/driver/src/main/res/drawable-xhdpi/charter_brake_stop_un.png diff --git a/OCH/charter/driver/src/main/res/drawable-xhdpi/charter_close_door_normal.png b/OCH/charter/driver/src/main/res/drawable-xhdpi/charter_close_door_normal.png new file mode 100755 index 0000000000..d05d1ad3ad Binary files /dev/null and b/OCH/charter/driver/src/main/res/drawable-xhdpi/charter_close_door_normal.png differ diff --git a/OCH/charter/driver/src/main/res/drawable-xhdpi/charter_close_door_selected.png b/OCH/charter/driver/src/main/res/drawable-xhdpi/charter_close_door_selected.png new file mode 100755 index 0000000000..06e9b52462 Binary files /dev/null and b/OCH/charter/driver/src/main/res/drawable-xhdpi/charter_close_door_selected.png differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/moderate.png b/OCH/charter/driver/src/main/res/drawable-xhdpi/charter_moderate.png similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable-nodpi/moderate.png rename to OCH/charter/driver/src/main/res/drawable-xhdpi/charter_moderate.png diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/moderate_un.png b/OCH/charter/driver/src/main/res/drawable-xhdpi/charter_moderate_un.png similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable-nodpi/moderate_un.png rename to OCH/charter/driver/src/main/res/drawable-xhdpi/charter_moderate_un.png diff --git a/OCH/charter/driver/src/main/res/drawable-xhdpi/charter_open_door_normal.png b/OCH/charter/driver/src/main/res/drawable-xhdpi/charter_open_door_normal.png new file mode 100755 index 0000000000..34640c9270 Binary files /dev/null and b/OCH/charter/driver/src/main/res/drawable-xhdpi/charter_open_door_normal.png differ diff --git a/OCH/charter/driver/src/main/res/drawable-xhdpi/charter_open_door_selected.png b/OCH/charter/driver/src/main/res/drawable-xhdpi/charter_open_door_selected.png new file mode 100755 index 0000000000..e2282ffeef Binary files /dev/null and b/OCH/charter/driver/src/main/res/drawable-xhdpi/charter_open_door_selected.png differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/reset_icon.png b/OCH/charter/driver/src/main/res/drawable-xhdpi/charter_reset.png similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable-nodpi/reset_icon.png rename to OCH/charter/driver/src/main/res/drawable-xhdpi/charter_reset.png diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/reset_un_icon.png b/OCH/charter/driver/src/main/res/drawable-xhdpi/charter_reset_un.png similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable-nodpi/reset_un_icon.png rename to OCH/charter/driver/src/main/res/drawable-xhdpi/charter_reset_un.png diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/whistle.png b/OCH/charter/driver/src/main/res/drawable-xhdpi/charter_whistle.png similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable-nodpi/whistle.png rename to OCH/charter/driver/src/main/res/drawable-xhdpi/charter_whistle.png diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/whistle_un.png b/OCH/charter/driver/src/main/res/drawable-xhdpi/charter_whistle_un.png similarity index 100% rename from OCH/mogo-och-common-module/src/main/res/drawable-nodpi/whistle_un.png rename to OCH/charter/driver/src/main/res/drawable-xhdpi/charter_whistle_un.png diff --git a/OCH/charter/driver/src/main/res/drawable/charter_brake_stop_selector.xml b/OCH/charter/driver/src/main/res/drawable/charter_brake_stop_selector.xml new file mode 100644 index 0000000000..ab55ebe213 --- /dev/null +++ b/OCH/charter/driver/src/main/res/drawable/charter_brake_stop_selector.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/OCH/charter/driver/src/main/res/drawable/charter_close_door_selector.xml b/OCH/charter/driver/src/main/res/drawable/charter_close_door_selector.xml new file mode 100644 index 0000000000..b0d1975aa6 --- /dev/null +++ b/OCH/charter/driver/src/main/res/drawable/charter_close_door_selector.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/OCH/charter/driver/src/main/res/drawable/charter_moderate_selector.xml b/OCH/charter/driver/src/main/res/drawable/charter_moderate_selector.xml new file mode 100644 index 0000000000..2abe3174b9 --- /dev/null +++ b/OCH/charter/driver/src/main/res/drawable/charter_moderate_selector.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/OCH/charter/driver/src/main/res/drawable/charter_open_door_selector.xml b/OCH/charter/driver/src/main/res/drawable/charter_open_door_selector.xml new file mode 100644 index 0000000000..eec6facb3e --- /dev/null +++ b/OCH/charter/driver/src/main/res/drawable/charter_open_door_selector.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/OCH/charter/driver/src/main/res/drawable/charter_reset_selector.xml b/OCH/charter/driver/src/main/res/drawable/charter_reset_selector.xml new file mode 100644 index 0000000000..0b98c66a29 --- /dev/null +++ b/OCH/charter/driver/src/main/res/drawable/charter_reset_selector.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/OCH/charter/driver/src/main/res/drawable/charter_whistle_selector.xml b/OCH/charter/driver/src/main/res/drawable/charter_whistle_selector.xml new file mode 100644 index 0000000000..d99c411974 --- /dev/null +++ b/OCH/charter/driver/src/main/res/drawable/charter_whistle_selector.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/OCH/charter/driver/src/main/res/layout/charter_base_fragment.xml b/OCH/charter/driver/src/main/res/layout/charter_base_fragment.xml index 8c828cb2a1..8497b888f8 100644 --- a/OCH/charter/driver/src/main/res/layout/charter_base_fragment.xml +++ b/OCH/charter/driver/src/main/res/layout/charter_base_fragment.xml @@ -13,7 +13,7 @@ android:layout_width="match_parent" android:layout_height="match_parent"/> - + android:src="@drawable/charter_moderate_selector"/> + android:src="@drawable/charter_brake_stop_selector"/> + android:src="@drawable/charter_reset_selector"/> + android:src="@drawable/charter_whistle_selector"/> + android:src="@drawable/charter_close_door_selector"/> + android:src="@drawable/charter_open_door_selector"/> \ No newline at end of file diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/bottom/impl/CloseDoorView.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/bottom/impl/CloseDoorView.kt index cd53c836b8..8d2f605601 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/bottom/impl/CloseDoorView.kt +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/bottom/impl/CloseDoorView.kt @@ -23,6 +23,6 @@ class CloseDoorView @JvmOverloads constructor( private fun go2OpenDoor(){ LightAirconditionDoorManager.go2OpenDoor(false) - SoundPoolHelper.getSoundPoolHelper().playSoundWithRedId(ActivityUtils.getActivityByContext(context), R.raw.bus_di) + SoundPoolHelper.getSoundPoolHelper().playSoundWithRedId(ActivityUtils.getActivityByContext(context), R.raw.m1_voice_di) } } \ No newline at end of file diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/bottom/impl/GoViewWithArrive.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/bottom/impl/GoViewWithArrive.kt index 510b450142..68040afd91 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/bottom/impl/GoViewWithArrive.kt +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/bottom/impl/GoViewWithArrive.kt @@ -97,7 +97,7 @@ class GoViewWithArrive @JvmOverloads constructor( } else -> {} } - SoundPoolHelper.getSoundPoolHelper().playSoundWithRedId(ActivityUtils.getActivityByContext(context), R.raw.bus_di) + SoundPoolHelper.getSoundPoolHelper().playSoundWithRedId(ActivityUtils.getActivityByContext(context), R.raw.m1_voice_di) } override fun onDetachedFromWindow() { diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/bottom/impl/OpenDoorView.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/bottom/impl/OpenDoorView.kt index a3c5e86f9a..46c0a8c028 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/bottom/impl/OpenDoorView.kt +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/bottom/impl/OpenDoorView.kt @@ -23,7 +23,7 @@ class OpenDoorView @JvmOverloads constructor( private fun go2OpenDoor(){ LightAirconditionDoorManager.go2OpenDoor(true) - SoundPoolHelper.getSoundPoolHelper().playSoundWithRedId(ActivityUtils.getActivityByContext(context), R.raw.bus_di) + SoundPoolHelper.getSoundPoolHelper().playSoundWithRedId(ActivityUtils.getActivityByContext(context), R.raw.m1_voice_di) } } \ No newline at end of file diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/bottom/impl/StopSiteView.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/bottom/impl/StopSiteView.kt index ffc9ac7491..dc38b2902b 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/bottom/impl/StopSiteView.kt +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/bottom/impl/StopSiteView.kt @@ -45,6 +45,6 @@ class StopSiteView @JvmOverloads constructor( } else -> {} } - SoundPoolHelper.getSoundPoolHelper().playSoundWithRedId(ActivityUtils.getActivityByContext(context), R.raw.bus_di) + SoundPoolHelper.getSoundPoolHelper().playSoundWithRedId(ActivityUtils.getActivityByContext(context), R.raw.m1_voice_di) } } \ No newline at end of file diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/softcontrol/SoftControlView.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/softcontrol/SoftControlView.kt index a71c8e0e37..6a67cfbbea 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/softcontrol/SoftControlView.kt +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/softcontrol/SoftControlView.kt @@ -329,7 +329,7 @@ class SoftControlView : ConstraintLayout, SoftControlViewModel.SoftControlCallba rv_aircondition_temperature.tag = null return } else { - SoundPoolHelper.getSoundPoolHelper().playSoundWithRedId(context, R.raw.bus_di) + SoundPoolHelper.getSoundPoolHelper().playSoundWithRedId(context, R.raw.m1_voice_di) } openAircondition() } @@ -346,7 +346,7 @@ class SoftControlView : ConstraintLayout, SoftControlViewModel.SoftControlCallba .observeOn(AndroidSchedulers.mainThread()).subscribe { tv_light_top_01.isEnabled = true } - SoundPoolHelper.getSoundPoolHelper().playSoundWithRedId(context, R.raw.bus_di) + SoundPoolHelper.getSoundPoolHelper().playSoundWithRedId(context, R.raw.m1_voice_di) viewModel?.setLightData1(isChecked) setLightTop1View(isChecked, true) setLightView(isChecked, tv_light_top_02.isChecked) @@ -360,7 +360,7 @@ class SoftControlView : ConstraintLayout, SoftControlViewModel.SoftControlCallba .observeOn(AndroidSchedulers.mainThread()).subscribe { tv_light_top_02.isEnabled = true } - SoundPoolHelper.getSoundPoolHelper().playSoundWithRedId(context, R.raw.bus_di) + SoundPoolHelper.getSoundPoolHelper().playSoundWithRedId(context, R.raw.m1_voice_di) viewModel?.setLightData2(isChecked) setLightTop2View(isChecked, true) setLightView(tv_light_top_01.isChecked, isChecked) @@ -374,7 +374,7 @@ class SoftControlView : ConstraintLayout, SoftControlViewModel.SoftControlCallba .observeOn(AndroidSchedulers.mainThread()).subscribe { tv_light_atmosphere.isEnabled = true } - SoundPoolHelper.getSoundPoolHelper().playSoundWithRedId(context, R.raw.bus_di) + SoundPoolHelper.getSoundPoolHelper().playSoundWithRedId(context, R.raw.m1_voice_di) viewModel?.setAtmosphereLightData2(isChecked) setLightAtmosphereView(isChecked, true) } @@ -539,7 +539,7 @@ class SoftControlView : ConstraintLayout, SoftControlViewModel.SoftControlCallba if (!buttonView.isPressed) { return@setOnCheckedChangeListener } - SoundPoolHelper.getSoundPoolHelper().playSoundWithRedId(context, R.raw.bus_di) + SoundPoolHelper.getSoundPoolHelper().playSoundWithRedId(context, R.raw.m1_voice_di) if (isChecked) {//打开 tv_aircondition_switch.setText("关闭空调") if (rg_setting_pattern.checkedRadioButtonId == R.id.rb_pattern_heating) { @@ -562,7 +562,7 @@ class SoftControlView : ConstraintLayout, SoftControlViewModel.SoftControlCallba if (!rb_pattern_heating.isPressed) { return@setOnCheckedChangeListener } - SoundPoolHelper.getSoundPoolHelper().playSoundWithRedId(context, R.raw.bus_di) + SoundPoolHelper.getSoundPoolHelper().playSoundWithRedId(context, R.raw.m1_voice_di) openHeater() } @@ -570,7 +570,7 @@ class SoftControlView : ConstraintLayout, SoftControlViewModel.SoftControlCallba if (!rb_pattern_automatic.isPressed) { return@setOnCheckedChangeListener } - SoundPoolHelper.getSoundPoolHelper().playSoundWithRedId(context, R.raw.bus_di) + SoundPoolHelper.getSoundPoolHelper().playSoundWithRedId(context, R.raw.m1_voice_di) openAircondition() } @@ -578,7 +578,7 @@ class SoftControlView : ConstraintLayout, SoftControlViewModel.SoftControlCallba if (!rb_pattern_refrigeration.isPressed) { return@setOnCheckedChangeListener } - SoundPoolHelper.getSoundPoolHelper().playSoundWithRedId(context, R.raw.bus_di) + SoundPoolHelper.getSoundPoolHelper().playSoundWithRedId(context, R.raw.m1_voice_di) openAircondition() } @@ -586,7 +586,7 @@ class SoftControlView : ConstraintLayout, SoftControlViewModel.SoftControlCallba if (!rb_pattern_ventilate.isPressed) { return@setOnCheckedChangeListener } - SoundPoolHelper.getSoundPoolHelper().playSoundWithRedId(context, R.raw.bus_di) + SoundPoolHelper.getSoundPoolHelper().playSoundWithRedId(context, R.raw.m1_voice_di) openAircondition() } @@ -622,7 +622,7 @@ class SoftControlView : ConstraintLayout, SoftControlViewModel.SoftControlCallba else -> {} } - SoundPoolHelper.getSoundPoolHelper().playSoundWithRedId(context, R.raw.bus_di) + SoundPoolHelper.getSoundPoolHelper().playSoundWithRedId(context, R.raw.m1_voice_di) if (rg_setting_pattern.checkedRadioButtonId == R.id.rb_pattern_heating) {//暖风机 openHeater() } else { diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/close_door_normal.png b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/close_door_normal.png deleted file mode 100755 index d96c3a4b27..0000000000 Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/close_door_normal.png and /dev/null differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/close_door_selected.png b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/close_door_selected.png deleted file mode 100755 index 997f82efab..0000000000 Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/close_door_selected.png and /dev/null differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/open_door_normal.png b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/open_door_normal.png deleted file mode 100755 index 123f9add3c..0000000000 Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/open_door_normal.png and /dev/null differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/open_door_selected.png b/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/open_door_selected.png deleted file mode 100755 index 9a6589861a..0000000000 Binary files a/OCH/mogo-och-common-module/src/main/res/drawable-nodpi/open_door_selected.png and /dev/null differ diff --git a/OCH/mogo-och-common-module/src/main/res/drawable/brake_stop_btn_selector.xml b/OCH/mogo-och-common-module/src/main/res/drawable/brake_stop_btn_selector.xml deleted file mode 100644 index e84f3b901b..0000000000 --- a/OCH/mogo-och-common-module/src/main/res/drawable/brake_stop_btn_selector.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/OCH/mogo-och-common-module/src/main/res/drawable/close_door_btn_selector.xml b/OCH/mogo-och-common-module/src/main/res/drawable/close_door_btn_selector.xml deleted file mode 100644 index 681ce5ebae..0000000000 --- a/OCH/mogo-och-common-module/src/main/res/drawable/close_door_btn_selector.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/OCH/mogo-och-common-module/src/main/res/drawable/moderate_btn_selector.xml b/OCH/mogo-och-common-module/src/main/res/drawable/moderate_btn_selector.xml deleted file mode 100644 index 35d7ad314d..0000000000 --- a/OCH/mogo-och-common-module/src/main/res/drawable/moderate_btn_selector.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/OCH/mogo-och-common-module/src/main/res/drawable/open_door_btn_selector.xml b/OCH/mogo-och-common-module/src/main/res/drawable/open_door_btn_selector.xml deleted file mode 100644 index 0fa53e8afb..0000000000 --- a/OCH/mogo-och-common-module/src/main/res/drawable/open_door_btn_selector.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/OCH/mogo-och-common-module/src/main/res/drawable/reset_btn_selector.xml b/OCH/mogo-och-common-module/src/main/res/drawable/reset_btn_selector.xml deleted file mode 100644 index 712f8a123a..0000000000 --- a/OCH/mogo-och-common-module/src/main/res/drawable/reset_btn_selector.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/OCH/mogo-och-common-module/src/main/res/drawable/whistle_btn_selector.xml b/OCH/mogo-och-common-module/src/main/res/drawable/whistle_btn_selector.xml deleted file mode 100644 index def73512fa..0000000000 --- a/OCH/mogo-och-common-module/src/main/res/drawable/whistle_btn_selector.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file