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> { 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