修改车道边界类型渲染效果
This commit is contained in:
qiji4215
parent
a0c9dadbd8
commit
0f8f36ea8c
@ -162,15 +162,7 @@
|
||||
"code": 2204,
|
||||
"name": "环岛",
|
||||
"zoomMin": 15,
|
||||
"zoomMax": 17,
|
||||
"transformer": [
|
||||
{
|
||||
"k": "geometry",
|
||||
"v": "~",
|
||||
"klib": "geometry",
|
||||
"vlib": "generateS2EReferencePoint()"
|
||||
}
|
||||
]
|
||||
"zoomMax": 19
|
||||
},
|
||||
"2205":{
|
||||
"table": "OMDB_LINK_FORM1",
|
||||
|
||||
@ -412,6 +412,9 @@ class MainActivity : BaseActivity() {
|
||||
supportFragmentManager.beginTransaction()
|
||||
.add(R.id.console_fragment_layout, ConsoleFragment()).commit()
|
||||
}
|
||||
|
||||
binding.mainActivityCloseLine.isSelected = viewModel.isHighRoad()
|
||||
|
||||
initMeasuringTool()
|
||||
}
|
||||
|
||||
@ -671,6 +674,13 @@ class MainActivity : BaseActivity() {
|
||||
viewModel.click2Dor3D()
|
||||
}
|
||||
|
||||
/**
|
||||
* 刷新地图
|
||||
*/
|
||||
fun refrushOnclick(view: View) {
|
||||
mapController.layerManagerHandler.updateOMDBVectorTileLayer()
|
||||
}
|
||||
|
||||
/**
|
||||
* zoomin
|
||||
*/
|
||||
@ -750,6 +760,16 @@ class MainActivity : BaseActivity() {
|
||||
binding.mainActivitySelectLine.isSelected = viewModel.isSelectRoad()
|
||||
}
|
||||
|
||||
/**
|
||||
* 点击线高亮
|
||||
*/
|
||||
fun openOrCloseLineOnclick() {
|
||||
viewModel.setHighRoad(!viewModel.isHighRoad())
|
||||
binding.mainActivityCloseLine.isSelected = viewModel.isHighRoad()
|
||||
mapController.lineHandler.taskMarkerLayerEnable(viewModel.isHighRoad())
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 点击线选择
|
||||
*/
|
||||
@ -986,7 +1006,7 @@ class MainActivity : BaseActivity() {
|
||||
*/
|
||||
private fun showMainActivityBottomSheetGroup() {
|
||||
binding.mainActivityBottomSheetGroup.visibility = View.VISIBLE
|
||||
mapController.mMapView.setScaleBarLayer(GLViewport.Position.BOTTOM_CENTER, 10, 60)
|
||||
mapController.mMapView.setScaleBarLayer(GLViewport.Position.BOTTOM_CENTER, 128, 60)
|
||||
mapController.mMapView.vtmMap.animator().animateTo(
|
||||
GeoPoint(
|
||||
mapController.mMapView.vtmMap.mapPosition.geoPoint.latitude,
|
||||
@ -1000,7 +1020,7 @@ class MainActivity : BaseActivity() {
|
||||
*/
|
||||
private fun hideMainActivityBottomSheetGroup() {
|
||||
binding.mainActivityBottomSheetGroup.visibility = View.GONE
|
||||
mapController.mMapView.setScaleBarLayer(GLViewport.Position.BOTTOM_CENTER, 10, 0)
|
||||
mapController.mMapView.setScaleBarLayer(GLViewport.Position.BOTTOM_CENTER, 128, 0)
|
||||
mapController.mMapView.vtmMap.animator().animateTo(
|
||||
GeoPoint(
|
||||
mapController.mMapView.vtmMap.mapPosition.geoPoint.latitude,
|
||||
|
||||
@ -155,6 +155,11 @@ class MainViewModel @Inject constructor(
|
||||
*/
|
||||
private var bSelectRoad = false
|
||||
|
||||
/**
|
||||
* 是不是高亮任务线
|
||||
*/
|
||||
private var bHighRoad = true
|
||||
|
||||
/**
|
||||
* 是不是选择轨迹点
|
||||
*/
|
||||
@ -486,13 +491,13 @@ class MainViewModel @Inject constructor(
|
||||
|
||||
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
|
||||
|
||||
val linkList = realmOperateHelper.queryLink(point = point)
|
||||
//val linkList = realmOperateHelper.queryLink(point = point)
|
||||
|
||||
/* val linkList = realmOperateHelper.queryLine(
|
||||
val linkList = realmOperateHelper.queryLine(
|
||||
point = point,
|
||||
buffer = 2.5,
|
||||
table = "OMDB_LANE_MARK_BOUNDARYTYPE"
|
||||
)*/
|
||||
)
|
||||
|
||||
var hisRoadName = false
|
||||
|
||||
@ -777,6 +782,21 @@ class MainViewModel @Inject constructor(
|
||||
return bSelectRoad
|
||||
}
|
||||
|
||||
/**
|
||||
* 开启线高亮
|
||||
*/
|
||||
fun setHighRoad(select: Boolean) {
|
||||
bHighRoad = select
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* 是否开启线高亮
|
||||
*/
|
||||
fun isHighRoad(): Boolean {
|
||||
return bHighRoad
|
||||
}
|
||||
|
||||
/**
|
||||
* 开启轨迹选择
|
||||
*/
|
||||
|
||||
BIN
app/src/main/res/drawable-xxhdpi/icon_hide_line.png
Normal file
BIN
app/src/main/res/drawable-xxhdpi/icon_hide_line.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 2.0 KiB |
BIN
app/src/main/res/drawable-xxhdpi/icon_high_line.png
Normal file
BIN
app/src/main/res/drawable-xxhdpi/icon_high_line.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 2.5 KiB |
BIN
app/src/main/res/drawable-xxhdpi/icon_map_refrush.png
Normal file
BIN
app/src/main/res/drawable-xxhdpi/icon_map_refrush.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.8 KiB |
@ -0,0 +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" />
|
||||
</selector>
|
||||
@ -245,6 +245,15 @@
|
||||
app:layout_constraintBottom_toTopOf="@id/main_activity_bottom_sheet"
|
||||
app:layout_constraintLeft_toLeftOf="@id/main_activity_top_sign_recyclerview" />
|
||||
|
||||
<ImageButton
|
||||
android:id="@+id/main_activity_map_update"
|
||||
style="@style/zoom_btns_style"
|
||||
android:layout_marginBottom="12dp"
|
||||
android:onClick="@{(view)->mainActivity.refrushOnclick(view)}"
|
||||
android:src="@drawable/icon_map_refrush"
|
||||
app:layout_constraintBottom_toTopOf="@id/main_activity_zoom_in"
|
||||
app:layout_constraintRight_toRightOf="@id/main_activity_zoom_in" />
|
||||
|
||||
|
||||
<ImageButton
|
||||
android:id="@+id/main_activity_zoom_out"
|
||||
@ -276,8 +285,8 @@
|
||||
android:layout_marginBottom="12dp"
|
||||
android:onClick="@{()->viewModel.onClickLocationButton()}"
|
||||
android:src="@drawable/icon_location"
|
||||
app:layout_constraintBottom_toTopOf="@id/main_activity_zoom_in"
|
||||
app:layout_constraintRight_toRightOf="@id/main_activity_zoom_in" />
|
||||
app:layout_constraintBottom_toTopOf="@id/main_activity_map_update"
|
||||
app:layout_constraintRight_toRightOf="@id/main_activity_map_update" />
|
||||
|
||||
<ImageButton
|
||||
android:id="@+id/main_activity_add_new"
|
||||
@ -307,17 +316,27 @@
|
||||
app:layout_constraintBottom_toTopOf="@id/main_activity_voice"
|
||||
app:layout_constraintRight_toRightOf="@id/main_activity_voice" />
|
||||
|
||||
<ImageButton
|
||||
android:id="@+id/main_activity_close_line"
|
||||
style="@style/zoom_btns_style"
|
||||
android:layout_marginBottom="12dp"
|
||||
android:background="@drawable/selector_road_line_bg"
|
||||
android:onClick="@{()->mainActivity.openOrCloseLineOnclick()}"
|
||||
android:src="@drawable/selector_high_road_line_src"
|
||||
app:layout_constraintBottom_toTopOf="@id/main_activity_select_line"
|
||||
app:layout_constraintRight_toRightOf="@id/main_activity_select_line" />
|
||||
|
||||
<androidx.constraintlayout.widget.Group
|
||||
android:id="@+id/main_activity_right_visibility_buttons_group"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
app:constraint_referenced_ids="main_activity_select_line,main_activity_voice,main_activity_add_new" />
|
||||
app:constraint_referenced_ids="main_activity_close_line,main_activity_select_line,main_activity_voice,main_activity_add_new" />
|
||||
|
||||
<androidx.constraintlayout.widget.Group
|
||||
android:id="@+id/main_activity_right_visibility_buttons_group2"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
app:constraint_referenced_ids="main_activity_select_line,main_activity_voice,main_activity_add_new,main_activity_zoom_in,main_activity_zoom_out,main_activity_geometry,main_activity_location" />
|
||||
app:constraint_referenced_ids="main_activity_close_line,main_activity_select_line,main_activity_voice,main_activity_add_new,main_activity_map_update,main_activity_zoom_in,main_activity_zoom_out,main_activity_geometry,main_activity_location" />
|
||||
|
||||
<fragment
|
||||
android:id="@+id/main_activity_middle_fragment"
|
||||
|
||||
@ -2063,7 +2063,16 @@
|
||||
</m>
|
||||
</m>
|
||||
</m>
|
||||
<m k="boundaryType" v="3|4|5|7">
|
||||
<m k="boundaryType" v="3">
|
||||
<symbol repeat-gap="6" repeat="true" repeat-start="0" src="assets:omdb/icon_2013_3.svg" symbol-width="12" symbol-height="12"></symbol>
|
||||
<line stroke="#ffffff" use="boundaryType" />
|
||||
</m>
|
||||
<m k="boundaryType" v="4">
|
||||
<line stroke="#ffffff" use="boundaryType" />
|
||||
<symbol repeat="true" repeat-gap="6" repeat-start="0" src="assets:omdb/icon_2013_41.svg" symbol-width="12" symbol-height="12"></symbol>
|
||||
</m>
|
||||
|
||||
<m k="boundaryType" v="5|7">
|
||||
<line stroke="#ffffff" use="boundaryType" />
|
||||
</m>
|
||||
<!-- <m k="boundaryType" v="0|3|4|5|6|7|8|9">
|
||||
@ -2174,16 +2183,7 @@
|
||||
<!-- 环岛 -->
|
||||
<m v="OMDB_ROUNDABOUT">
|
||||
<line stroke="#fcba5a" width="0.5" />
|
||||
|
||||
<m k="type" v="s_2_p">
|
||||
<symbol repeat="false" repeat-start="0" rotate="false" repeat-gap="0"
|
||||
src="assets:omdb/icon_2204_0.svg" symbol-height="56" symbol-width="56"></symbol>
|
||||
</m>
|
||||
|
||||
<m k="type" v="e_2_p">
|
||||
<symbol repeat="false" repeat-start="0" rotate="false" repeat-gap="0"
|
||||
src="assets:omdb/icon_2204_0.svg" symbol-height="56" symbol-width="56"></symbol>
|
||||
</m>
|
||||
<symbol repeat="true" repeat-start="0" repeat-gap="32" src="assets:omdb/icon_2204_0.svg"></symbol>
|
||||
</m>
|
||||
|
||||
<!--常规点限速-->
|
||||
|
||||
13
collect-library/src/main/assets/omdb/icon_2013_3.svg
Normal file
13
collect-library/src/main/assets/omdb/icon_2013_3.svg
Normal file
@ -0,0 +1,13 @@
|
||||
<svg xmlns="http://www.w3.org/2000/svg" width="24.087" height="24.193" viewBox="0 0 24.087 24.193">
|
||||
<defs>
|
||||
<style>
|
||||
.a{fill:#9b9b9b;opacity:0;}.b{fill:#fff;}.c{fill:none;stroke:#707070;stroke-width:1.5px;}
|
||||
</style>
|
||||
</defs>
|
||||
<g transform="translate(-1528 -27)">
|
||||
<path class="a" d="M0,0H24V24H0Z" transform="translate(1528 27)" />
|
||||
<rect class="b" width="24" height="12" transform="translate(1528 39)" />
|
||||
<path class="c" d="M-7051-19375.6h11.066l12.529,10.883"
|
||||
transform="translate(8579 19415.346)" />
|
||||
</g>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 588 B |
1
collect-library/src/main/assets/omdb/icon_2013_4.svg
Normal file
1
collect-library/src/main/assets/omdb/icon_2013_4.svg
Normal file
@ -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="1692173660949" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="15563" xmlns:xlink="http://www.w3.org/1999/xlink" width="12" height="12"><path d="M902.4 173.76h-52.16a24.64 24.64 0 0 0-25.92 25.92v78.08H199.68V199.68a24.64 24.64 0 0 0-25.92-25.92H121.6a24.64 24.64 0 0 0-25.6 25.92v624.64a24.64 24.64 0 0 0 25.92 25.92h51.84a24.64 24.64 0 0 0 25.92-25.92v-76.16h624.64v76.48a24.64 24.64 0 0 0 25.92 25.92h52.16a24.64 24.64 0 0 0 25.92-25.92V199.68a24.64 24.64 0 0 0-25.92-25.92zM240 672H224a24 24 0 0 1-24-24v-272A24 24 0 0 1 224 352h16a24 24 0 0 1 24 24v272a24 24 0 0 1-24 24z m142.08 0h-16a24 24 0 0 1-24-24v-272a24 24 0 0 1 24-24h16a24 24 0 0 1 24 24v272a24 24 0 0 1-24 24z m142.08 0h-16a24 24 0 0 1-24-24v-272a24 24 0 0 1 24-24h16a24 24 0 0 1 24 24v272a24 24 0 0 1-24 24z m142.08 0h-16a24 24 0 0 1-24-24v-272a24 24 0 0 1 24-24h16a24 24 0 0 1 24 24v272a24 24 0 0 1-24.32 24z m142.08 0h-16a24 24 0 0 1-24-24v-272a24 24 0 0 1 24-24h16a24 24 0 0 1 24 24v272a24 24 0 0 1-24.32 24z" fill="#fceaa0" p-id="15564"></path></svg>
|
||||
|
After Width: | Height: | Size: 1.2 KiB |
@ -1 +1 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?><svg id="b" xmlns="http://www.w3.org/2000/svg" width="131.3" height="131.3" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 131.3 131.3"><defs><style>.i{fill:url(#g);}.j{fill:url(#h);stroke:#8b9fae;stroke-miterlimit:10;stroke-width:1.1px;}.k{fill:#fff;}.l{fill:#1566e8;}.m{fill:#535a60;}.n{fill:none;opacity:0;}.o{fill:#262d34;isolation:isolate;opacity:.2;}</style><linearGradient id="g" x1="63.4" y1="374.1" x2="68.2" y2="374.1" gradientTransform="translate(0 428.8) scale(1 -1)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#989898"/><stop offset="0" stop-color="#a3a3a3"/><stop offset="0" stop-color="#c4c5c5"/><stop offset=".2" stop-color="#d8d9d9"/><stop offset=".3" stop-color="#e0e1e1"/><stop offset=".4" stop-color="#dbdcdc"/><stop offset=".5" stop-color="#cccece"/><stop offset=".6" stop-color="#b5b6b7"/><stop offset=".7" stop-color="#949697"/><stop offset=".8" stop-color="#6a6c6f"/><stop offset=".8" stop-color="#3f4246"/><stop offset="1" stop-color="#404247"/><stop offset="1" stop-color="#43434a"/></linearGradient><linearGradient id="h" x1="41.1" y1="402.1" x2="90.2" y2="402.1" gradientTransform="translate(0 428.8) scale(1 -1)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#afbacb"/><stop offset="0" stop-color="#c1ccda"/><stop offset=".4" stop-color="#d9e6f0"/><stop offset=".5" stop-color="#e3f0f8"/><stop offset=".6" stop-color="#dde9f2"/><stop offset=".8" stop-color="#ccd8e4"/><stop offset="1" stop-color="#b1bbcc"/><stop offset="1" stop-color="#aeb8c9"/></linearGradient></defs><g id="c"><g id="d"><g><rect class="n" width="131.3" height="131.3"/><g><ellipse id="e" class="o" cx="65.7" cy="66.2" rx="14.4" ry="3.7"/><ellipse id="f" class="m" cx="65.7" cy="66.2" rx="7.5" ry="3"/><path class="i" d="M65.7,42.6h0c1.4,0,2.6,1.2,2.6,2.6v19.2c0,1.4-1.1,2.5-2.5,2.5h-.3c-1.4,0-2.5-1.1-2.5-2.5v-19.3c0-1.4,1.2-2.6,2.6-2.6h.1Z"/><path class="j" d="M65.6,1h0c13.5,0,24.5,11,24.5,24.5v2.4c0,13.5-11,24.5-24.5,24.5h0c-13.5,0-24.5-11-24.5-24.5v-2.4c0-13.5,11-24.5,24.5-24.5Z"/><path class="l" d="M65.7,3.3h0c13.3,0,24,10.7,24,24v.5c0,13.3-10.7,24-24,24h0c-13.3,0-24-10.7-24-24v-.5c0-13.3,10.7-24,24-24Z"/><g><path class="k" d="M55,10.3l3.5-1.7-1.4,3.9,.3,.8c8.4-3.6,15-2.4,21,3.9l-2.3,1.8c-4.8-5.2-10.8-6.1-17.4-3l.4,1,4.2,.9-3.5,2.1-7.9-2.6,3-7.1h.1Z"/><path class="k" d="M55.2,46l-3.2-2.2,4.1-.7,.5-.7c-7.2-5.4-9.5-11.7-7-19.9l2.7,1c-2.1,6.8,0,12.3,6.1,16.4l.6-.8-1.2-4.1,3.6,1.9,1.7,8.1-7.7,.9h-.2Z"/><path class="k" d="M86.5,27.8l-.3,3.9-2.7-3.2h-.8c-1,8.9-5.2,14-13.7,16l-.5-2.8c7-1.7,10.8-6.3,11.2-13.6h-1l-2.8,3.1-.2-4.1,6.1-5.5,4.8,6.1h0Z"/></g><g><path class="k" d="M60.6,30.4v.4c-.5,0-2.6,.4-3.1,.5v-1.1l1-.2v-1.8h-.8v-1.1h.8v-1.5h-.9v-1.1h2.9v1.1h-.9v1.5h.8v1.1h-.8v1.6l.9-.2v.7h0Zm4.3-.1c-.5-.7-1.2-1.6-1.7-2.2v4h-1.1v-3.5c-.3,.5-.7,1-1.2,1.4l-.8-.9c1-1,1.7-2.2,2.3-3.5h-1.6v-1.2h4.4v1.2h-1.6c-.2,.5-.4,1-.6,1.4h.3v.3l.3-.3c.6,.5,1.6,1.6,2.1,2.3l-.7,.9h-.1Z"/><path class="k" d="M71.8,31.2h-5.1v-2.2h1.1v1.2h1v-1.4h1.1v1.4h.9v-1.2h1.1v2.2h0Zm2-3.4s0,2.8,0,3c0,1-.3,1.3-1.1,1.3h-.9l-.3-.8h.7c.4,0,.4-.3,.4-.8v-1.9h-5.4v-4h1.7c0-.2,.2-.5,.3-.7h1.2c0,.3,0,.5-.2,.7h2.8v1.7c0,1-.4,1.1-1.2,1.2h-.6l-.3-.8h.5c.4,0,.5-.2,.5-.4v-.7h-2.4c.4,.3,.8,.6,1.1,.9l-.6,.8c-.4-.4-.9-.8-1.3-1.1l.5-.6h-.8v2.1h5.5Z"/></g></g></g></g></g></svg>
|
||||
<svg xmlns="http://www.w3.org/2000/svg" width="64" height="36" viewBox="0 0 64 36"><defs><style>.a,.c{fill:#fff;}.a{stroke:#1566e8;}.b{fill:#1566e8;}.c{font-size:23px;font-family:PingFangSC-Regular, PingFang SC;}.d{stroke:none;}.e{fill:none;}</style></defs><g transform="translate(-301 -1485)"><g class="a" transform="translate(301 1485)"><rect class="d" width="64" height="36" rx="5"/><rect class="e" x="0.5" y="0.5" width="63" height="35" rx="4.5"/></g><rect class="b" width="58" height="30" rx="5" transform="translate(304 1488)"/><text class="c" transform="translate(310 1511)"><tspan x="0" y="0">环岛</tspan></text></g></svg>
|
||||
|
Before Width: | Height: | Size: 3.2 KiB After Width: | Height: | Size: 632 B |
@ -209,6 +209,11 @@ class LineHandler(context: AppCompatActivity, mapView: NIMapView) : BaseHandler(
|
||||
omdbTaskLinkLayer.update()
|
||||
mMapView.vtmMap.updateMap(true)
|
||||
}
|
||||
|
||||
fun taskMarkerLayerEnable(boolean: Boolean){
|
||||
omdbTaskLinkLayer.isEnabled = boolean
|
||||
mMapView.vtmMap.updateMap(true)
|
||||
}
|
||||
}
|
||||
|
||||
interface OnTaskLinkItemClickListener : BaseClickListener {
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user