From 8be7ac4f0e52839f937d32c9f3f2bfc32eb4b364 Mon Sep 17 00:00:00 2001
From: yangyakun <yangyakun@zhidaoauto.com>
Date: Mon, 6 Feb 2023 11:47:42 +0800
Subject: [PATCH] =?UTF-8?q?[1.0.0]=20[m1]=20[=E7=A9=BA=E7=99=BD=E7=82=B9?=
 =?UTF-8?q?=E5=87=BB=E5=85=B3=E9=97=AD]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../och/bus/passenger/ui/BusPassengerFunctionFragment.kt     | 5 ++++-
 .../och/bus/passenger/ui/BusPassengerFunctionSoftFragment.kt | 4 +++-
 .../src/m1/res/layout/bus_p_function_fragment.xml            | 4 ++--
 .../res/layout/bus_p_function_setting_devices_fragment.xml   | 1 +
 .../m1/res/layout/bus_p_function_setting_soft_fragment.xml   | 1 +
 .../src/m1/res/layout/bus_p_function_video_fragment.xml      | 1 +
 6 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/BusPassengerFunctionFragment.kt b/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/BusPassengerFunctionFragment.kt
index 60d4ab23ca..91ca752e7d 100644
--- a/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/BusPassengerFunctionFragment.kt
+++ b/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/BusPassengerFunctionFragment.kt
@@ -62,6 +62,9 @@ class BusPassengerFunctionFragment :
                 .replace(R.id.fl_function_group, it, fragmentTag)
                 .commitNow()
         }
+        cl_container.setOnClickListener {
+            dismissAllowingStateLoss()
+        }
     }
 
     override fun getLayoutId(): Int = R.layout.bus_p_function_fragment
@@ -72,7 +75,7 @@ class BusPassengerFunctionFragment :
         dialog?.window?.let {
             BarUtils.hideStatusBarAndSticky(it)
         }
-        dialog?.setCancelable(false)
+        //dialog?.setCancelable(false)
     }
 
     private val videoListener = CompoundButton.OnCheckedChangeListener { _, isChecked ->
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 5d166fb23b..84f6d5b1f6 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
@@ -10,7 +10,6 @@ import android.view.View
 import android.widget.SeekBar
 import android.widget.SeekBar.OnSeekBarChangeListener
 import android.widget.TextView
-import android.widget.Toast
 import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.LinearSnapHelper
 import androidx.recyclerview.widget.SnapHelper
@@ -286,15 +285,18 @@ class BusPassengerFunctionSoftFragment :
     // region 灯
     private fun setLightListener() {
         tv_light_top_01.setOnCheckedChangeListener { buttonView, isChecked ->
+            SoundPoolHelper.getSoundPoolHelper().playSoundWithRedId(context, R.raw.bus_di)
             mPresenter?.setLightData(isChecked, tv_light_top_02.isChecked, tv_light_atmosphere.isChecked)
             setLightView(isChecked, tv_light_top_02.isChecked, tv_light_atmosphere.isChecked)
         }
         tv_light_top_02.setOnCheckedChangeListener { buttonView, isChecked ->
+            SoundPoolHelper.getSoundPoolHelper().playSoundWithRedId(context, R.raw.bus_di)
             mPresenter?.setLightData(isChecked, tv_light_top_02.isChecked, tv_light_atmosphere.isChecked)
             setLightView(tv_light_top_01.isChecked, isChecked, tv_light_atmosphere.isChecked)
 
         }
         tv_light_atmosphere.setOnCheckedChangeListener { buttonView, isChecked ->
+            SoundPoolHelper.getSoundPoolHelper().playSoundWithRedId(context, R.raw.bus_di)
             mPresenter?.setLightData(isChecked, tv_light_top_02.isChecked, tv_light_atmosphere.isChecked)
             setLightView(tv_light_top_01.isChecked, tv_light_top_02.isChecked, isChecked)
         }
diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/layout/bus_p_function_fragment.xml b/OCH/mogo-och-bus-passenger/src/m1/res/layout/bus_p_function_fragment.xml
index 110538eaa4..e0dc85c2e5 100644
--- a/OCH/mogo-och-bus-passenger/src/m1/res/layout/bus_p_function_fragment.xml
+++ b/OCH/mogo-och-bus-passenger/src/m1/res/layout/bus_p_function_fragment.xml
@@ -2,6 +2,7 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:id="@+id/cl_container"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <FrameLayout
@@ -9,9 +10,8 @@
         app:layout_constraintBottom_toTopOf="@+id/cb_bp_video_player"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
         android:layout_width="match_parent"
-        android:layout_height="0dp"/>
+        android:layout_height="wrap_content"/>
 
     <CheckBox
         android:id="@+id/cb_bp_video_player"
diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/layout/bus_p_function_setting_devices_fragment.xml b/OCH/mogo-och-bus-passenger/src/m1/res/layout/bus_p_function_setting_devices_fragment.xml
index 9820fe351d..9712189711 100644
--- a/OCH/mogo-och-bus-passenger/src/m1/res/layout/bus_p_function_setting_devices_fragment.xml
+++ b/OCH/mogo-och-bus-passenger/src/m1/res/layout/bus_p_function_setting_devices_fragment.xml
@@ -8,6 +8,7 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="0dp"
         android:layout_height="0dp"
+        android:clickable="true"
         android:background="@drawable/bus_p_function_setting_soft_b_shape"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintDimensionRatio="431:110"
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 36988bbded..d63617d0db 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
@@ -8,6 +8,7 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="0dp"
         android:layout_height="0dp"
+        android:clickable="true"
         android:background="@drawable/bus_p_function_setting_soft_b_shape"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintDimensionRatio="3:1"
diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/layout/bus_p_function_video_fragment.xml b/OCH/mogo-och-bus-passenger/src/m1/res/layout/bus_p_function_video_fragment.xml
index 2c0f2890ad..301276e74a 100644
--- a/OCH/mogo-och-bus-passenger/src/m1/res/layout/bus_p_function_video_fragment.xml
+++ b/OCH/mogo-och-bus-passenger/src/m1/res/layout/bus_p_function_video_fragment.xml
@@ -2,6 +2,7 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:clickable="true"
     android:background="@android:color/holo_orange_dark"
     xmlns:app="http://schemas.android.com/apk/res-auto">