From 44817e500d039b5164d825e2170d8cf8c123932a Mon Sep 17 00:00:00 2001
From: xuxinchao <xuxinchao@zhidaoauto.com>
Date: Tue, 12 Dec 2023 17:10:50 +0800
Subject: [PATCH] =?UTF-8?q?[6.2.4]=E6=95=B0=E6=8D=AE=E9=87=87=E9=9B=86?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E4=B8=A4=E4=B8=AA=E4=BB=A5=E4=B8=8A=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E6=97=B6=EF=BC=8C=E5=9C=A8=E5=88=97=E8=A1=A8=E4=B8=AD?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0=E6=98=AF=E6=B2=A1=E6=9C=89=E5=88=86=E5=BC=80?=
 =?UTF-8?q?=E7=9A=84=EF=BC=8C=E5=BB=BA=E8=AE=AE=E4=BD=BF=E7=94=A8&?=
 =?UTF-8?q?=E8=BF=9E=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../badcase/biz/AIDataCollectWindow.kt        | 20 +++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/AIDataCollectWindow.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/AIDataCollectWindow.kt
index 361d7639bb..72a59048dc 100644
--- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/AIDataCollectWindow.kt
+++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/AIDataCollectWindow.kt
@@ -42,6 +42,7 @@ import org.json.JSONObject
 import record_cache.RecordPanelOuterClass
 import java.lang.StringBuilder
 import java.util.*
+import kotlin.collections.ArrayList
 
 /**
  * @author XuXinChao
@@ -66,6 +67,7 @@ class AIDataCollectWindow constructor(activity: Activity) : View.OnTouchListener
     private lateinit var tvCollectCancel: TextView //取消按钮
 
     private var collectReason: StringBuilder = StringBuilder()
+    private var collectList = ArrayList<String>()
 
     private var aiDataListAdapter: AiDataListAdapter?= null
 
@@ -122,10 +124,13 @@ class AIDataCollectWindow constructor(activity: Activity) : View.OnTouchListener
         aiDataListAdapter?.setListener(object: AiDataListAdapter.AiDataClickListener{
             override fun onClick(reason: String, isChecked: Boolean) {
                 if(isChecked){
-                    collectReason.append(reason)
+                    if(!collectList.contains(reason)){
+                        collectList.add(reason)
+                    }
                 }else{
-                    val index = collectReason.indexOf(reason)
-                    collectReason.delete(index,index+reason.length)
+                    if(collectList.contains(reason)){
+                        collectList.remove(reason)
+                    }
                 }
             }
         })
@@ -137,10 +142,17 @@ class AIDataCollectWindow constructor(activity: Activity) : View.OnTouchListener
 
         //上报
         tvCollectReport.setOnClickListener {
-            if(collectReason.isBlank()){
+            if(collectList.isEmpty()){
                 ToastUtils.showShort("请选择最少一个原因")
                 return@setOnClickListener
             }
+            collectReason.clear()
+            for(index in collectList.indices){
+                if(index!=0){
+                    collectReason.append("&")
+                }
+                collectReason.append(collectList[index])
+            }
             //上报到工控机
             CallerAutoPilotControlManager.recordCause(recordKey.toString(),recordFileName,"",
                 collectReason.toString())