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

app/src/main/java/com/navinfo/omqs/db/ImportPreProcess.kt

@@ -544,6 +544,19 @@ class ImportPreProcess {
             }
         }
     }
+    /**
+     * 生成默认路口数据的参考数据
+     * */
+    fun generateIntersectionDynamic(renderEntity: RenderEntity) {
+        // 路口数据的其他点位，是保存在nodeList对应的数组下
+        if (renderEntity.properties.containsKey("type")) {
+            if (renderEntity.properties["type"] == "0") {
+                renderEntity.properties["typesrc"] = "assets:symbols/dot_blue_dark.svg"
+            } else {
+                renderEntity.properties["typesrc"] = "assets:symbols/volcano.svg"
+            }
+        }
+    }
 
     /**
      * 处理杆状物的高程数据

app/src/main/java/com/navinfo/omqs/http/taskdownload/TaskDownloadScope.kt

@@ -107,7 +107,7 @@ class TaskDownloadScope(
             if (status != FileDownloadStatus.LOADING && status != FileDownloadStatus.IMPORTING) {
                 val realm = Realm.getDefaultInstance()
                 realm.executeTransaction {
-                    it.copyToRealmOrUpdate(taskBean)
+                    it.insertOrUpdate(taskBean)
                 }
             }
         }

app/src/main/java/com/navinfo/omqs/ui/fragment/personalcenter/PersonalCenterFragment.kt

@@ -123,7 +123,8 @@ class PersonalCenterFragment(private var indoorDataListener: ((Boolean) -> Unit?
                     //116.25017070328308 40.061730653134696
                     // 定位到指定位置
                     niMapController.mMapView.vtmMap.animator()
-                        .animateTo(GeoPoint( 40.055878135289966, 116.3011588289057    ))
+//                        .animateTo(GeoPoint( 40.05108004733645, 116.29187746293708    ))
+                        .animateTo(GeoPoint( 39.91975038055932,116.35447089476969     ))
                 }
 //                R.id.personal_center_menu_task_list -> {
 //                    findNavController().navigate(R.id.TaskManagerFragment)

app/src/main/java/com/navinfo/omqs/ui/fragment/personalcenter/PersonalCenterViewModel.kt

@@ -169,6 +169,12 @@ class PersonalCenterViewModel @Inject constructor(
                 importOMDBHelper.importOmdbZipFile(importOMDBHelper.omdbFile, task).collect {
                     Log.d("importOMDBData", it)
                 }
+            } else {
+                val newTask = TaskBean()
+                newTask.id = 9999
+                importOMDBHelper.importOmdbZipFile(importOMDBHelper.omdbFile, newTask).collect {
+                    Log.d("importOMDBData", it)
+                }
             }
             Log.d("OMQSApplication", "导入数据完成")
         }