From 7abb32610afb23ceec95409dc6ef146e96e365c0 Mon Sep 17 00:00:00 2001
From: qiji4215 <qiji4215@navinfo.com>
Date: Tue, 22 Aug 2023 08:52:53 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=8D=A2=E5=9B=BE=E6=A0=87=EF=BC=8C?=
=?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/src/main/assets/omdb_config.json | 7 +++
.../com/navinfo/omqs/db/ImportPreProcess.kt | 1 +
.../main/res/drawable-xxhdpi/hide_line.png | Bin 0 -> 867 bytes
.../res/drawable-xxhdpi/icon_hide_line.png | Bin 2003 -> 1861 bytes
.../res/drawable-xxhdpi/icon_high_line.png | Bin 2609 -> 1850 bytes
.../drawable/selector_high_road_line_src.xml | 4 +-
app/src/main/res/layout/activity_main.xml | 5 +-
.../src/main/assets/editormarker.xml | 43 +++++++++++++++++-
.../src/main/assets/omdb/icon_3016_0.svg | 1 +
.../src/main/assets/omdb/icon_3016_1.svg | 1 +
.../src/main/assets/omdb/icon_3016_3.svg | 8 ++++
.../library/map/handler/LineHandler.kt | 4 +-
.../src/main/res/values/colors.xml | 1 +
vtm | 2 +-
14 files changed, 68 insertions(+), 9 deletions(-)
create mode 100644 app/src/main/res/drawable-xxhdpi/hide_line.png
create mode 100644 collect-library/src/main/assets/omdb/icon_3016_0.svg
create mode 100644 collect-library/src/main/assets/omdb/icon_3016_1.svg
create mode 100644 collect-library/src/main/assets/omdb/icon_3016_3.svg
diff --git a/app/src/main/assets/omdb_config.json b/app/src/main/assets/omdb_config.json
index 2448d824..09cfbb01 100644
--- a/app/src/main/assets/omdb_config.json
+++ b/app/src/main/assets/omdb_config.json
@@ -136,6 +136,13 @@
"zoomMin": 16,
"zoomMax": 20
},
+ "3016":{
+ "table": "OMDB_OBJECT_STOPLOCATION",
+ "code": 3016,
+ "name": "停止位置",
+ "zoomMin": 18,
+ "zoomMax": 20
+ },
"4001": {
"table": "OMDB_INTERSECTION",
"code": 4001,
diff --git a/app/src/main/java/com/navinfo/omqs/db/ImportPreProcess.kt b/app/src/main/java/com/navinfo/omqs/db/ImportPreProcess.kt
index 2e9d198d..7bc86ec1 100644
--- a/app/src/main/java/com/navinfo/omqs/db/ImportPreProcess.kt
+++ b/app/src/main/java/com/navinfo/omqs/db/ImportPreProcess.kt
@@ -567,6 +567,7 @@ class ImportPreProcess {
val intersectionReference = ReferenceEntity()
intersectionReference.renderEntityId = renderEntity.id
intersectionReference.name = "${renderEntity.name}参考点"
+ intersectionReference.code = renderEntity.code
intersectionReference.table = renderEntity.table
intersectionReference.zoomMin = renderEntity.zoomMin
intersectionReference.zoomMax = renderEntity.zoomMax
diff --git a/app/src/main/res/drawable-xxhdpi/hide_line.png b/app/src/main/res/drawable-xxhdpi/hide_line.png
new file mode 100644
index 0000000000000000000000000000000000000000..ce3f6e02d8b320585c3d3b9ff7f31b319bac6ef1
GIT binary patch
literal 867
zcmV-p1DyPcP)<h;3K|Lk000e1NJLTq001Tc001Tk1^@s6s6FYf00001b5ch_0Itp)
z=>Px&9Z5t%R9HvtmQ83AK@`W|+f73YDjuvJES{`T1r@57U^g?{gd*63iV^W7hzC&-
ztk#?L<_Eo46g=obyciV)1&tv)V_ItwK`3YiZ-RKJg6JWbboa@~rli}A-A!63vIBwa
z&inYy|Gl>i!ZKaBOt~Ne3tO2;u}HD73WT+fdaPl^#>U20Rw|Wl&bbU5WHIc85Ue)$
zY$=5hhXLR&5e=HAd1Wz@1&twuxC#IRj^kYH?d=^>ezRbfWpyLsTQ^ug=lp5Vz|GhR
zA+`g+J2%Dv=X`h$n0k;>-Xx-9>VHQ^M{8$i=kI2cF61kOSOEaP{(>OBV2t%uedbJM
zu~^(}+jbTJwkQKl(>5iO$xjO<Xk@=oC?qsZd*%AR*L6K(7{&)*F!j<4r|WvkFpNSY
z$?N$@DGv~l5<snaQ1ePz4djI*qI0Hcss?R(S(bGc5v#-H3so0PZH$hN_Rq}Bs8hA7
zXCf+Uns$jX_N);)Ddld*an2*6;rf?ivDm?$o}MRu@qEAhUd3u15%ET)Qn{Q?r#}Y)
z%;)nPT3T8LiRieGeQ?FRP>7g8#5N*2LquC$^?oAaYealWMEU9I>B&qcQ&xM~Y&PEB
z-mdI+0YDM}7yztxCvOrFhl!{Zs>h1OV!LhIqB@ldiZOOy1sxwBZ!4F}CyD430Ic_(
z9ucQp=q?{+z98bYcsxFmNF+*X-)8{QhGBg5oytO?Fr;bP1^0BbP_>D2x!l@#Jbuqr
zB2YDL+dh;^rM`QOYvF3Y`o7ICgg8w^Q>JO=>SdKuz9FKWM07{j^@p}?uK@t{Q|p_q
z>)#y5=?8$Lh&ag@+g2}@5MmDitmB;Dn$yccj$CUagxClG)sOC8&iP}%7?x%AA>wm)
zuZwg3F-)$|_c1Bu5hA(`0Jc(zbN<6G;l#wms#2+>$`=EG6P)wwOA020cmM$V0YGrh
z&3`2mLMX+Qa*r5e`<5C^O)c{_t6$RUFcHy+X_{)91Fz7fbZ-PZf?g=S7r>xop}~R%
tZq_aW3#(wHSfp531;W}#J@(%y_6Ji;P&TU8ZxH|h002ovPDHLkV1h(ti7x;E
literal 0
HcmV?d00001
diff --git a/app/src/main/res/drawable-xxhdpi/icon_hide_line.png b/app/src/main/res/drawable-xxhdpi/icon_hide_line.png
index 70df09a42677fa954d383497fe833fa35746f017..b592a647aec070f29695d0ff1ed40604e44b5f7f 100644
GIT binary patch
delta 1834
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
Y17o$(QPC*5(EtDd07*qoM6N<$f^TC&DF6Tf
delta 1977
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
LNkvXXu0mjf?dO3F
diff --git a/app/src/main/res/drawable-xxhdpi/icon_high_line.png b/app/src/main/res/drawable-xxhdpi/icon_high_line.png
index eefea2d9dc8338e2120bf13bcce64e79627d5462..9a897be738b8afb7db321c675248d862845d8f38 100644
GIT binary patch
delta 1823
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
N002ovPDHLkV1h(PPtyPZ
delta 2588
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
diff --git a/app/src/main/res/drawable/selector_high_road_line_src.xml b/app/src/main/res/drawable/selector_high_road_line_src.xml
index b2eb9ddc..b0fdc085 100644
--- a/app/src/main/res/drawable/selector_high_road_line_src.xml
+++ b/app/src/main/res/drawable/selector_high_road_line_src.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:drawable="@drawable/icon_hide_line" android:state_selected="true"></item>
- <item android:drawable="@drawable/icon_high_line" />
+ <item android:drawable="@drawable/icon_high_line" android:state_selected="true"></item>
+ <item android:drawable="@drawable/icon_hide_line" />
</selector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index dad709a6..039b77d6 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -82,14 +82,14 @@
android:id="@+id/main_activity_top_sign_recyclerview"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginLeft="220dp"
+ android:layout_marginLeft="300dp"
android:layout_marginTop="2dp"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<FrameLayout
android:id="@+id/main_activity_sign_more_info_fragment"
- android:layout_width="240dp"
+ android:layout_width="220dp"
android:layout_height="300dp"
android:layout_marginTop="80dp"
android:minHeight="140dp"
@@ -235,6 +235,7 @@
android:layout_height="wrap_content"
android:background="@drawable/shape_road_name_bg"
android:onClick="@{()->mainActivity.openRoadNameFragment()}"
+ android:layout_marginLeft="10dp"
android:paddingLeft="10dp"
android:paddingTop="4dp"
android:paddingRight="10dp"
diff --git a/collect-library/src/main/assets/editormarker.xml b/collect-library/src/main/assets/editormarker.xml
index dc7e43a5..d571b5e0 100644
--- a/collect-library/src/main/assets/editormarker.xml
+++ b/collect-library/src/main/assets/editormarker.xml
@@ -1968,9 +1968,9 @@
<m k="type" v="node">
<symbol src="assets:symbols/dot_blue_dark.svg"></symbol>
</m>
- <m k="intersectionPid">
+<!-- <m k="intersectionPid">
<symbol src="assets:symbols/dot_magenta.svg"></symbol>
- </m>
+ </m>-->
<!-- <m k="geometry">
<symbol src="@typesrc"></symbol>
</m>-->
@@ -2188,6 +2188,45 @@
<symbol repeat="true" repeat-start="0" repeat-gap="32" src="assets:omdb/icon_2204_0.svg"></symbol>
</m>
+ <!-- 停止位置 -->
+ <m v="OMDB_OBJECT_STOPLOCATION">
+
+ <m k="locationType" v="1">
+ <m k="color" v="1">
+ <line stroke="#ffffff" use="boundaryType" width="0.1"/>
+ </m>
+ <m k="color" v="9">
+ <line stroke="#eccc68" use="boundaryType" width="0.1"/>
+ </m>
+ </m>
+
+ <m k="locationType" v="2">
+ <m k="color" v="1">
+ <symbol repeat="true" repeat-gap="1" repeat-start="2" src="assets:omdb/icon_3016_0.svg" symbol-width="5" symbol-height="24"></symbol>
+ </m>
+ <m k="color" v="9">
+ <symbol repeat="true" repeat-gap="1" repeat-start="2" src="assets:omdb/icon_3016_1.svg" symbol-width="5" symbol-height="24"></symbol>
+ </m>
+ </m>
+ <!--虚线不做渲染-->
+<!-- <m k="locationType" v="3">
+ <m k="color" v="1">
+ <symbol repeat="true" repeat-gap="4" repeat-start="0" src="assets:omdb/icon_2013_3.svg" symbol-width="10" symbol-height="4"></symbol>
+ </m>
+ <m k="color" v="9">
+ <symbol repeat="true" repeat-gap="4" repeat-start="0" src="assets:omdb/icon_2013_3.svg" symbol-width="10" symbol-height="4"></symbol>
+ </m>
+ </m>
+ <m k="locationType" v="4">
+ <m k="color" v="1">
+ <line dasharray="1,1,1,1" repeat-start="0" stroke="#ffffff" width="0.1"/>
+ </m>
+ <m k="color" v="9">
+ <line dasharray="1,1,1,1" repeat-start="0" stroke="#eccc68" width="0.1"/>
+ </m>
+ </m>-->
+ </m>
+
<!--常规点限速-->
<m v="OMDB_SPEEDLIMIT">
<m k="speedFlag" v="0">
diff --git a/collect-library/src/main/assets/omdb/icon_3016_0.svg b/collect-library/src/main/assets/omdb/icon_3016_0.svg
new file mode 100644
index 00000000..2d7070c7
--- /dev/null
+++ b/collect-library/src/main/assets/omdb/icon_3016_0.svg
@@ -0,0 +1 @@
+<?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="1692587943200" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="6322" width="10" height="10" xmlns:xlink="http://www.w3.org/1999/xlink"><path d="M128 479.9488h768.0512v-64H128zM128 607.9488h768.0512v-64H128z" fill="#ffffff" p-id="6323"></path></svg>
\ No newline at end of file
diff --git a/collect-library/src/main/assets/omdb/icon_3016_1.svg b/collect-library/src/main/assets/omdb/icon_3016_1.svg
new file mode 100644
index 00000000..cc6af1aa
--- /dev/null
+++ b/collect-library/src/main/assets/omdb/icon_3016_1.svg
@@ -0,0 +1 @@
+<?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="1692588290872" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="6617" xmlns:xlink="http://www.w3.org/1999/xlink" width="10" height="10"><path d="M128 479.9488h768.0512v-64H128zM128 607.9488h768.0512v-64H128z" fill="#eccc68" p-id="6618"></path></svg>
\ No newline at end of file
diff --git a/collect-library/src/main/assets/omdb/icon_3016_3.svg b/collect-library/src/main/assets/omdb/icon_3016_3.svg
new file mode 100644
index 00000000..15f98594
--- /dev/null
+++ b/collect-library/src/main/assets/omdb/icon_3016_3.svg
@@ -0,0 +1,8 @@
+<?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="1692587943200" class="icon" viewBox="0 0 1024 1024" version="1.1"
+ xmlns="http://www.w3.org/2000/svg" p-id="6322" width="10" height="10"
+ xmlns:xlink="http://www.w3.org/1999/xlink">
+ <path d="M128 479.9488h768.0512v-64H128zM128 607.9488h768.0512v-64H128z" fill="#ffffff"
+ p-id="6323"></path>
+</svg>
\ No newline at end of file
diff --git a/collect-library/src/main/java/com/navinfo/collect/library/map/handler/LineHandler.kt b/collect-library/src/main/java/com/navinfo/collect/library/map/handler/LineHandler.kt
index 8776d6e6..d4b830b8 100644
--- a/collect-library/src/main/java/com/navinfo/collect/library/map/handler/LineHandler.kt
+++ b/collect-library/src/main/java/com/navinfo/collect/library/map/handler/LineHandler.kt
@@ -57,9 +57,9 @@ class LineHandler(context: AppCompatActivity, mapView: NIMapView) : BaseHandler(
mMapView.vtmMap,
Style.builder()
// .stippleColor(context.resources.getColor(R.color.draw_line_red_color, null))
- .fillColor(context.resources.getColor(R.color.draw_line_red_color))
+ .fillColor(context.resources.getColor(R.color.draw_line_pink_color))
.fillAlpha(0.5f)
- .strokeColor(context.resources.getColor(R.color.draw_line_red_color))
+ .strokeColor(context.resources.getColor(R.color.draw_line_pink_color))
.strokeWidth(3f)
.fixed(true).build()
)
diff --git a/collect-library/src/main/res/values/colors.xml b/collect-library/src/main/res/values/colors.xml
index 66069c05..233b4d81 100644
--- a/collect-library/src/main/res/values/colors.xml
+++ b/collect-library/src/main/res/values/colors.xml
@@ -8,6 +8,7 @@
<color name="draw_line_blue1_color" comment="线数据样式">#028FFF</color>
<color name="draw_line_blue2_color" comment="线数据样式">#4E55AF</color>
<color name="draw_line_red_color" comment="线数据样式">#FFF6565D</color>
+ <color name="draw_line_pink_color" comment="线数据样式">#FFd4237a</color>
<color name="default_red" comment="应用主要色调">#F03736</color>
<color name="draw_area_color" comment="测量面积渲染颜色">#8DEF08EB</color>
diff --git a/vtm b/vtm
index 33ba2c17..ebe23ed7 160000
--- a/vtm
+++ b/vtm
@@ -1 +1 @@
-Subproject commit 33ba2c17cea19d445f71d2e78fda6ad459aa4822
+Subproject commit ebe23ed7731e301669b2b4ea03918e313a63617e