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

Conflicts: app/src/main/java/com/navinfo/omqs/ui/activity/map/MainViewModel.kt
2023-07-24 14:30:12 +08:00
parent b92110c785 5806fbf5ac
commit 17524bbabb
1 changed files with 2 additions and 2 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
@@ -262,8 +262,8 @@ class MainViewModel @Inject constructor(
        viewModelScope.launch(Dispatchers.IO) {
            getTaskBean()
            //初始化选中的任务高亮高亮
-            if(currentTaskBean!=null){
+            if (currentTaskBean != null) {
-                mapController.lineHandler.showTaskLines(currentTaskBean?.hadLinkDvoList!!)
+                mapController.lineHandler.showTaskLines(currentTaskBean!!.hadLinkDvoList)
            }
            initQsRecordData()
            initNoteData()