Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS

2023-05-23 09:48:21 +08:00
parent dc6b4b91e5 1050eed1d6
commit 6d0f36068d
11 changed files with 205 additions and 66 deletions
--- a/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainViewModel.kt
+++ b/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainViewModel.kt
@@ -386,9 +386,12 @@ class MainViewModel @Inject constructor(
        if (layerConfigList != null && !layerConfigList.isEmpty()) {
            val omdbVisibleList = layerConfigList.filter { importConfig ->
                importConfig.tableGroupName == "OMDB数据"
-            }.first().tables.filter { tableInfo ->
+            }.first().tableMap.filter {
+                    entry ->
+                val tableInfo = entry.value
                !tableInfo.checked
-            }.map { tableInfo ->
+            }.map { entry ->
+                val tableInfo = entry.value
                tableInfo.table
            }.toList()
            com.navinfo.collect.library.system.Constant.HAD_LAYER_INVISIABLE_ARRAY =