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

 Conflicts:

	app/src/main/java/com/navinfo/omqs/http/taskupload/TaskUploadScope.kt

collect-library/build.gradle

@@ -132,4 +132,10 @@ dependencies {
 //    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4'
 //    // 协程Java8支持库
 //    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:1.6.4'
+
+    // Retrofit 网络请求相关
+    api("com.squareup.retrofit2:retrofit:2.9.0")
+    api("com.squareup.retrofit2:converter-gson:2.9.0")
+    api('com.squareup.okhttp3:okhttp:5.0.0-alpha.11')
+    api('com.squareup.okhttp3:logging-interceptor:5.0.0-alpha.11')
 }

collect-library/src/main/assets/editormarker.xml

@@ -55,7 +55,6 @@
     <style-text fill="#000000" id="max-speed-limit" k="name" size="15" stroke="#ffffff"
         stroke-width="0.1" />
 
-
     <!--###### AREA styles ######-->
 
     <!--residential-->
@@ -1554,21 +1553,51 @@
     </m>
 
     <m k="qi_table">
+        <!--车道数-->
+        <m v="OMDB_LANE_NUM">
+            <m k="laneNum">
+                <m v="1">
+                    <line stroke="#545D6C" width="3"/>
+                </m>
+                <m v="2">
+                    <line stroke="#545D6C" width="6"/>
+                </m>
+                <m v="3">
+                    <line stroke="#545D6C" width="9"/>
+                </m>
+                <m v="4">
+                    <line stroke="#545D6C" width="12"/>
+                </m>
+                <m v="5">
+                    <line stroke="#545D6C" width="15"/>
+                </m>
+                <m v="6">
+                    <line stroke="#545D6C" width="18"/>
+                </m>
+                <m v="7">
+                    <line stroke="#545D6C" width="21"/>
+                </m>
+                <m v="8">
+                    <line stroke="#545D6C" width="24"/>
+                </m>
+                <m v="9">
+                    <line stroke="#545D6C" width="27"/>
+                </m>
+                <m v="10">
+                    <line stroke="#545D6C" width="30"/>
+                </m>
+                <m v="11">
+                    <line stroke="#545D6C" width="33"/>
+                </m>
+                <m v="12">
+                    <line stroke="#545D6C" width="36"/>
+                </m>
+            </m>
+        </m>
         <!-- 道路线 -->
         <m v="OMDB_RD_LINK">
             <line stroke="#9c9c9c" width="1"/>
         </m>
-        <!--道路方向-->
-        <m v="OMDB_RD_LINK_DIRECT">
-            <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_RD_LINK_KIND">
             <m k="kind">
@@ -1618,20 +1647,164 @@
         <m v="OMDB_SPEEDLIMIT">
             <m k="speedFlag">
                 <m v="0">
-                    <circle fill="#ffffff" radius="28" scale-radius="true" stroke="#ff0000" stroke-width="4"/>
-                    <m select="any">
-                        <text k="maxSpeed" use="max-speed-limit"></text>
-                        <caption k="minSpeed" dy="-28" fill="#000000" priority="5" size="14" stroke="#ffffff"
-                            stroke-width="1.0"></caption>
+<!--                    <circle fill="#ffffff" radius="30" scale-radius="true" stroke="#ff0000" stroke-width="4"/>-->
+<!--                    <text k="maxSpeed" use="max-speed-limit" priority="0"></text>-->
+                    <m k="maxSpeed">
+                        <m v="5">
+                            <symbol src="assets:omdb/1101/1101_5_0.png"></symbol>
+                        </m>
+                        <m v="10">
+                            <symbol src="assets:omdb/1101/1101_10_0.png"></symbol>
+                        </m>
+                        <m v="15">
+                            <symbol src="assets:omdb/1101/1101_15_0.png"></symbol>
+                        </m>
+                        <m v="20">
+                            <symbol src="assets:omdb/1101/1101_20_0.png"></symbol>
+                        </m>
+                        <m v="25">
+                            <symbol src="assets:omdb/1101/1101_25_0.png"></symbol>
+                        </m>
+                        <m v="30">
+                            <symbol src="assets:omdb/1101/1101_30_0.png"></symbol>
+                        </m>
+                        <m v="35">
+                            <symbol src="assets:omdb/1101/1101_35_0.png"></symbol>
+                        </m>
+                        <m v="40">
+                            <symbol src="assets:omdb/1101/1101_40_0.png"></symbol>
+                        </m>
+                        <m v="45">
+                            <symbol src="assets:omdb/1101/1101_45_0.png"></symbol>
+                        </m>
+                        <m v="50">
+                            <symbol src="assets:omdb/1101/1101_50_0.png"></symbol>
+                        </m>
+                        <m v="55">
+                            <symbol src="assets:omdb/1101/1101_55_0.png"></symbol>
+                        </m>
+                        <m v="60">
+                            <symbol src="assets:omdb/1101/1101_60_0.png"></symbol>
+                        </m>
+                        <m v="65">
+                            <symbol src="assets:omdb/1101/1101_65_0.png"></symbol>
+                        </m>
+                        <m v="70">
+                            <symbol src="assets:omdb/1101/1101_70_0.png"></symbol>
+                        </m>
+                        <m v="75">
+                            <symbol src="assets:omdb/1101/1101_75_0.png"></symbol>
+                        </m>
+                        <m v="80">
+                            <symbol src="assets:omdb/1101/1101_80_0.png"></symbol>
+                        </m>
+                        <m v="85">
+                            <symbol src="assets:omdb/1101/1101_85_0.png"></symbol>
+                        </m>
+                        <m v="90">
+                            <symbol src="assets:omdb/1101/1101_90_0.png"></symbol>
+                        </m>
+                        <m v="95">
+                            <symbol src="assets:omdb/1101/1101_95_0.png"></symbol>
+                        </m>
+                        <m v="100">
+                            <symbol src="assets:omdb/1101/1101_100_0.png"></symbol>
+                        </m>
+                        <m v="105">
+                            <symbol src="assets:omdb/1101/1101_105_0.png"></symbol>
+                        </m>
+                        <m v="110">
+                            <symbol src="assets:omdb/1101/1101_110_0.png"></symbol>
+                        </m>
+                        <m v="115">
+                            <symbol src="assets:omdb/1101/1101_115_0.png"></symbol>
+                        </m>
+                        <m v="120">
+                            <symbol src="assets:omdb/1101/1101_120_0.png"></symbol>
+                        </m>
                     </m>
+                    <caption k="minSpeed" dy="-28" fill="#000000" priority="0" size="14" stroke="#ffffff"
+                        stroke-width="1.0"></caption>
                 </m>
                 <m v="1">
-                    <circle fill="#ffffff" radius="28" scale-radius="true" stroke="#00ff00" stroke-width="4"/>
-                    <m select="any">
-                        <text k="maxSpeed" use="max-speed-limit"></text>
-                        <caption k="minSpeed" dy="-28" fill="#000000" priority="5" size="14" stroke="#ffffff"
-                            stroke-width="1.0"></caption>
+<!--                    <circle fill="#ffffff" radius="30" scale-radius="true" stroke="#00ff00" stroke-width="4"/>-->
+<!--                    <text k="maxSpeed" use="max-speed-limit"></text>-->
+                    <m k="maxSpeed">
+                        <m v="5">
+                            <symbol src="assets:omdb/1101/1101_5_1.png"></symbol>
+                        </m>
+                        <m v="10">
+                            <symbol src="assets:omdb/1101/1101_10_1.png"></symbol>
+                        </m>
+                        <m v="15">
+                            <symbol src="assets:omdb/1101/1101_15_1.png"></symbol>
+                        </m>
+                        <m v="20">
+                            <symbol src="assets:omdb/1101/1101_20_1.png"></symbol>
+                        </m>
+                        <m v="25">
+                            <symbol src="assets:omdb/1101/1101_25_1.png"></symbol>
+                        </m>
+                        <m v="30">
+                            <symbol src="assets:omdb/1101/1101_30_1.png"></symbol>
+                        </m>
+                        <m v="35">
+                            <symbol src="assets:omdb/1101/1101_35_1.png"></symbol>
+                        </m>
+                        <m v="40">
+                            <symbol src="assets:omdb/1101/1101_40_1.png"></symbol>
+                        </m>
+                        <m v="45">
+                            <symbol src="assets:omdb/1101/1101_45_1.png"></symbol>
+                        </m>
+                        <m v="50">
+                            <symbol src="assets:omdb/1101/1101_50_1.png"></symbol>
+                        </m>
+                        <m v="55">
+                            <symbol src="assets:omdb/1101/1101_55_1.png"></symbol>
+                        </m>
+                        <m v="60">
+                            <symbol src="assets:omdb/1101/1101_60_1.png"></symbol>
+                        </m>
+                        <m v="65">
+                            <symbol src="assets:omdb/1101/1101_65_1.png"></symbol>
+                        </m>
+                        <m v="70">
+                            <symbol src="assets:omdb/1101/1101_70_1.png"></symbol>
+                        </m>
+                        <m v="75">
+                            <symbol src="assets:omdb/1101/1101_75_1.png"></symbol>
+                        </m>
+                        <m v="80">
+                            <symbol src="assets:omdb/1101/1101_80_1.png"></symbol>
+                        </m>
+                        <m v="85">
+                            <symbol src="assets:omdb/1101/1101_85_1.png"></symbol>
+                        </m>
+                        <m v="90">
+                            <symbol src="assets:omdb/1101/1101_90_1.png"></symbol>
+                        </m>
+                        <m v="95">
+                            <symbol src="assets:omdb/1101/1101_95_1.png"></symbol>
+                        </m>
+                        <m v="100">
+                            <symbol src="assets:omdb/1101/1101_100_1.png"></symbol>
+                        </m>
+                        <m v="105">
+                            <symbol src="assets:omdb/1101/1101_105_1.png"></symbol>
+                        </m>
+                        <m v="110">
+                            <symbol src="assets:omdb/1101/1101_110_1.png"></symbol>
+                        </m>
+                        <m v="115">
+                            <symbol src="assets:omdb/1101/1101_115_1.png"></symbol>
+                        </m>
+                        <m v="120">
+                            <symbol src="assets:omdb/1101/1101_120_1.png"></symbol>
+                        </m>
                     </m>
+                    <caption k="minSpeed" dy="-28" fill="#000000" priority="0" size="14" stroke="#ffffff"
+                        stroke-width="1.0"></caption>
                 </m>
             </m>
         </m>
@@ -1641,50 +1814,20 @@
         <!--可变点限速-->
         <m v="OMDB_SPEEDLIMIT_VAR">
         </m>
-        <!--车道数-->
-        <m v="OMDB_LANE_NUM">
-            <m k="laneNum">
-                <m v="1">
-                    <line stroke="#545D6C" width="3"/>
-                </m>
+        <!--车道中心线-->
+        <m v="OMDB_LANE_LINK_LG">
+            <line stroke="#ecf0f1" width="0.1" dasharray="35,35"/>
+        </m>
+        <!--道路方向-->
+        <m v="OMDB_LINK_DIRECT">
+            <m k="direct">
                 <m v="2">
-                    <line stroke="#545D6C" width="6"/>
+                    <lineSymbol src="assets:omdb/oneway_right.svg"></lineSymbol>
                 </m>
                 <m v="3">
-                    <line stroke="#545D6C" width="9"/>
-                </m>
-                <m v="4">
-                    <line stroke="#545D6C" width="12"/>
-                </m>
-                <m v="5">
-                    <line stroke="#545D6C" width="15"/>
-                </m>
-                <m v="6">
-                    <line stroke="#545D6C" width="18"/>
-                </m>
-                <m v="7">
-                    <line stroke="#545D6C" width="21"/>
-                </m>
-                <m v="8">
-                    <line stroke="#545D6C" width="24"/>
-                </m>
-                <m v="9">
-                    <line stroke="#545D6C" width="27"/>
-                </m>
-                <m v="10">
-                    <line stroke="#545D6C" width="30"/>
-                </m>
-                <m v="11">
-                    <line stroke="#545D6C" width="33"/>
-                </m>
-                <m v="12">
-                    <line stroke="#545D6C" width="36"/>
+                    <lineSymbol src="assets:omdb/oneway_left.svg"></lineSymbol>
                 </m>
             </m>
         </m>
-        <!--车道中心线-->
-        <m v="OMDB_LANE_LG_LINK">
-            <line stroke="#ecf0f1" width="0.1" dasharray="35,35"/>
-        </m>
     </m>
 </rendertheme>