From 166b0572738e38f57f21d468a806aa9a90a45cde Mon Sep 17 00:00:00 2001
From: zhongchao <zhongchao@zhidaoauto.com>
Date: Fri, 21 Jul 2023 11:56:04 +0800
Subject: [PATCH] [3.4.0] fix ui problem

---
 .../mogo/och/taxi/passenger/ui/TaxiPSettingView.kt   |  4 ----
 .../taxi/passenger/ui/TaxiPassengerBaseFragment.kt   | 12 ++++--------
 .../main/res/drawable/taxi_p_setting_selector.xml    |  2 ++
 3 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPSettingView.kt b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPSettingView.kt
index e0a1327502..6c66dc4a7d 100644
--- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPSettingView.kt
+++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPSettingView.kt
@@ -8,7 +8,6 @@ import android.graphics.drawable.LayerDrawable
 import android.media.AudioManager
 import android.provider.Settings
 import android.util.AttributeSet
-import android.util.Log
 import android.view.Gravity
 import android.view.LayoutInflater
 import android.view.View
@@ -74,7 +73,6 @@ class TaxiPSettingView @JvmOverloads constructor(
                 tvVoicePer.text = "$progress%"
                 if (fromUser) {
                     mMaxVolume?.let {
-                        Log.d("emArrow","progress:$progress, cal :${(progress.toFloat() / 100)}, currentV:${((progress.toFloat() / 100) * it).toInt()} ")
                         var currentValue = ((progress.toFloat() / 100) * it).toInt()
                         if (currentValue <= 0) {
                             currentValue = 1
@@ -95,9 +93,7 @@ class TaxiPSettingView @JvmOverloads constructor(
         context?.let {
             mAudioManager = it.getSystemService(Context.AUDIO_SERVICE) as AudioManager
             mMaxVolume = mAudioManager?.getStreamMaxVolume(AudioManager.STREAM_MUSIC)
-            Log.d("emArrow","max volume:$mMaxVolume")
             val mCurrentVolume = mAudioManager?.getStreamVolume(AudioManager.STREAM_MUSIC)
-            Log.d("emArrow","mCurrentVolume:$mCurrentVolume")
             mMaxVolume?.let { max ->
                 mCurrentVolume?.let { current ->
                     if (current == 1) {
diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt
index ab3d2e9a95..3dde9a45ee 100644
--- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt
+++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt
@@ -71,12 +71,10 @@ class TaxiPassengerBaseFragment() :
         overMapView.onCreateView(savedInstanceState)
     }
 
-    private var settingClick = false
-
     private fun initListener() {
-        ck_setting.setOnClickListener {
-            clSettingView.visibility = if(!settingClick) View.VISIBLE else View.GONE
-            settingClick = !settingClick
+        ck_setting.isChecked = false
+        ck_setting.setOnCheckedChangeListener { _, isChecked ->
+            clSettingView.visibility = if(isChecked) View.VISIBLE else View.GONE
         }
         bottom.setOverMapApplyClick(object : BottomBar.ApplyClickLintener{
             override fun onApplyClick(selectItem: BottomBar.SelectView) {
@@ -86,7 +84,6 @@ class TaxiPassengerBaseFragment() :
                         mapBizView.visibility = View.VISIBLE
                         presenter?.setItineraryVisibility()
                         ck_setting.visibility = View.VISIBLE
-                        clSettingView.visibility = View.VISIBLE
                         if (DeviceUtils.isLenovoModel() || DeviceUtils.isEB5Model()) {
                             romaPView.visibility = View.VISIBLE
                         } else {
@@ -103,7 +100,6 @@ class TaxiPassengerBaseFragment() :
                         mapBizView.visibility = View.GONE
                         presenter?.setItineraryVisibility()
                         ck_setting.visibility = View.VISIBLE
-                        clSettingView.visibility = View.VISIBLE
                         romaPView.visibility = View.GONE
                         rv_location_center.visibility = View.VISIBLE
                         pcnActionView.visibility = View.VISIBLE
@@ -116,7 +112,7 @@ class TaxiPassengerBaseFragment() :
                         mapBizView.visibility = View.GONE
                         presenter?.setItineraryVisibility()
                         ck_setting.visibility = View.GONE
-                        clSettingView.visibility = View.GONE
+                        ck_setting.isChecked = false
                         romaPView.visibility = View.GONE
                         rv_location_center.visibility = View.GONE
                         pcnActionView.visibility = View.GONE
diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_p_setting_selector.xml b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_p_setting_selector.xml
index f31ba1607d..8058cbece5 100644
--- a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_p_setting_selector.xml
+++ b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_p_setting_selector.xml
@@ -2,6 +2,8 @@
 <selector xmlns:tools="http://schemas.android.com/tools" xmlns:android="http://schemas.android.com/apk/res/android" tools:ignore="MissingDefaultResource">
     <item android:drawable="@drawable/taxi_p_setting_checked" android:state_focused="true" android:state_pressed="true" />
     <item android:drawable="@drawable/taxi_p_setting_checked" android:state_focused="false" android:state_pressed="true" />
+    <item android:drawable="@drawable/taxi_p_setting_checked" android:state_checked="true" />
+    <item android:drawable="@drawable/taxi_p_setting_normal" android:state_checked="false" />
     <item android:drawable="@drawable/taxi_p_setting_checked" android:state_selected="true" />
     <item android:drawable="@drawable/taxi_p_setting_checked" android:state_focused="true" />
     <item android:drawable="@drawable/taxi_p_setting_normal" />