diff --git a/app/src/main/assets/omdb_config.json b/app/src/main/assets/omdb_config.json
index f523a811..1cf75acf 100644
--- a/app/src/main/assets/omdb_config.json
+++ b/app/src/main/assets/omdb_config.json
@@ -1,5 +1,10 @@
{
"tableMap" : {
+ "1012": {
+ "table": "OMDB_CHECKPOINT",
+ "code": 1012,
+ "name": "检查点"
+ },
"2001": {
"table": "OMDB_RD_LINK",
"code": 2001,
diff --git 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
index 58600d3d..577bfab2 100644
--- 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,7 +262,9 @@ class MainViewModel @Inject constructor(
viewModelScope.launch(Dispatchers.IO) {
getTaskBean()
//初始化选中的任务高亮高亮
- mapController.lineHandler.showTaskLines(currentTaskBean?.hadLinkDvoList!!)
+ if(currentTaskBean!=null){
+ mapController.lineHandler.showTaskLines(currentTaskBean?.hadLinkDvoList!!)
+ }
initQsRecordData()
initNoteData()
initNILocationData()
diff --git a/app/src/main/res/menu/personal_center_menu.xml b/app/src/main/res/menu/personal_center_menu.xml
index e457c118..07e15bcc 100644
--- a/app/src/main/res/menu/personal_center_menu.xml
+++ b/app/src/main/res/menu/personal_center_menu.xml
@@ -38,7 +38,7 @@
+ android:title="版本:ONE_QE_V1.4.0_20230721_A" />
-
diff --git a/collect-library/src/main/assets/editormarker.xml b/collect-library/src/main/assets/editormarker.xml
index 73eaf196..04a8b27d 100644
--- a/collect-library/src/main/assets/editormarker.xml
+++ b/collect-library/src/main/assets/editormarker.xml
@@ -1603,6 +1603,13 @@
+
+
+
+
+
+
@@ -1702,7 +1709,7 @@
-->
-
+
0
@@ -1713,7 +1720,7 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1815,7 +1824,7 @@
-
+
diff --git a/collect-library/src/main/assets/omdb/icon_1012_0.svg b/collect-library/src/main/assets/omdb/icon_1012_0.svg
new file mode 100644
index 00000000..6445aca0
--- /dev/null
+++ b/collect-library/src/main/assets/omdb/icon_1012_0.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/vtm b/vtm
index 1ee201a4..dd13e533 160000
--- a/vtm
+++ b/vtm
@@ -1 +1 @@
-Subproject commit 1ee201a41f78f169873848209a3f3bdac36f185a
+Subproject commit dd13e533c38b5738ab404c2737d7ccadeff01323