From 2b01260b5c57f681e0654ddcedaa72f15ae52faf Mon Sep 17 00:00:00 2001
From: xuxinchao <xuxinchao@zhidaoauto.com>
Date: Tue, 12 Dec 2023 18:12:19 +0800
Subject: [PATCH] =?UTF-8?q?[6.2.4]=E5=BD=95=E5=8C=85=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=EF=BC=8C=E5=B7=B2=E7=BB=8F=E4=B8=8A=E6=8A=A5=E7=9A=84Bag?=
 =?UTF-8?q?=E4=B8=8D=E5=86=8D=E6=94=AF=E6=8C=81=E7=BC=96=E8=BE=91=EF=BC=8C?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E6=8C=89=E9=92=AE=E7=BD=AE=E7=81=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../biz/adapter/BagManagerListAdapter.kt      | 24 +++++++++++++------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/adapter/BagManagerListAdapter.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/adapter/BagManagerListAdapter.kt
index 2f20730b5c..f8e597809a 100644
--- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/adapter/BagManagerListAdapter.kt
+++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/adapter/BagManagerListAdapter.kt
@@ -1,5 +1,6 @@
 package com.zhjt.mogo_core_function_devatools.badcase.biz.adapter
 
+import android.os.Build
 import android.text.Editable
 import android.text.TextWatcher
 import android.view.LayoutInflater
@@ -125,6 +126,12 @@ class BagManagerListAdapter: RecyclerView.Adapter<RecyclerView.ViewHolder>() {
                                 //已上报的Bag不支持再查看,图标置为灰色，并且不可点击
                                 holder.ivMapScreen.alpha = 0.5f
                                 holder.ivMapScreen.isClickable = false
+                                //已上报的Bag不能再进行编辑，编辑图标置灰，并且不可点击
+                                holder.ivEditReason.alpha = 0.5f
+                                holder.ivEditReason.isClickable = false
+                                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                                    holder.etBagNameEdit.focusable = View.NOT_FOCUSABLE
+                                }
                             }else{
                                 //未上报
                                 holder.tvBagReportStatus.text = "上报"
@@ -147,6 +154,15 @@ class BagManagerListAdapter: RecyclerView.Adapter<RecyclerView.ViewHolder>() {
                                         }
                                     }
                                 }
+
+                                //编辑文字按钮
+                                holder.ivEditReason.setOnClickListener {
+                                    holder.etBagNameEdit.requestFocus()
+                                    holder.etBagNameEdit.performClick()
+                                    //调起软键盘
+                                    bagClickListener?.startEdit(holder.etBagNameEdit)
+                                }
+
                             }
                         }
                         if(des.description.isEmpty()){
@@ -173,13 +189,7 @@ class BagManagerListAdapter: RecyclerView.Adapter<RecyclerView.ViewHolder>() {
                         holder.tvBagResource.setBackgroundResource(R.drawable.bag_auto_button_bg)
                     }
 
-                    //编辑文字按钮
-                    holder.ivEditReason.setOnClickListener {
-                        holder.etBagNameEdit.requestFocus()
-                        holder.etBagNameEdit.performClick()
-                        //调起软键盘
-                        bagClickListener?.startEdit(holder.etBagNameEdit)
-                    }
+
 
                     if(bagInfoEntity.description?.hasAudio == true){
                         holder.ivBagAudio.visibility = View.VISIBLE