From d11dd5e8065aaa06de83dbb19cceeb7c947e1374 Mon Sep 17 00:00:00 2001
From: xiaoyan <xiaoyan159@163.com>
Date: Wed, 9 Aug 2023 17:20:57 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E9=80=82=E9=85=8D=E9=9D=A2=E7=BA=B9?=
 =?UTF-8?q?=E7=90=86=E5=8F=8A=E6=96=87=E5=AD=97=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/navinfo/omqs/http/taskdownload/TaskDownloadScope.kt | 2 +-
 .../ui/fragment/personalcenter/PersonalCenterFragment.kt    | 3 ++-
 .../ui/fragment/personalcenter/PersonalCenterViewModel.kt   | 6 ++++++
 collect-library/src/main/assets/editormarker.xml            | 3 ++-
 vtm                                                         | 2 +-
 5 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/navinfo/omqs/http/taskdownload/TaskDownloadScope.kt b/app/src/main/java/com/navinfo/omqs/http/taskdownload/TaskDownloadScope.kt
index 61d6135b..7eeea9e7 100644
--- a/app/src/main/java/com/navinfo/omqs/http/taskdownload/TaskDownloadScope.kt
+++ b/app/src/main/java/com/navinfo/omqs/http/taskdownload/TaskDownloadScope.kt
@@ -108,7 +108,7 @@ class TaskDownloadScope(
             if (status != FileDownloadStatus.LOADING && status != FileDownloadStatus.IMPORTING) {
                 val realm = Realm.getDefaultInstance()
                 realm.executeTransaction {
-                    it.copyToRealmOrUpdate(taskBean)
+                    it.insertOrUpdate(taskBean)
                 }
             }
         }
diff --git a/app/src/main/java/com/navinfo/omqs/ui/fragment/personalcenter/PersonalCenterFragment.kt b/app/src/main/java/com/navinfo/omqs/ui/fragment/personalcenter/PersonalCenterFragment.kt
index 35f27ab1..a5859a3d 100644
--- a/app/src/main/java/com/navinfo/omqs/ui/fragment/personalcenter/PersonalCenterFragment.kt
+++ b/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.05108004733645, 116.29187746293708    ))
+//                        .animateTo(GeoPoint( 40.05108004733645, 116.29187746293708    ))
+                        .animateTo(GeoPoint( 39.91975038055932,116.35447089476969     ))
                 }
 //                R.id.personal_center_menu_task_list -> {
 //                    findNavController().navigate(R.id.TaskManagerFragment)
diff --git a/app/src/main/java/com/navinfo/omqs/ui/fragment/personalcenter/PersonalCenterViewModel.kt b/app/src/main/java/com/navinfo/omqs/ui/fragment/personalcenter/PersonalCenterViewModel.kt
index d20db0cf..40ce76a4 100644
--- a/app/src/main/java/com/navinfo/omqs/ui/fragment/personalcenter/PersonalCenterViewModel.kt
+++ b/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", "导入数据完成")
         }
diff --git a/collect-library/src/main/assets/editormarker.xml b/collect-library/src/main/assets/editormarker.xml
index 54fa63a9..6d14d464 100644
--- a/collect-library/src/main/assets/editormarker.xml
+++ b/collect-library/src/main/assets/editormarker.xml
@@ -1951,7 +1951,8 @@
         </m>
 
         <m v="OMDB_AREA">
-            <area use="sign-bg" repeat="false" src="assets:omdb/diversion_zone.jpg" stroke="#ff0000" stroke-width="2"></area>
+<!--            <area use="sign-bg" repeat="false" src="assets:omdb/veer_side_walk.jpg" stroke="#ff0000" stroke-width="2"></area>-->
+            <area use="sign-bg" repeat="false" src="@text:人行横道" stroke="#ff0000" stroke-width="2"></area>
         </m>
         <!-- 路口 -->
         <m v="OMDB_INTERSECTION">
diff --git a/vtm b/vtm
index 0b3c9340..58f23103 160000
--- a/vtm
+++ b/vtm
@@ -1 +1 @@
-Subproject commit 0b3c93403228c41607d8f2d40a9c0f6a86403c34
+Subproject commit 58f231037c44ccc1c82d00818c402a2894ca4e09