From f1d6ebe22b30ceb7651d563229c32b2ab18c575b Mon Sep 17 00:00:00 2001
From: xiaoyan <xiaoyan159@163.com>
Date: Tue, 25 Apr 2023 17:15:47 +0800
Subject: [PATCH 1/2] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E5=B8=B8?=
 =?UTF-8?q?=E8=A7=84=E7=82=B9=E9=99=90=E9=80=9F=E7=9A=84=E6=B8=B2=E6=9F=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/navinfo/omqs/db/ImportOMDBHelper.kt   |  2 +-
 .../personalcenter/PersonalCenterFragment.kt  |  3 +-
 .../main/res => }/resources/rendertheme.xsd   |  0
 .../src/main/assets/editormarker.xml          | 37 ++++++++-----------
 4 files changed, 17 insertions(+), 25 deletions(-)
 rename collect-library/{src/main/res => }/resources/rendertheme.xsd (100%)

diff --git a/app/src/main/java/com/navinfo/omqs/db/ImportOMDBHelper.kt b/app/src/main/java/com/navinfo/omqs/db/ImportOMDBHelper.kt
index ea70906b..0e287e21 100644
--- a/app/src/main/java/com/navinfo/omqs/db/ImportOMDBHelper.kt
+++ b/app/src/main/java/com/navinfo/omqs/db/ImportOMDBHelper.kt
@@ -47,7 +47,7 @@ class ImportOMDBHelper @AssistedInject constructor(
         ).writableDatabase
     }
     private val configFile: File =
-        File("${Constant.DATA_PATH}/${Constant.CURRENT_USER_ID}", Constant.OMDB_CONFIG)
+        File("${Constant.USER_DATA_PATH}", Constant.OMDB_CONFIG)
 
     /**
      * 读取config的配置文件
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 4f7cd21f..0365731f 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
@@ -84,8 +84,7 @@ class PersonalCenterFragment : BaseFragment(), FSAFActivityCallbacks {
 
                         override fun onResult(uri: Uri) {
                             val file = UriUtils.uri2File(uri)
-                            val importOMDBHelper: ImportOMDBHelper =
-                                importOMDBHiltFactory.obtainImportOMDBHelper(
+                            val importOMDBHelper: ImportOMDBHelper = importOMDBHiltFactory.obtainImportOMDBHelper(
                                     requireContext(),
                                     file
                                 )
diff --git a/collect-library/src/main/res/resources/rendertheme.xsd b/collect-library/resources/rendertheme.xsd
similarity index 100%
rename from collect-library/src/main/res/resources/rendertheme.xsd
rename to collect-library/resources/rendertheme.xsd
diff --git a/collect-library/src/main/assets/editormarker.xml b/collect-library/src/main/assets/editormarker.xml
index aa009d1b..81dba275 100644
--- a/collect-library/src/main/assets/editormarker.xml
+++ b/collect-library/src/main/assets/editormarker.xml
@@ -51,6 +51,9 @@
     <!--ferry-->
     <style-text style="bold" fill="#606060" id="ferry" k="name" size="12" stroke="#ffffff"
         stroke-width="2.0" />
+    <!--speedlimit-->
+    <style-text fill="#ffffff" id="max-speed-limit" k="name" size="15" stroke="#ffffff"
+        stroke-width="0.1" />
 
 
     <!--###### AREA styles ######-->
@@ -1615,38 +1618,28 @@
         <m v="OMDB_SPEEDLIMIT">
             <m k="speedFlag">
                 <m v="0">
-                    <circle fill="#0000ff" radius="30" scale-radius="true" />
-                    <text k="maxSpeed" use="road"></text>
-                    <text k="minSpeed" dy="30" bg-fill="#00ff00" use="road"></text>
+                    <circle fill="#0000ff" radius="26" scale-radius="true" stroke="#ff0000" stroke-width="2"/>
+                    <m select="any">
+                        <text k="maxSpeed" use="max-speed-limit"></text>
+                        <caption k="minSpeed" dy="-28" fill="#000000" priority="5" size="15" stroke="#ffffff"
+                            stroke-width="1.0"></caption>
+                    </m>
                 </m>
                 <m v="1">
-<!--                    <circle fill="#0000ff" radius="30" scale-radius="true" />-->
-                    <text k="maxSpeed" use="road"></text>
-                    <text k="minSpeed" dy="30" bg-fill="#00ff00" use="road"></text>
+                    <circle fill="#0000ff" radius="26" scale-radius="true" stroke="#ff0000" stroke-width="2"/>
+                    <m select="any">
+                        <text k="maxSpeed" use="max-speed-limit"></text>
+                        <caption k="minSpeed" dy="-28" fill="#000000" priority="5" size="15" stroke="#ffffff"
+                            stroke-width="1.0"></caption>
+                    </m>
                 </m>
             </m>
         </m>
         <!--条件点限速-->
         <m v="OMDB_SPEEDLIMIT_COND">
-            <m k="direct">
-                <m v="2">
-                    <lineSymbol src="assets:omdb/oneway_left.svg"></lineSymbol>
-                </m>
-                <m v="3">
-                    <lineSymbol src="assets:omdb/oneway_right.svg"></lineSymbol>
-                </m>
-            </m>
         </m>
         <!--可变点限速-->
         <m v="OMDB_SPEEDLIMIT_VAR">
-            <m k="direct">
-                <m v="2">
-                    <lineSymbol src="assets:omdb/oneway_left.svg"></lineSymbol>
-                </m>
-                <m v="3">
-                    <lineSymbol src="assets:omdb/oneway_right.svg"></lineSymbol>
-                </m>
-            </m>
         </m>
     </m>
 </rendertheme>
\ No newline at end of file

From c37abcbda5f1a1dfbedb4e7d823bcf2c0c526603 Mon Sep 17 00:00:00 2001
From: xiaoyan <xiaoyan159@163.com>
Date: Tue, 25 Apr 2023 17:58:31 +0800
Subject: [PATCH 2/2] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/assets/omdb.config | 27 ++++++++++++++++++---------
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/app/src/main/assets/omdb.config b/app/src/main/assets/omdb.config
index a6737381..1f2be43d 100644
--- a/app/src/main/assets/omdb.config
+++ b/app/src/main/assets/omdb.config
@@ -12,24 +12,33 @@
 		},
 		{
 			"table": "OMDB_RD_LINK_DIRECT",
-			"code": 2001,
+			"code": 2010,
 			"name": "道路方向"
 		},
+		{
+            "table": "OMDB_SPEEDLIMIT",
+            "code": 4002,
+            "name": "常规点限速"
+        },
 		{
 			"table": "OMDB_SPEEDLIMIT_COND",
-			"code": 2001,
+			"code": 4003,
 			"name": "条件点限速"
 		},
 		{
 			"table": "OMDB_SPEEDLIMIT_VAR",
-			"code": 2001,
+			"code": 4004,
 			"name": "可变点限速"
 		},
-		{
-			"table": "OMDB_SPEEDLIMIT",
-			"code": 2001,
-			"name": "常规点限速"
-		}
-		
+        {
+            "table": "OMDB_LANE_LG_LINK",
+            "code": 5001,
+            "name": "车道中心线"
+        },
+        {
+            "table": "OMDB_LANE_NUM",
+            "code": 5002,
+            "name": "车道数"
+        }
 	]
 }
\ No newline at end of file