From dfe39842e2e6a4f8ec38683e38820d8d85e78754 Mon Sep 17 00:00:00 2001
From: yangyakun <yangyakun@zhidaoauto.com>
Date: Mon, 13 Feb 2023 22:08:31 +0800
Subject: [PATCH] =?UTF-8?q?[m1]=20[1.0.0]=20[=E6=B8=A9=E5=BA=A6=E9=80=89?=
 =?UTF-8?q?=E4=B8=AD=E4=BF=AE=E6=94=B9=E9=85=8D=E7=BD=AE]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ui/BusPassengerFunctionSoftFragment.kt         | 11 +----------
 .../passenger/ui/adapter/TemperatureAdapter.java   | 14 ++++++++++++--
 ...ion_airconditon_pattern_text_color_selector.xml |  2 --
 3 files changed, 13 insertions(+), 14 deletions(-)

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 f4758cff68..b45fe03d17 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
@@ -166,15 +166,14 @@ class BusPassengerFunctionSoftFragment :
 
         pickerLayoutManager.setOnScrollStopListener { view ->
             if (view is TextView) {
-                view.setTextColor(Color.WHITE)
                 // 未拖到中点、自动滚动到中点会短时间触发两次
                 if (ClickUtils.isClickTooFrequent(rv_aircondition_temperature)) {
                     return@setOnScrollStopListener
                 }
                 val tag = view.tag
                 if (tag is Temperature) {
+                    adapter.setCheckIndex(tag.index)
                     currentTemperature = tag
-                    ToastUtils.showShort(tag.value)
                     if(rv_aircondition_temperature.tag== touchTag){
                         rv_aircondition_temperature.tag = null
                         return@setOnScrollStopListener
@@ -187,13 +186,6 @@ class BusPassengerFunctionSoftFragment :
 
             }
         }
-        rv_aircondition_temperature.post {
-            rv_aircondition_temperature.getChildAt(0)?.let {
-                if (it is TextView) {
-                    it.setTextColor(Color.WHITE)
-                }
-            }
-        }
     }
 
     private fun getData(): MutableList<Temperature> {
@@ -314,7 +306,6 @@ class BusPassengerFunctionSoftFragment :
     private fun heaterAirEnable(enable: Boolean) {
         tv_temperature_title.isEnabled = enable
         rv_aircondition_temperature.isEnabled = enable
-        rb_wind_speed_low.isEnabled = enable
         val layoutManager = rv_aircondition_temperature.layoutManager
         if (layoutManager is PickerLayoutManager) {
             layoutManager.setHorizontallyScroll(enable)
diff --git a/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/adapter/TemperatureAdapter.java b/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/adapter/TemperatureAdapter.java
index 127040a013..f7f39e1bdb 100644
--- a/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/adapter/TemperatureAdapter.java
+++ b/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/adapter/TemperatureAdapter.java
@@ -1,6 +1,7 @@
 package com.mogo.och.bus.passenger.ui.adapter;
 
 import android.content.Context;
+import android.graphics.Color;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -25,6 +26,7 @@ public class TemperatureAdapter extends RecyclerView.Adapter<TemperatureAdapter.
     private List<Temperature> dataList;
     private RecyclerView recyclerView;
     private Boolean enable = true;
+    private int checkIndex = 0;
 
     public TemperatureAdapter(Context context, List<Temperature> dataList, RecyclerView recyclerView) {
         this.context = context;
@@ -44,9 +46,12 @@ public class TemperatureAdapter extends RecyclerView.Adapter<TemperatureAdapter.
     public void onBindViewHolder(TextVH holder, int position) {
         Temperature temperature = dataList.get(holder.getBindingAdapterPosition());
         holder.pickerTxt.setText(temperature.getShowTitle());
-
         if(enable){
-            holder.pickerTxt.setTextColor(ContextCompat.getColor(context,R.color.bus_p_m1_47576e));
+            if(position==checkIndex){
+                holder.pickerTxt.setTextColor(Color.WHITE);
+            }else {
+                holder.pickerTxt.setTextColor(ContextCompat.getColor(context,R.color.bus_p_m1_47576e));
+            }
         }else {
             holder.pickerTxt.setTextColor(ContextCompat.getColor(context,R.color.bus_p_m1_6647576e));
         }
@@ -77,6 +82,11 @@ public class TemperatureAdapter extends RecyclerView.Adapter<TemperatureAdapter.
         notifyDataSetChanged();
     }
 
+    public void setCheckIndex(int index) {
+        checkIndex = index;
+        notifyItemChanged(checkIndex);
+    }
+
     class TextVH extends RecyclerView.ViewHolder {
         TextView pickerTxt;
 
diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/color/bus_p_function_airconditon_pattern_text_color_selector.xml b/OCH/mogo-och-bus-passenger/src/m1/res/color/bus_p_function_airconditon_pattern_text_color_selector.xml
index 2ca70c84f5..a920a7421b 100644
--- a/OCH/mogo-och-bus-passenger/src/m1/res/color/bus_p_function_airconditon_pattern_text_color_selector.xml
+++ b/OCH/mogo-och-bus-passenger/src/m1/res/color/bus_p_function_airconditon_pattern_text_color_selector.xml
@@ -2,7 +2,5 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:color="@android:color/white" android:state_checked="true"/>
     <item android:color="@color/bus_p_m1_47576e" android:state_checked="false"/>
-    <item android:color="@color/bus_p_m1_6647576e" android:state_enabled="false"/>
-    <item android:color="@color/bus_p_m1_47576e" android:state_enabled="true"/>
     <item android:color="@color/bus_p_m1_47576e" />
 </selector>
\ No newline at end of file