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

feat: 普通marker支持动态配置

Browse Source
This commit is contained in:
xiaoyan 2023-08-08 15:55:09 +08:00
parent 958e94ea1e
commit 9bc3560647
3 changed files with 16 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
app/src/main/java/com/navinfo/omqs/db/ImportPreProcess.kt
View File

@ -454,22 +454,11 @@ class ImportPreProcess {
* */ * */
fun generateIntersectionReference(renderEntity: RenderEntity) { fun generateIntersectionReference(renderEntity: RenderEntity) {
// 路口数据的其他点位，是保存在nodeList对应的数组下 // 路口数据的其他点位，是保存在nodeList对应的数组下
if (renderEntity.properties.containsKey("nodeList")) { if (renderEntity.properties.containsKey("type")) {
val nodeListJsonArray: JSONArray = JSONArray(renderEntity.properties["nodeList"]) if (renderEntity.properties["type"] == "0") {
for (i in 0 until nodeListJsonArray.length()) { renderEntity.properties["typesrc"] = "assets:symbols/dot_blue_dark.svg"
val nodeJSONObject = nodeListJsonArray.getJSONObject(i) } else {
val intersectionReference = ReferenceEntity() renderEntity.properties["typesrc"] = "assets:symbols/volcano.svg"
intersectionReference.renderEntityId = renderEntity.id
intersectionReference.name = "${renderEntity.name}参考点"
intersectionReference.table = renderEntity.table
intersectionReference.zoomMin = renderEntity.zoomMin
intersectionReference.zoomMax = renderEntity.zoomMax
intersectionReference.taskId = renderEntity.taskId
// 与原有方向指向平行的线
intersectionReference.geometry = GeometryTools.createGeometry(nodeJSONObject["geometry"].toString()).toString()
intersectionReference.properties["qi_table"] = renderEntity.table
intersectionReference.properties["type"] = "node"
Realm.getDefaultInstance().insert(intersectionReference)
} }
} }
} }

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

@ -126,7 +126,7 @@ class PersonalCenterFragment(private var indoorDataListener: ((Boolean) -> Unit?
//116.25017070328308 40.061730653134696 //116.25017070328308 40.061730653134696
// 定位到指定位置 // 定位到指定位置
niMapController.mMapView.vtmMap.animator() niMapController.mMapView.vtmMap.animator()
.animateTo(GeoPoint( 39.91831047339841,116.36009639042146 )) .animateTo(GeoPoint( 40.05108004733645, 116.29187746293708 ))
} }
// R.id.personal_center_menu_task_list -> { // R.id.personal_center_menu_task_list -> {
// findNavController().navigate(R.id.TaskManagerFragment) // findNavController().navigate(R.id.TaskManagerFragment)

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

@ -1483,9 +1483,9 @@
<m k="qi_table"> <m k="qi_table">
<!-- 道路线 --> <!-- 道路线 -->
<!-- <m v="OMDB_RD_LINK"> <m v="OMDB_RD_LINK">
<line stroke="#9c9c9c" width="1" /> <line stroke="#9c9c9c" width="1" />
</m>--> </m>
<!--道路种别--> <!--道路种别-->
<m v="OMDB_RD_LINK_KIND"> <m v="OMDB_RD_LINK_KIND">
@ -1955,11 +1955,14 @@
</m> </m>
<!-- 路口 --> <!-- 路口 -->
<m v="OMDB_INTERSECTION"> <m v="OMDB_INTERSECTION">
<m k="type" v="node"> <!-- <m k="type" v="node">-->
<symbol src="assets:symbols/dot_blue_dark.svg"></symbol> <!-- <symbol src="assets:symbols/dot_blue_dark.svg"></symbol>-->
</m> <!-- </m>-->
<m k="intersectionPid"> <!-- <m k="intersectionPid">-->
<symbol src="assets:symbols/dot_magenta.svg"></symbol> <!-- <symbol src="assets:symbols/dot_magenta.svg"></symbol>-->
<!-- </m>-->
<m k="geometry">
<symbol src="@typesrc"></symbol>
</m> </m>
</m> </m>