xiaoyan159/OneMapQS
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
squallzhjch 2023-05-18 17:17:18 +08:00
commit a21a9bd09c
9 changed files with 195 additions and 154 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/java/com/navinfo/omqs/ui/activity/map/MainActivity.kt
View File

@ -83,6 +83,7 @@ class MainActivity : BaseActivity() {
) )
// 在mapController初始化前获取当前OMDB图层显隐 // 在mapController初始化前获取当前OMDB图层显隐
viewModel.refreshOMDBLayer(LayerConfigUtils.getLayerConfigList()) viewModel.refreshOMDBLayer(LayerConfigUtils.getLayerConfigList())
mapController.mMapView.vtmMap.viewport().maxZoomLevel = 25
//关联生命周期 //关联生命周期
binding.lifecycleOwner = this binding.lifecycleOwner = this
//给xml转递对象 //给xml转递对象

345
collect-library/src/main/assets/editormarker.xml
View File

@ -52,7 +52,7 @@
<style-text style="bold" fill="#606060" id="ferry" k="name" size="12" stroke="#ffffff" <style-text style="bold" fill="#606060" id="ferry" k="name" size="12" stroke="#ffffff"
stroke-width="2.0" /> stroke-width="2.0" />
<!--speedlimit--> <!--speedlimit-->
<style-text fill="#000000" id="max-speed-limit" k="name" size="15" stroke="#ffffff" <style-text fill="#000000" id="max-speed-limit" k="name" size="18" stroke="#000000"
stroke-width="0.1" /> stroke-width="0.1" />
<!--###### AREA styles ######--> <!--###### AREA styles ######-->
@ -1572,7 +1572,7 @@
<line stroke="#545D6C" width="15"/> <line stroke="#545D6C" width="15"/>
</m> </m>
<m v="6"> <m v="6">
<line stroke="#545D6C" width="18"/> <line stroke="#545D6C" width="18" />
</m> </m>
<m v="7"> <m v="7">
<line stroke="#545D6C" width="21"/> <line stroke="#545D6C" width="21"/>
@ -1647,162 +1647,167 @@
<m v="OMDB_SPEEDLIMIT"> <m v="OMDB_SPEEDLIMIT">
<m k="speedFlag"> <m k="speedFlag">
<m v="0"> <m v="0">
<!-- <circle fill="#ffffff" radius="30" scale-radius="true" stroke="#ff0000" stroke-width="4"/>--> <!-- <symbol src="assets:omdb/round_speedlimit.svg" symbol-width="30" symbol-height="30"></symbol>-->
<!-- <text k="maxSpeed" use="max-speed-limit" priority="0"></text>--> <caption k="maxSpeed" fill="#000000" priority="0" size="16" stroke="#ffffff"
<m k="maxSpeed"> stroke-width="1.0"></caption>
<m v="5"> <symbol src="assets:omdb/icon_4002_0.png" symbol-width="46" symbol-height="46"></symbol>
<symbol src="assets:omdb/1101/1101_5_0.png"></symbol> <!-- <circle fill="#ffffff" radius="28" scale-radius="true" stroke="#ff0000" stroke-width="6"/>-->
</m> <!-- <m k="maxSpeed">-->
<m v="10"> <!-- <m v="5">-->
<symbol src="assets:omdb/1101/1101_10_0.png"></symbol> <!-- <symbol src="assets:omdb/1101/1101_5_0.png"></symbol>-->
</m> <!-- </m>-->
<m v="15"> <!-- <m v="10">-->
<symbol src="assets:omdb/1101/1101_15_0.png"></symbol> <!-- <symbol src="assets:omdb/1101/1101_10_0.png"></symbol>-->
</m> <!-- </m>-->
<m v="20"> <!-- <m v="15">-->
<symbol src="assets:omdb/1101/1101_20_0.png"></symbol> <!-- <symbol src="assets:omdb/1101/1101_15_0.png"></symbol>-->
</m> <!-- </m>-->
<m v="25"> <!-- <m v="20">-->
<symbol src="assets:omdb/1101/1101_25_0.png"></symbol> <!-- <symbol src="assets:omdb/1101/1101_20_0.png"></symbol>-->
</m> <!-- </m>-->
<m v="30"> <!-- <m v="25">-->
<symbol src="assets:omdb/1101/1101_30_0.png"></symbol> <!-- <symbol src="assets:omdb/1101/1101_25_0.png"></symbol>-->
</m> <!-- </m>-->
<m v="35"> <!-- <m v="30">-->
<symbol src="assets:omdb/1101/1101_35_0.png"></symbol> <!-- <symbol src="assets:omdb/1101/1101_30_0.png"></symbol>-->
</m> <!-- </m>-->
<m v="40"> <!-- <m v="35">-->
<symbol src="assets:omdb/1101/1101_40_0.png"></symbol> <!-- <symbol src="assets:omdb/1101/1101_35_0.png"></symbol>-->
</m> <!-- </m>-->
<m v="45"> <!-- <m v="40">-->
<symbol src="assets:omdb/1101/1101_45_0.png"></symbol> <!-- <symbol src="assets:omdb/1101/1101_40_0.png"></symbol>-->
</m> <!-- </m>-->
<m v="50"> <!-- <m v="45">-->
<symbol src="assets:omdb/1101/1101_50_0.png"></symbol> <!-- <symbol src="assets:omdb/1101/1101_45_0.png"></symbol>-->
</m> <!-- </m>-->
<m v="55"> <!-- <m v="50">-->
<symbol src="assets:omdb/1101/1101_55_0.png"></symbol> <!-- <symbol src="assets:omdb/1101/1101_50_0.png"></symbol>-->
</m> <!-- </m>-->
<m v="60"> <!-- <m v="55">-->
<symbol src="assets:omdb/1101/1101_60_0.png"></symbol> <!-- <symbol src="assets:omdb/1101/1101_55_0.png"></symbol>-->
</m> <!-- </m>-->
<m v="65"> <!-- <m v="60">-->
<symbol src="assets:omdb/1101/1101_65_0.png"></symbol> <!-- <symbol src="assets:omdb/1101/1101_60_0.png"></symbol>-->
</m> <!-- </m>-->
<m v="70"> <!-- <m v="65">-->
<symbol src="assets:omdb/1101/1101_70_0.png"></symbol> <!-- <symbol src="assets:omdb/1101/1101_65_0.png"></symbol>-->
</m> <!-- </m>-->
<m v="75"> <!-- <m v="70">-->
<symbol src="assets:omdb/1101/1101_75_0.png"></symbol> <!-- <symbol src="assets:omdb/1101/1101_70_0.png"></symbol>-->
</m> <!-- </m>-->
<m v="80"> <!-- <m v="75">-->
<symbol src="assets:omdb/1101/1101_80_0.png"></symbol> <!-- <symbol src="assets:omdb/1101/1101_75_0.png"></symbol>-->
</m> <!-- </m>-->
<m v="85"> <!-- <m v="80">-->
<symbol src="assets:omdb/1101/1101_85_0.png"></symbol> <!-- <symbol src="assets:omdb/1101/1101_80_0.png"></symbol>-->
</m> <!-- </m>-->
<m v="90"> <!-- <m v="85">-->
<symbol src="assets:omdb/1101/1101_90_0.png"></symbol> <!-- <symbol src="assets:omdb/1101/1101_85_0.png"></symbol>-->
</m> <!-- </m>-->
<m v="95"> <!-- <m v="90">-->
<symbol src="assets:omdb/1101/1101_95_0.png"></symbol> <!-- <symbol src="assets:omdb/1101/1101_90_0.png"></symbol>-->
</m> <!-- </m>-->
<m v="100"> <!-- <m v="95">-->
<symbol src="assets:omdb/1101/1101_100_0.png"></symbol> <!-- <symbol src="assets:omdb/1101/1101_95_0.png"></symbol>-->
</m> <!-- </m>-->
<m v="105"> <!-- <m v="100">-->
<symbol src="assets:omdb/1101/1101_105_0.png"></symbol> <!-- <symbol src="assets:omdb/1101/1101_100_0.png"></symbol>-->
</m> <!-- </m>-->
<m v="110"> <!-- <m v="105">-->
<symbol src="assets:omdb/1101/1101_110_0.png"></symbol> <!-- <symbol src="assets:omdb/1101/1101_105_0.png"></symbol>-->
</m> <!-- </m>-->
<m v="115"> <!-- <m v="110">-->
<symbol src="assets:omdb/1101/1101_115_0.png"></symbol> <!-- <symbol src="assets:omdb/1101/1101_110_0.png"></symbol>-->
</m> <!-- </m>-->
<m v="120"> <!-- <m v="115">-->
<symbol src="assets:omdb/1101/1101_120_0.png"></symbol> <!-- <symbol src="assets:omdb/1101/1101_115_0.png"></symbol>-->
</m> <!-- </m>-->
</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" <caption k="minSpeed" dy="-28" fill="#000000" priority="0" size="14" stroke="#ffffff"
stroke-width="1.0"></caption> stroke-width="1.0"></caption>
</m> </m>
<m v="1"> <m v="1">
<!-- <circle fill="#ffffff" radius="30" scale-radius="true" stroke="#00ff00" stroke-width="4"/>--> <caption k="maxSpeed" fill="#000000" priority="0" size="16" stroke="#ffffff"
<!-- <text k="maxSpeed" use="max-speed-limit"></text>--> stroke-width="1.0"></caption>
<m k="maxSpeed"> <symbol src="assets:omdb/icon_4002_1.png" symbol-width="46" symbol-height="46"></symbol>
<m v="5"> <!-- <circle fill="#ffffff" radius="28" scale-radius="true" stroke="#00ff00" stroke-width="6"/>-->
<symbol src="assets:omdb/1101/1101_5_1.png"></symbol> <!-- <m k="maxSpeed">-->
</m> <!-- <m v="5">-->
<m v="10"> <!-- <symbol src="assets:omdb/1101/1101_5_1.png"></symbol>-->
<symbol src="assets:omdb/1101/1101_10_1.png"></symbol> <!-- </m>-->
</m> <!-- <m v="10">-->
<m v="15"> <!-- <symbol src="assets:omdb/1101/1101_10_1.png"></symbol>-->
<symbol src="assets:omdb/1101/1101_15_1.png"></symbol> <!-- </m>-->
</m> <!-- <m v="15">-->
<m v="20"> <!-- <symbol src="assets:omdb/1101/1101_15_1.png"></symbol>-->
<symbol src="assets:omdb/1101/1101_20_1.png"></symbol> <!-- </m>-->
</m> <!-- <m v="20">-->
<m v="25"> <!-- <symbol src="assets:omdb/1101/1101_20_1.png"></symbol>-->
<symbol src="assets:omdb/1101/1101_25_1.png"></symbol> <!-- </m>-->
</m> <!-- <m v="25">-->
<m v="30"> <!-- <symbol src="assets:omdb/1101/1101_25_1.png"></symbol>-->
<symbol src="assets:omdb/1101/1101_30_1.png"></symbol> <!-- </m>-->
</m> <!-- <m v="30">-->
<m v="35"> <!-- <symbol src="assets:omdb/1101/1101_30_1.png"></symbol>-->
<symbol src="assets:omdb/1101/1101_35_1.png"></symbol> <!-- </m>-->
</m> <!-- <m v="35">-->
<m v="40"> <!-- <symbol src="assets:omdb/1101/1101_35_1.png"></symbol>-->
<symbol src="assets:omdb/1101/1101_40_1.png"></symbol> <!-- </m>-->
</m> <!-- <m v="40">-->
<m v="45"> <!-- <symbol src="assets:omdb/1101/1101_40_1.png"></symbol>-->
<symbol src="assets:omdb/1101/1101_45_1.png"></symbol> <!-- </m>-->
</m> <!-- <m v="45">-->
<m v="50"> <!-- <symbol src="assets:omdb/1101/1101_45_1.png"></symbol>-->
<symbol src="assets:omdb/1101/1101_50_1.png"></symbol> <!-- </m>-->
</m> <!-- <m v="50">-->
<m v="55"> <!-- <symbol src="assets:omdb/1101/1101_50_1.png"></symbol>-->
<symbol src="assets:omdb/1101/1101_55_1.png"></symbol> <!-- </m>-->
</m> <!-- <m v="55">-->
<m v="60"> <!-- <symbol src="assets:omdb/1101/1101_55_1.png"></symbol>-->
<symbol src="assets:omdb/1101/1101_60_1.png"></symbol> <!-- </m>-->
</m> <!-- <m v="60">-->
<m v="65"> <!-- <symbol src="assets:omdb/1101/1101_60_1.png"></symbol>-->
<symbol src="assets:omdb/1101/1101_65_1.png"></symbol> <!-- </m>-->
</m> <!-- <m v="65">-->
<m v="70"> <!-- <symbol src="assets:omdb/1101/1101_65_1.png"></symbol>-->
<symbol src="assets:omdb/1101/1101_70_1.png"></symbol> <!-- </m>-->
</m> <!-- <m v="70">-->
<m v="75"> <!-- <symbol src="assets:omdb/1101/1101_70_1.png"></symbol>-->
<symbol src="assets:omdb/1101/1101_75_1.png"></symbol> <!-- </m>-->
</m> <!-- <m v="75">-->
<m v="80"> <!-- <symbol src="assets:omdb/1101/1101_75_1.png"></symbol>-->
<symbol src="assets:omdb/1101/1101_80_1.png"></symbol> <!-- </m>-->
</m> <!-- <m v="80">-->
<m v="85"> <!-- <symbol src="assets:omdb/1101/1101_80_1.png"></symbol>-->
<symbol src="assets:omdb/1101/1101_85_1.png"></symbol> <!-- </m>-->
</m> <!-- <m v="85">-->
<m v="90"> <!-- <symbol src="assets:omdb/1101/1101_85_1.png"></symbol>-->
<symbol src="assets:omdb/1101/1101_90_1.png"></symbol> <!-- </m>-->
</m> <!-- <m v="90">-->
<m v="95"> <!-- <symbol src="assets:omdb/1101/1101_90_1.png"></symbol>-->
<symbol src="assets:omdb/1101/1101_95_1.png"></symbol> <!-- </m>-->
</m> <!-- <m v="95">-->
<m v="100"> <!-- <symbol src="assets:omdb/1101/1101_95_1.png"></symbol>-->
<symbol src="assets:omdb/1101/1101_100_1.png"></symbol> <!-- </m>-->
</m> <!-- <m v="100">-->
<m v="105"> <!-- <symbol src="assets:omdb/1101/1101_100_1.png"></symbol>-->
<symbol src="assets:omdb/1101/1101_105_1.png"></symbol> <!-- </m>-->
</m> <!-- <m v="105">-->
<m v="110"> <!-- <symbol src="assets:omdb/1101/1101_105_1.png"></symbol>-->
<symbol src="assets:omdb/1101/1101_110_1.png"></symbol> <!-- </m>-->
</m> <!-- <m v="110">-->
<m v="115"> <!-- <symbol src="assets:omdb/1101/1101_110_1.png"></symbol>-->
<symbol src="assets:omdb/1101/1101_115_1.png"></symbol> <!-- </m>-->
</m> <!-- <m v="115">-->
<m v="120"> <!-- <symbol src="assets:omdb/1101/1101_115_1.png"></symbol>-->
<symbol src="assets:omdb/1101/1101_120_1.png"></symbol> <!-- </m>-->
</m> <!-- <m v="120">-->
</m> <!-- <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" <caption k="minSpeed" dy="-28" fill="#000000" priority="0" size="14" stroke="#ffffff"
stroke-width="1.0"></caption> stroke-width="1.0"></caption>
</m> </m>
@ -1810,9 +1815,41 @@
</m> </m>
<!--条件点限速--> <!--条件点限速-->
<m v="OMDB_SPEEDLIMIT_COND"> <m v="OMDB_SPEEDLIMIT_COND">
<m k="speedFlag">
<m v="0">
<!-- <symbol src="assets:omdb/round_speedlimit.svg" symbol-width="30" symbol-height="30"></symbol>-->
<caption k="maxSpeed" fill="#000000" priority="0" size="16" stroke="#ffffff"
stroke-width="1.0"></caption>
<symbol src="assets:omdb/icon_4003_0.png" symbol-width="46" symbol-height="46"></symbol>
<caption k="minSpeed" dy="-28" fill="#000000" priority="0" size="14" stroke="#ffffff"
stroke-width="1.0"></caption>
</m>
<m v="1">
<caption k="maxSpeed" fill="#000000" priority="0" size="16" stroke="#ffffff"
stroke-width="1.0"></caption>
<symbol src="assets:omdb/icon_4003_1.png" symbol-width="46" symbol-height="46"></symbol>
<caption k="minSpeed" dy="-28" fill="#000000" priority="0" size="14" stroke="#ffffff"
stroke-width="1.0"></caption>
</m>
</m>
</m> </m>
<!--可变点限速--> <!--可变点限速-->
<m v="OMDB_SPEEDLIMIT_VAR"> <m v="OMDB_SPEEDLIMIT_VAR">
<m v="0">
<!-- <symbol src="assets:omdb/round_speedlimit.svg" symbol-width="30" symbol-height="30"></symbol>-->
<caption k="maxSpeed" fill="#000000" priority="0" size="16" stroke="#ffffff"
stroke-width="1.0"></caption>
<symbol src="assets:omdb/icon_4004_0.png" symbol-width="46" symbol-height="46"></symbol>
<caption k="minSpeed" dy="-28" fill="#000000" priority="0" size="14" stroke="#ffffff"
stroke-width="1.0"></caption>
</m>
<m v="1">
<caption k="maxSpeed" fill="#000000" priority="0" size="16" stroke="#ffffff"
stroke-width="1.0"></caption>
<symbol src="assets:omdb/icon_4004_1.png" symbol-width="46" symbol-height="46"></symbol>
<caption k="minSpeed" dy="-28" fill="#000000" priority="0" size="14" stroke="#ffffff"
stroke-width="1.0"></caption>
</m>
</m> </m>
<!--车道中心线--> <!--车道中心线-->
<m v="OMDB_LANE_LINK_LG"> <m v="OMDB_LANE_LINK_LG">

BIN
collect-library/src/main/assets/omdb/icon_4002_0.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.3 KiB

BIN
collect-library/src/main/assets/omdb/icon_4002_1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 8.9 KiB

BIN
collect-library/src/main/assets/omdb/icon_4003_0.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 9.0 KiB

BIN
collect-library/src/main/assets/omdb/icon_4003_1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 10 KiB

BIN
collect-library/src/main/assets/omdb/icon_4004_0.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 8.1 KiB

BIN
collect-library/src/main/assets/omdb/icon_4004_1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 9.1 KiB

3
collect-library/src/main/assets/omdb/round_speedlimit.svg Normal file
View File

@ -0,0 +1,3 @@
<?xml version="1.0" standalone="no"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg t="1684152246328" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4087" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M512 1021.725c-281.076 0-509.725-228.647-509.725-509.725s228.647-509.725 509.725-509.725 509.725 228.647 509.725 509.725-228.647 509.725-509.725 509.725zM512 75.093c-240.917 0-436.907 195.989-436.907 436.907s195.989 436.907 436.907 436.907c240.917 0 436.907-195.989 436.907-436.907 0-240.917-195.989-436.907-436.907-436.907z" fill="#d81e06" p-id="4088"></path></svg>
Side by Side

After

Width:  |  Height:  |  Size: 701 B