From 66dfb43a6f94cc45aa2a463ef26abc519f93ceba Mon Sep 17 00:00:00 2001
From: xuxinchao <xuxinchao@zhidaoauto.com>
Date: Thu, 21 Dec 2023 21:06:04 +0800
Subject: [PATCH] =?UTF-8?q?[6.2.6]AI=E6=95=B0=E6=8D=AE=E9=87=87=E9=9B=86?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=95=B0=E6=8D=AE=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../badcase/biz/AIDataCollectWindow.kt        | 41 ++++++++++---------
 .../repository/net/api/BadCaseNetManager.kt   | 13 ++++--
 2 files changed, 31 insertions(+), 23 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 91ba40f715..a9db71ea63 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
@@ -135,6 +135,27 @@ class AIDataCollectWindow constructor(activity: Activity) : View.OnTouchListener
             }
         })
         rvCollectList?.adapter = aiDataListAdapter
+
+        //数据请求错误，使用缓存数据
+        if(BadCaseReasonStore.getAiDataRecord().isNotEmpty()){
+            val list = ArrayList<AiDataEntity>()
+            val result = JSONArray(BadCaseReasonStore.getAiDataRecord())
+            if(result.length()>0){
+                for(i in 0 until result.length()){
+                    val jsonObject = result[i] as JSONObject
+                    val id = jsonObject.optInt("id")
+                    val name = jsonObject.optString("name")
+                    val content = jsonObject.optString("content")
+                    val entity = AiDataEntity(id, name, content,false)
+                    list.add(entity)
+                }
+            }
+            if(list.isNotEmpty()){
+                //刷新列表
+                aiDataListAdapter?.setData(list)
+            }
+        }
+
         //注册网络接口获取数据监听
         CallerDevaToolsNetManager.addListener(this.hashCode().toString(),this)
         //获取数据
@@ -319,25 +340,7 @@ class AIDataCollectWindow constructor(activity: Activity) : View.OnTouchListener
     }
 
     override fun onAiDataError() {
-        //数据请求错误，使用缓存数据
-        if(BadCaseReasonStore.getAiDataRecord().isNotEmpty()){
-            val list = ArrayList<AiDataEntity>()
-            val result = JSONArray(BadCaseReasonStore.getAiDataRecord())
-            if(result.length()>0){
-                for(i in 0 until result.length()){
-                    val jsonObject = result[i] as JSONObject
-                    val id = jsonObject.optInt("id")
-                    val name = jsonObject.optString("name")
-                    val content = jsonObject.optString("content")
-                    val entity = AiDataEntity(id, name, content,false)
-                    list.add(entity)
-                }
-            }
-            if(list.isNotEmpty()){
-                //刷新列表
-                aiDataListAdapter?.setData(list)
-            }
-        }else{
+        if(BadCaseReasonStore.getAiDataRecord().isEmpty()){
             ToastUtils.showShort("AI数据采集数据请求错误且无缓存数据可用")
         }
     }
diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/repository/net/api/BadCaseNetManager.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/repository/net/api/BadCaseNetManager.kt
index 0875b4b5a1..81949accd1 100644
--- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/repository/net/api/BadCaseNetManager.kt
+++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/repository/net/api/BadCaseNetManager.kt
@@ -37,11 +37,16 @@ class BadCaseNetManager {
                         val entity = AiDataEntity(id, name, content,false)
                         list.add(entity)
                     }
+                    if(it != BadCaseReasonStore.getAiDataRecord()){
+                        //将结果回调到调用页面
+                        CallerDevaToolsNetManager.invokeAiDataResponse(list)
+                        //缓存数据
+                        BadCaseReasonStore.setAiDataRecord(it)
+                    }
+                }else{
+                    CallerDevaToolsNetManager.invokeAiDataError()
                 }
-                //将结果回调到调用页面
-                CallerDevaToolsNetManager.invokeAiDataResponse(list)
-                //缓存数据
-                BadCaseReasonStore.setAiDataRecord(it)
+
             },
             onError =
             {