From fb784a829f12055ab3cd1a0850e244aeb32870dc Mon Sep 17 00:00:00 2001
From: aibingbing <aibingbing@zhidaoauto.com>
Date: Tue, 24 Sep 2024 16:33:15 +0800
Subject: [PATCH] =?UTF-8?q?[6.7.0][=E5=B7=A5=E5=85=B7=E7=AE=B1]=20fix:=20?=
 =?UTF-8?q?=E6=BC=AB=E6=B8=B8=20=E6=8C=89=E9=92=AE=E5=88=9D=E5=A7=8B?=
 =?UTF-8?q?=E5=8C=96=E5=88=A4=E6=96=AD=E6=97=B6=E6=9C=BA=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mogo/eagle/core/function/hmi/bone/tab/ToolKitTabView.kt | 6 +++---
 .../core/function/hmi/bone/toolkit/ToolKitDataManager.kt    | 3 ++-
 .../function/hmi/bone/toolkit/custom/ToolDriverRomaView.kt  | 2 ++
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/tab/ToolKitTabView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/tab/ToolKitTabView.kt
index 2c56875901..d00c3b496b 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/tab/ToolKitTabView.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/tab/ToolKitTabView.kt
@@ -51,8 +51,6 @@ class ToolKitTabView @JvmOverloads constructor(
     }
 
     private fun initView() {
-        context?.also { ToolKitDataManager.checkAndAddRomaItem(it) }
-
         // 设置布局管理器为GridLayoutManager，每行3列
         recyclerView.layoutManager = GridLayoutManager(context, 3)
         val adapter = ToolKitListAdapter(ToolKitDataManager.toolList)
@@ -72,11 +70,13 @@ class ToolKitTabView @JvmOverloads constructor(
             ViewModelProvider(it).get(ToolKitViewModel::class.java)
         }
         viewModel?.toolKitList?.observeForever(Observer<ArrayList<ToolKitBean>> { data ->
-            Logger.d(TAG, "new list size== ${data.size}")
+            Logger.d(TAG, "new list size == ${data.size}")
             val old = adapter.items
             val result = DiffUtil.calculateDiff(ToolKitListDiffCallback(old, data))
             adapter.items = data
             result.dispatchUpdatesTo(adapter)
         }.also { observer = it })
+
+        context?.also { ToolKitDataManager.checkAndAddRomaItem(it) }
     }
 }
\ No newline at end of file
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/toolkit/ToolKitDataManager.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/toolkit/ToolKitDataManager.kt
index b71bcc3c9c..673b975272 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/toolkit/ToolKitDataManager.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/toolkit/ToolKitDataManager.kt
@@ -210,7 +210,7 @@ object ToolKitDataManager : IToolKitItemClickListener {
      */
     fun checkAndAddRomaItem(ctx: Context) {
         if (toolList.map { it.toolTag }.contains(ToolTypeEnum.ROMA.name)) {
-            Logger.i(TAG, "checkAndAddRomaItem 已经添加跳过")
+            Logger.i(TAG, "checkAndAddRomaItem 已经添加 跳过")
             return
         }
         synchronized(toolList) {
@@ -222,6 +222,7 @@ object ToolKitDataManager : IToolKitItemClickListener {
                     ToolTypeEnum.ROMA.name,
                     getRoamItemView(ctx)
                 )
+                viewModel?.updateToolKitData(toolList)
             }
         }
     }
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/toolkit/custom/ToolDriverRomaView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/toolkit/custom/ToolDriverRomaView.kt
index 2763634338..236608766b 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/toolkit/custom/ToolDriverRomaView.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/toolkit/custom/ToolDriverRomaView.kt
@@ -10,6 +10,7 @@ import com.mogo.eagle.core.function.api.map.roma.IMoGoRomaListener
 import com.mogo.eagle.core.function.call.map.CallerMapIdentifyManager.romaTrigger
 import com.mogo.eagle.core.function.call.map.CallerMapRomaListener
 import com.mogo.eagle.core.function.hmi.R
+import com.mogo.eagle.core.utilcode.mogo.logger.Logger
 import com.mogo.eagle.core.utilcode.util.ClickUtils
 import com.mogo.eagle.core.utilcode.util.ThreadUtils
 import com.mogo.eagle.core.utilcode.util.ToastUtils
@@ -60,6 +61,7 @@ class ToolDriverRomaView @JvmOverloads constructor(
     }
 
     override fun romaViewStatus(status: Boolean) {
+        Logger.d(TAG, "romaViewStatus status->$status")
         ThreadUtils.runOnUiThread {
             if (status) {
                 this.visibility = View.VISIBLE