merge code

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

@@ -168,6 +168,7 @@ class MainViewModel @Inject constructor(
             initTaskData()
             initQsRecordData()
             initNoteData()
+            initNILocationData()
         }
     }
 
@@ -218,6 +219,18 @@ class MainViewModel @Inject constructor(
         }
     }
 
+    private suspend fun initNILocationData() {
+        //加载轨迹数据
+        val id = sharedPreferences.getInt(Constant.SELECT_TASK_ID, -1)
+        val list: List<NiLocation>? = TraceDataBase.getDatabase(
+            mapController.mMapView.context,
+            Constant.USER_DATA_PATH
+        ).niLocationDao.findToTaskIdAll(id.toString())
+        list!!.forEach {
+            mapController.markerHandle.addNiLocationMarkerItem(it)
+        }
+    }
+
     /**
      * 初始化定位信息
      */
@@ -284,18 +297,6 @@ class MainViewModel @Inject constructor(
             }
         }
 
-        //加载轨迹数据
-        viewModelScope.launch(Dispatchers.IO) {
-            val id = sharedPreferences.getInt(Constant.SELECT_TASK_ID, -1)
-            val list: List<NiLocation>? = TraceDataBase.getDatabase(
-                mapController.mMapView.context,
-                Constant.USER_DATA_PATH
-            ).niLocationDao.findToTaskIdAll(id.toString())
-            list!!.forEach {
-                mapController.markerHandle.addNiLocationMarkerItem(it)
-            }
-        }
-
         //显示轨迹图层
         mapController.layerManagerHandler.showNiLocationLayer()