From 5a9708581c378ee811085e5fa6cfdd05e7f210be Mon Sep 17 00:00:00 2001
From: chenfufeng <chenfufeng@zhidaoauto.com>
Date: Tue, 29 Nov 2022 10:52:01 +0800
Subject: [PATCH] =?UTF-8?q?[2.13.0=5Fupdate]=E5=B7=B2=E5=A4=84=E7=90=86?=
 =?UTF-8?q?=E7=9A=84=E5=BD=95=E5=8C=85=E6=B6=88=E6=81=AF=E9=9C=80=E6=B8=85?=
 =?UTF-8?q?=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../eagle/core/function/msgbox/DataManager.kt     | 10 +---------
 .../eagle/core/function/msgbox/MsgBoxProvider.kt  |  7 ++-----
 .../core/function/api/msgbox/IMsgBoxProvider.kt   |  4 +---
 .../function/call/msgbox/CallerMsgBoxManager.kt   | 15 ++++-----------
 4 files changed, 8 insertions(+), 28 deletions(-)

diff --git a/core/function-impl/mogo-core-function-msgbox/src/main/java/com/mogo/eagle/core/function/msgbox/DataManager.kt b/core/function-impl/mogo-core-function-msgbox/src/main/java/com/mogo/eagle/core/function/msgbox/DataManager.kt
index 5822ad2128..967608f8d8 100644
--- a/core/function-impl/mogo-core-function-msgbox/src/main/java/com/mogo/eagle/core/function/msgbox/DataManager.kt
+++ b/core/function-impl/mogo-core-function-msgbox/src/main/java/com/mogo/eagle/core/function/msgbox/DataManager.kt
@@ -130,15 +130,7 @@ object DataManager {
     }
 
     fun removeRecordInfo(key: String, value: Any) {
-        if (Thread.currentThread() == Looper.getMainLooper().thread) {
-            scope.launch {
-                withContext(Dispatchers.Default) {
-                    removedRecordMap[key] = value
-                }
-            }
-        } else {
-            removedRecordMap[key] = value
-        }
+        removedRecordMap[key] = value
     }
 
     /**
diff --git a/core/function-impl/mogo-core-function-msgbox/src/main/java/com/mogo/eagle/core/function/msgbox/MsgBoxProvider.kt b/core/function-impl/mogo-core-function-msgbox/src/main/java/com/mogo/eagle/core/function/msgbox/MsgBoxProvider.kt
index b7a05e8ac8..cafb85c7b0 100644
--- a/core/function-impl/mogo-core-function-msgbox/src/main/java/com/mogo/eagle/core/function/msgbox/MsgBoxProvider.kt
+++ b/core/function-impl/mogo-core-function-msgbox/src/main/java/com/mogo/eagle/core/function/msgbox/MsgBoxProvider.kt
@@ -42,11 +42,8 @@ class MsgBoxProvider : IMsgBoxProvider {
         return DataManager.getRecordBagData()
     }
 
-    override fun removeRecordInfo(key: String, value: Any) {
-        return DataManager.removeRecordInfo(key, value)
-    }
-
-    override fun deleteBoxBean(context: Context, msgBoxBean: MsgBoxBean) {
+    override fun removeRecordInfo(context: Context, msgBoxBean: MsgBoxBean, key: String) {
+        DataManager.removeRecordInfo(key, key)
         DataManager.delMsgBoxBean(context, msgBoxBean)
     }
 
diff --git a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/msgbox/IMsgBoxProvider.kt b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/msgbox/IMsgBoxProvider.kt
index b9178c0a1e..6444103924 100644
--- a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/msgbox/IMsgBoxProvider.kt
+++ b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/msgbox/IMsgBoxProvider.kt
@@ -21,9 +21,7 @@ interface IMsgBoxProvider: IMoGoFunctionServerProvider {
      */
     fun getCachedRecordBagData(): List<MsgBoxBean>
 
-    fun removeRecordInfo(key: String, value: Any)
-
-    fun deleteBoxBean(context: Context, msgBoxBean: MsgBoxBean)
+    fun removeRecordInfo(context: Context, msgBoxBean: MsgBoxBean, key: String)
 
     fun getDismissTime(): Long
 }
\ No newline at end of file
diff --git a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/msgbox/CallerMsgBoxManager.kt b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/msgbox/CallerMsgBoxManager.kt
index da9256e613..54232c8810 100644
--- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/msgbox/CallerMsgBoxManager.kt
+++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/msgbox/CallerMsgBoxManager.kt
@@ -45,18 +45,11 @@ object CallerMsgBoxManager {
     }
 
     /**
-     * 用户已处理的Bag包需要删除
-     * key: Bag包的唯一标识key，value:任意非空的值
+     * 用户已处理的Bag包需要删除(上传或取消都包含)
+     * key: Bag包的唯一标识key, msgBoxBean: UI展示的那个对象而不是重新new的
      */
-    fun removeRecordInfo(key: String, value: Any) {
-        providerApi?.removeRecordInfo(key, value)
-    }
-
-    /**
-     * 删除消息盒子中存入数据库的数据，比如已经处理的录制bag信息
-     */
-    fun deleteBoxBean(context: Context, msgBoxBean: MsgBoxBean) {
-        providerApi?.deleteBoxBean(context, msgBoxBean)
+    fun removeRecordInfo(context: Context, msgBoxBean: MsgBoxBean, key: String) {
+        providerApi?.removeRecordInfo(context, msgBoxBean, key)
     }
 
     fun getDismissTime(): Long {