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

feat: 增加常规点限速的渲染

Browse Source
This commit is contained in:
xiaoyan 2023-04-25 17:15:47 +08:00
parent 67ce6f11b9
commit f1d6ebe22b
4 changed files with 17 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/navinfo/omqs/db/ImportOMDBHelper.kt
View File

@ -47,7 +47,7 @@ class ImportOMDBHelper @AssistedInject constructor(
).writableDatabase ).writableDatabase
} }
private val configFile: File = private val configFile: File =
File("${Constant.DATA_PATH}/${Constant.CURRENT_USER_ID}", Constant.OMDB_CONFIG) File("${Constant.USER_DATA_PATH}", Constant.OMDB_CONFIG)
/** /**
* 读取config的配置文件 * 读取config的配置文件

3
app/src/main/java/com/navinfo/omqs/ui/fragment/personalcenter/PersonalCenterFragment.kt
View File

@ -84,8 +84,7 @@ class PersonalCenterFragment : BaseFragment(), FSAFActivityCallbacks {
override fun onResult(uri: Uri) { override fun onResult(uri: Uri) {
val file = UriUtils.uri2File(uri) val file = UriUtils.uri2File(uri)
val importOMDBHelper: ImportOMDBHelper = val importOMDBHelper: ImportOMDBHelper = importOMDBHiltFactory.obtainImportOMDBHelper(
importOMDBHiltFactory.obtainImportOMDBHelper(
requireContext(), requireContext(),
file file
) )

0
collect-library/src/main/res/resources/rendertheme.xsd → collect-library/resources/rendertheme.xsd
View File

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

@ -51,6 +51,9 @@
<!--ferry--> <!--ferry-->
<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-->
<style-text fill="#ffffff" id="max-speed-limit" k="name" size="15" stroke="#ffffff"
stroke-width="0.1" />
<!--###### AREA styles ######--> <!--###### AREA styles ######-->
@ -1615,38 +1618,28 @@
<m v="OMDB_SPEEDLIMIT"> <m v="OMDB_SPEEDLIMIT">
<m k="speedFlag"> <m k="speedFlag">
<m v="0"> <m v="0">
<circle fill="#0000ff" radius="30" scale-radius="true" /> <circle fill="#0000ff" radius="26" scale-radius="true" stroke="#ff0000" stroke-width="2"/>
<text k="maxSpeed" use="road"></text> <m select="any">
<text k="minSpeed" dy="30" bg-fill="#00ff00" use="road"></text> <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 v="1"> <m v="1">
<!-- <circle fill="#0000ff" radius="30" scale-radius="true" />--> <circle fill="#0000ff" radius="26" scale-radius="true" stroke="#ff0000" stroke-width="2"/>
<text k="maxSpeed" use="road"></text> <m select="any">
<text k="minSpeed" dy="30" bg-fill="#00ff00" use="road"></text> <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>
</m> </m>
<!--条件点限速--> <!--条件点限速-->
<m v="OMDB_SPEEDLIMIT_COND"> <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>
<!--可变点限速--> <!--可变点限速-->
<m v="OMDB_SPEEDLIMIT_VAR"> <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>
</m> </m>
</rendertheme> </rendertheme>