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

app/src/main/java/com/navinfo/omqs/ui/activity/map/MainActivity.kt

@@ -9,16 +9,24 @@ import androidx.activity.viewModels
 import androidx.annotation.RequiresApi
 import androidx.core.view.WindowCompat
 import androidx.databinding.DataBindingUtil
+import androidx.lifecycle.lifecycleScope
 import androidx.navigation.findNavController
 import androidx.recyclerview.widget.LinearLayoutManager
+import com.blankj.utilcode.util.SPStaticUtils
+import com.google.gson.Gson
+import com.google.gson.reflect.TypeToken
 import com.navinfo.collect.library.map.NIMapController
 import com.navinfo.omqs.Constant
 import com.navinfo.omqs.R
+import com.navinfo.omqs.bean.ImportConfig
 import com.navinfo.omqs.databinding.ActivityMainBinding
 import com.navinfo.omqs.http.offlinemapdownload.OfflineMapDownloadManager
+import com.navinfo.omqs.tools.LayerConfigUtils
 import com.navinfo.omqs.ui.activity.BaseActivity
-import com.navinfo.omqs.ui.widget.RecyclerViewSpacesItemDecoration
+import com.navinfo.omqs.util.FlowEventBus
 import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.launch
+import com.navinfo.omqs.ui.widget.RecyclerViewSpacesItemDecoration
 import org.videolan.vlc.Util
 import javax.inject.Inject
 
@@ -62,6 +70,7 @@ class MainActivity : BaseActivity() {
         WindowCompat.setDecorFitsSystemWindows(window, false)
         super.onCreate(savedInstanceState)
         binding = DataBindingUtil.setContentView(this, R.layout.activity_main)
+
         //初始化地图
         mapController.init(
             this,
@@ -70,6 +79,8 @@ class MainActivity : BaseActivity() {
             Constant.MAP_PATH,
             Constant.USER_DATA_PATH + "/trace.sqlite"
         )
+        // 在mapController初始化前获取当前OMDB图层显隐
+        viewModel.refreshOMDBLayer(LayerConfigUtils.getLayerConfigList())
         //关联生命周期
         binding.lifecycleOwner = this
         //给xml转递对象
@@ -124,6 +135,13 @@ class MainActivity : BaseActivity() {
         viewModel.liveDataSignList.observe(this) {
             signAdapter.refreshData(it)
         }
+
+        lifecycleScope.launch {
+            // 初始化地图图层控制接收器
+            FlowEventBus.subscribe<List<ImportConfig>>(lifecycle, Constant.EVENT_LAYER_MANAGER_CHANGE) {
+                viewModel.refreshOMDBLayer(it)
+            }
+        }
     }
 
     override fun onStart() {

app/src/main/java/com/navinfo/omqs/ui/activity/map/MainViewModel.kt

@@ -28,17 +28,20 @@ import com.navinfo.collect.library.utils.GeometryTools
 import com.navinfo.collect.library.utils.GeometryToolsKt
 import com.navinfo.omqs.Constant
 import com.navinfo.omqs.R
+import com.navinfo.omqs.bean.ImportConfig
 import com.navinfo.omqs.bean.SignBean
 import com.navinfo.omqs.db.RealmOperateHelper
 import com.navinfo.omqs.ui.dialog.CommonDialog
 import com.navinfo.omqs.ui.manager.TakePhotoManager
 import com.navinfo.omqs.ui.widget.SignUtil
 import com.navinfo.omqs.util.DateTimeUtil
+import com.navinfo.omqs.util.FlowEventBus
 import com.navinfo.omqs.util.SoundMeter
 import com.navinfo.omqs.util.SpeakMode
 import dagger.hilt.android.lifecycle.HiltViewModel
 import io.realm.RealmSet
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.launch
 import org.oscim.core.GeoPoint
@@ -94,7 +97,6 @@ class MainViewModel @Inject constructor(
                 testPoint = it
             }
         }
-
     }
 
     private fun initLocation() {
@@ -319,6 +321,24 @@ class MainViewModel @Inject constructor(
         if (pop != null && pop!!.isShowing) pop!!.dismiss()
     }
 
+    /**
+     * 刷新OMDB图层显隐
+     * */
+    fun refreshOMDBLayer(layerConfigList: List<ImportConfig>) {
+        // 根据获取到的配置信息，筛选未勾选的图层名称
+        if (layerConfigList!=null && !layerConfigList.isEmpty()) {
+            val omdbVisibleList = layerConfigList.filter { importConfig->
+                importConfig.tableGroupName == "OMDB数据"
+            }.first().tables.filter { tableInfo ->
+                !tableInfo.checked
+            }.map {
+                    tableInfo -> tableInfo.table
+            }.toList()
+            com.navinfo.collect.library.system.Constant.HAD_LAYER_INVISIABLE_ARRAY = omdbVisibleList.toTypedArray()
+            // 刷新地图
+            mapController.mMapView.vtmMap.clearMap()
+        }
+    }
 
     /**
      * 处理页面调转