From b92110c78585fa6a4330dbc64c6ebe70834d14f1 Mon Sep 17 00:00:00 2001
From: qiji4215 <qiji4215@navinfo.com>
Date: Mon, 24 Jul 2023 14:28:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B8=B2=E6=9F=93=E7=AD=96?=
 =?UTF-8?q?=E7=95=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/assets/omdb_config.json          |  5 ++
 .../omqs/ui/activity/map/MainViewModel.kt     |  4 +-
 .../main/res/menu/personal_center_menu.xml    |  2 +-
 .../src/main/assets/editormarker.xml          | 87 ++++++++++---------
 .../src/main/assets/omdb/icon_1012_0.svg      |  1 +
 vtm                                           |  2 +-
 6 files changed, 59 insertions(+), 42 deletions(-)
 create mode 100644 collect-library/src/main/assets/omdb/icon_1012_0.svg

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 @@
         <item
             android:id="@+id/personal_center_menu_version"
             android:icon="@drawable/ic_baseline_layers_24"
-            android:title="版本：ONE_QE_V1.2.0_20230707_A" />
+            android:title="版本：ONE_QE_V1.4.0_20230721_A" />
     </group>
     <group android:checkableBehavior="single">
         <item android:title="小标题">
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 @@
         <m v="OMDB_RD_LINK" zoom-max="19">
             <line stroke="#9c9c9c" width="1" />
         </m>
+
+        <!-- 检查点 -->
+        <m v="OMDB_CHECKPOINT" zoom-max="20">
+            <symbol src="assets:omdb/icon_1012_0.svg" symbol-height="64"
+                symbol-width="64"></symbol>
+        </m>
+
         <!--道路种别-->
         <m v="OMDB_RD_LINK_KIND" zoom-max="19">
             <outline-layer id="kind0" stroke="#44000000" width="0.1" />
@@ -1702,7 +1709,7 @@
                             <line dasharray="35,35" stroke="#ecf0f1" width="0.1" />
                         </m>-->
             <m k="width">
-                <line stroke="#545D6C" width="3" />
+                <line stroke="#7A88A0" width="3.5" />
             </m>
         </m>0
         <!-- 道路边界类型 -->
@@ -1713,7 +1720,7 @@
             </m>
             <m k="boundaryType" v="1">
                 <!--无标线无可区分边界-->
-                <line dasharray="20,8" repeat-start="0" stroke="#ffffff" width="0.2"/>
+                <line dasharray="12,6" repeat-start="0" stroke="#ffffff" width="0.2"/>
             </m>
             <!--            <outline-layer id="boundaryType" stroke="#fcba5a" width="0.2" />
                         <m k="boundaryType" v="0">
@@ -1764,48 +1771,50 @@
             <m k="boundaryType" v="2">
                 <!--标线-->
                 <m k="markType" v="0|1|4|5|6|7|8">
-                        <!--其他|实线-->
-                        <m v="0|1|2|3|4|5|6|7|8">
-                            <m k="markColor">
-                                <m v="1">
-                                    <line stroke="#ffffff" use="boundaryType" />
-                                </m>
-                                <m v="2">
-                                    <line stroke="#eccc68" use="boundaryType" />
-                                </m>
-                                <m v="6">
-                                    <line stroke="#0000ff" use="boundaryType" />
-                                </m>
-                                <m v="7">
-                                    <line stroke="#00ff00" use="boundaryType" />
-                                </m>
-                                <m v="0|9">
-                                    <line stroke="#8e44ad" use="boundaryType" />
-                                </m>
-                            </m>
-                        </m>
+                    <!--其他|实线-->
+                    <m k="markColor" v="1">
+                        <line stroke="#ffffff" use="boundaryType" />
+                    </m>
+                    <m k="markColor" v="2">
+                        <line stroke="#eccc68" use="boundaryType" />
                     </m>
 
+                    <m k="markColor" v="6">
+                        <line stroke="#0000ff" use="boundaryType" />
+                    </m>
+
+                    <m k="markColor" v="7">
+                        <line stroke="#00ff00" use="boundaryType" />
+                    </m>
+
+                    <m k="markColor" v="0|9">
+                        <line stroke="#8e44ad" use="boundaryType" />
+                    </m>
+                </m>
                 <m k="markType" v="2|3">
                     <!--其他|实线-->
                     <m v="0|1|2|3|4|5|6|7|8">
-                        <m k="markColor">
-                            <m v="1">
-                                <line dasharray="20,8" repeat-start="0" stroke="#ffffff" width="0.2"/>
-                            </m>
-                            <m v="2">
-                                <line dasharray="20,8" repeat-start="0" stroke="#eccc68" width="0.2"/>
-                            </m>
-                            <m v="6">
-                                <line dasharray="20,8" repeat-start="0" stroke="#0000ff" width="0.2"/>
-                            </m>
-                            <m v="7">
-                                <line dasharray="20,8" repeat-start="0" stroke="#00ff00" width="0.2"/>
-                            </m>
-                            <m v="0|9">
-                                <line dasharray="20,8" repeat-start="0" stroke="#8e44ad" width="0.2"/>
-                            </m>
+
+                        <!--其他|实线-->
+                        <m k="markColor" v="1">
+                            <line dasharray="12,6" repeat-start="0" stroke="#ffffff" width="0.2"/>
                         </m>
+                        <m k="markColor" v="2">
+                            <line dasharray="12,6" repeat-start="0" stroke="#eccc68" width="0.2"/>
+                        </m>
+
+                        <m k="markColor" v="6">
+                            <line dasharray="12,6" repeat-start="0" stroke="#0000ff" width="0.2"/>
+                        </m>
+
+                        <m k="markColor" v="7">
+                            <line dasharray="12,6" repeat-start="0" stroke="#00ff00" width="0.2"/>
+                        </m>
+
+                        <m k="markColor" v="0|9">
+                            <line dasharray="12,6" repeat-start="0" stroke="#8e44ad" width="0.2"/>
+                        </m>
+
                     </m>
                 </m>
             </m>
@@ -1815,7 +1824,7 @@
             </m>
             <!--只区分虚线与实线-->
             <m k="boundaryType" v="1">
-                <line dasharray="20,8" repeat-start="0" stroke="#ffffff" width="0.2"/>
+                <line dasharray="12,6" repeat-start="0" stroke="#ffffff" width="0.2"/>
             </m>
         </m>
 
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 @@
+<?xml version="1.0" encoding="UTF-8"?><svg id="b" xmlns="http://www.w3.org/2000/svg" width="124.7" height="124.7" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 124.7 124.7"><defs><style>.i{fill:url(#f);}.j{fill:#fff;}.k{fill:#1566e8;}.l,.m{fill:#535a60;}.n{fill:#262d34;isolation:isolate;opacity:.2;}.o{fill:url(#g);stroke:#8b9fae;stroke-miterlimit:10;stroke-width:1px;}.m{opacity:0;}</style><linearGradient id="f" x1="60.1" y1="50.4" x2="64.9" y2="50.4" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#989898"/><stop offset="0" stop-color="#a3a3a3"/><stop offset=".1" stop-color="#c4c5c5"/><stop offset=".2" stop-color="#d8d9d9"/><stop offset=".3" stop-color="#e0e1e1"/><stop offset=".4" stop-color="#dbdcdc"/><stop offset=".5" stop-color="#cccece"/><stop offset=".6" stop-color="#b5b6b7"/><stop offset=".7" stop-color="#949697"/><stop offset=".8" stop-color="#6a6c6f"/><stop offset=".8" stop-color="#3f4246"/><stop offset="1" stop-color="#404247"/><stop offset="1" stop-color="#43434a"/></linearGradient><linearGradient id="g" x1="40.1" y1="23.8" x2="84.6" y2="23.8" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#afbacb"/><stop offset=".1" stop-color="#c1ccda"/><stop offset=".4" stop-color="#d9e6f0"/><stop offset=".5" stop-color="#e3f0f8"/><stop offset=".6" stop-color="#dde9f2"/><stop offset=".8" stop-color="#ccd8e4"/><stop offset="1" stop-color="#b1bbcc"/><stop offset="1" stop-color="#aeb8c9"/></linearGradient></defs><g id="c"><g><rect class="m" y="0" width="124.7" height="124.7"/><g><ellipse id="d" class="n" cx="62.4" cy="61.8" rx="14.4" ry="3.7"/><ellipse id="e" class="l" cx="62.4" cy="61.8" rx="7.5" ry="3"/><path class="i" d="M62.4,38.3h0c1.4,0,2.6,1.2,2.6,2.6v19.2c0,1.4-1.1,2.5-2.5,2.5h-.3c-1.4,0-2.5-1.1-2.5-2.5v-19.3c0-1.4,1.2-2.6,2.6-2.6Z"/><rect class="o" x="40.1" y=".5" width="44.5" height="46.6" rx="14.4" ry="14.4"/><rect class="k" x="40.6" y="2.6" width="43.5" height="44" rx="14.1" ry="14.1"/><path id="h" class="j" d="M46,11.4c-.3,0-.6-.2-.7-.4s0-.6,.1-.8c1.3-1.6,3-2.9,4.8-3.9,.2,0,.4-.1,.6,0,.2,0,.4,.2,.5,.4,.2,.4,0,.9-.3,1.1-1.7,.9-3.1,2.1-4.3,3.5-.2,.2-.4,.3-.6,.3h0Zm-1.8,2.6c-.1,0-.3,0-.4-.1-.2-.1-.3-.3-.4-.5,0-.2,0-.4,.1-.6l.3-.4c.1-.2,.3-.3,.5-.4,.2,0,.4,0,.6,0,.2,.1,.3,.3,.4,.5s0,.4-.1,.6l-.3,.4c-.1,.2-.4,.4-.7,.4h0Z"/><g><path class="j" d="M61,23.3c-.3-.1-.7-.4-1.2-.7,0,0-.2,0-.2-.1v1.5h-7.1v-1.4c-.2,.2-.5,.4-.9,.7-.1,0-.2,.2-.3,.2-.3-.5-.5-1.1-.9-1.6,.2,0,.4-.2,.6-.3h-1.6v1.8c.7,.5,1.4,1.1,2.1,1.7l-.9,1.4-1.2-1.2v7.3h-1.6v-7.6c-.4,1.3-1,2.5-1.8,3.8,0-.6-.2-1.4-.4-2.3,.9-1.5,1.6-3.2,2.2-4.9h-1.8v-1.5h1.8v-3.2h1.6v3.2h1.6v1.5c1.9-1.2,3.4-2.8,4.4-4.9h1.8c0,.1-.3,.9-.3,.9,1.4,1.8,3,3.2,4.8,4.1-.3,.5-.5,1.1-.7,1.6Zm-10.3,8.5v-1.4h6.6c.4-1,.8-2.4,1.4-4.4,.1-.5,.2-.9,.3-1.1l1.6,.4c-.1,.4-.3,1-.6,1.7-.5,1.5-.9,2.6-1.2,3.4h2.4v1.4h-10.6Zm2-2c-.4-1.4-.8-2.9-1.2-4.3l1.4-.3c.5,1.3,.9,2.7,1.3,4.2l-1.5,.4Zm3.3-10.8c-.9,1.3-2,2.5-3.3,3.5h6.9c-1.5-1.1-2.7-2.3-3.5-3.5Zm-.3,10.1c-.2-1.1-.5-2.5-1-4l1.5-.3c.4,1.3,.7,2.7,.9,4l-1.4,.3Z"/><path class="j" d="M77.8,23.9c-.5-.1-1-.3-1.4-.5v6.1h-11.6v-6c-.1,0-.3,.1-.5,.2-.4,.2-.8,.3-1.1,.4,0-.2-.2-.6-.4-1.1,0-.2-.2-.4-.2-.5,2.4-.7,4.4-1.6,6-2.7h-5.6v-1.4h6.6v-1.5h1.7v1.5h6.6v1.4h-5.6c1.6,1.1,3.6,2,6,2.6l-.7,1.6Zm-15.1,8.1v-1.3h15.6v1.3h-15.6Zm7-9.5v-2c-1.3,1.1-2.6,1.9-3.9,2.5h9.7c-1.6-.7-3-1.6-4-2.6v2h-1.7Zm-3.2,1.8v1.3h8.1v-1.3h-8.1Zm0,2.4v1.3h8.1v-1.3h-8.1Z"/></g></g></g></g></svg>
\ 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