From 0f8f36ea8c5e761bf92325574e41a2286da4a9d9 Mon Sep 17 00:00:00 2001 From: qiji4215 Date: Wed, 16 Aug 2023 16:31:49 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BD=A6=E9=81=93?= =?UTF-8?q?=E8=BE=B9=E7=95=8C=E7=B1=BB=E5=9E=8B=E6=B8=B2=E6=9F=93=E6=95=88?= =?UTF-8?q?=E6=9E=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/assets/omdb_config.json | 10 +------ .../omqs/ui/activity/map/MainActivity.kt | 24 ++++++++++++++-- .../omqs/ui/activity/map/MainViewModel.kt | 26 +++++++++++++++-- .../res/drawable-xxhdpi/icon_hide_line.png | Bin 0 -> 2003 bytes .../res/drawable-xxhdpi/icon_high_line.png | Bin 0 -> 2609 bytes .../res/drawable-xxhdpi/icon_map_refrush.png | Bin 0 -> 1827 bytes .../drawable/selector_high_road_line_src.xml | 5 ++++ app/src/main/res/layout/activity_main.xml | 27 +++++++++++++++--- .../src/main/assets/editormarker.xml | 22 +++++++------- .../src/main/assets/omdb/icon_2013_3.svg | 13 +++++++++ .../src/main/assets/omdb/icon_2013_4.svg | 1 + .../src/main/assets/omdb/icon_2204_0.svg | 2 +- .../library/map/handler/LineHandler.kt | 5 ++++ 13 files changed, 105 insertions(+), 30 deletions(-) create mode 100644 app/src/main/res/drawable-xxhdpi/icon_hide_line.png create mode 100644 app/src/main/res/drawable-xxhdpi/icon_high_line.png create mode 100644 app/src/main/res/drawable-xxhdpi/icon_map_refrush.png create mode 100644 app/src/main/res/drawable/selector_high_road_line_src.xml create mode 100644 collect-library/src/main/assets/omdb/icon_2013_3.svg create mode 100644 collect-library/src/main/assets/omdb/icon_2013_4.svg diff --git a/app/src/main/assets/omdb_config.json b/app/src/main/assets/omdb_config.json index 096703c3..e9fe0ce8 100644 --- a/app/src/main/assets/omdb_config.json +++ b/app/src/main/assets/omdb_config.json @@ -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", diff --git a/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainActivity.kt b/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainActivity.kt index 26e67c78..35cb46c1 100644 --- a/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainActivity.kt +++ b/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainActivity.kt @@ -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, diff --git a/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainViewModel.kt b/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainViewModel.kt index 0be0a786..27113ebc 100644 --- a/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainViewModel.kt +++ b/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainViewModel.kt @@ -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 + } + /** * 开启轨迹选择 */ diff --git a/app/src/main/res/drawable-xxhdpi/icon_hide_line.png b/app/src/main/res/drawable-xxhdpi/icon_hide_line.png new file mode 100644 index 0000000000000000000000000000000000000000..70df09a42677fa954d383497fe833fa35746f017 GIT binary patch literal 2003 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 T?qgGO00000NkvXXu0mjfaeKnC literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxhdpi/icon_map_refrush.png b/app/src/main/res/drawable-xxhdpi/icon_map_refrush.png new file mode 100644 index 0000000000000000000000000000000000000000..6d29f47d94b5d3e9c8a3695e4b365577a6e63dbb GIT binary patch literal 1827 zcmV+;2i*9HP)Px*-AP12RCr$Pn`?{{RTRhnXIdT!eh?)~G%U2cpoy!J0Nd#rAS;T30TRKPE{K93 zL^LV_Arc<}gMJVn2%-@rViw5K8PEs@5Q984&?%1)9*L3NP8UoTG{6#hZ#ze4+l38w zyVL2kY?DsXq?z7x?m54nxpVJ5=Mst+sK@|C2xbrzBO%`qhE9#%Mg{nHw!!zAQPJTxv#wrz*wOL%U5Rt zBX1BSNpUq|*c>973!pC&;k}&={+V6I_WkPzp321Vwzicu(MJU4@c@knb4B7l{lbjp zVb$}!6`gs3;FlvZ6U_lb1aKYTWr)R>YTpg|(~6N++xVr(1WrI6Y05BIag+Pwy}|zb z)9J`L1W}HB0njT+BWj6gX(;G9WYsY{?L0M5*^%+r=pJS)0AqUMeNSpg@yMxkk45eR-c@&SY10?`^R=y~30 z!=2Wb9JlrW=uQS6WdS?0nl_68-4Dh-Fdu;%PiS>zXPh=V7yA5i^c@B-0%I2l)mcJ_ z)`IytFkaGB@5)>loGYDTK>q`bL5bO=%>|TCijE@U9RLn$ig#G9jLnr^U!ZXuv9UQT z2%@BK1YzRsjskN(zzpeZVA+ZUe;_)RnYVO>DDcS*|Jw|)10>`9gtmndk??vbIN)#Ef%bY}ZuplZE1pT{}}k z7$!yTcM<*GRrU((I%icbB?MnhWCR(shhZ!ZE9GxmRaU6&QbG{r=p=wQfG}GNdOs^v z=d9YD5`sUVzs!s;L71!sz3Z(iE7W$W9|yT%AwgJRuERqcyt@k3IjeRTBcY?Lba6}o zP<%T8D9#fA6laXdAyt$jXFybPkuUc+u2x*PI?@(myEF?ZeF=a!x^j}mDc~JKsFY8R z6cFE?F4OCj5w}}U+MOkztk)Azj&9vbwRQa*Ew;Gbj<@f>lkK(WrwpFW%&&#jvgKXL za3^g^3*p8VTY=^rtb*#ags-dQ9jrQ(s+}0nSHpmZ1X`7LI9OJj1%yOan!(4w!i2Eu(X$E9e94MZk5c#XH5Wf%%XV<>)DZ`w=iJqoX$=rlPjgTvyIdw##6z&=l{?&Y))u zL7aG^AKdQN8f7M7d^kAZ$Id#**YDNRUw2%=rOjpvKa=Tx#t;&ZMZ<8A@T>WqAj}FW z1JZ_DJ|I*{ryepWX3lCyW&$ALgUw5v9O+AO3Y%GL2EMw)m**W604||xki3DB}Qp+~kb-qo`k;may zBW|97VhKP=yWbBpj32C=fr23Tn2aIBRKei(3!g2-P(!Ns+iacBDTFrV71HtUz0hkk z2|SvaA0tr8Ra~den3c4G@RNbKx<6Q+_Lxtnx>7XANhEY+NM%iZDaGmGROceib5lfg z!2m9h`7v;kVH}MCM-Qsy7wkA^RVJ?xtQwW?c0~x;%oy|iZ{@PTVkG=W_h0DqD{n=K RLbm__002ovPDHLkV1hoDM5X`$ literal 0 HcmV?d00001 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 new file mode 100644 index 00000000..b2eb9ddc --- /dev/null +++ b/app/src/main/res/drawable/selector_high_road_line_src.xml @@ -0,0 +1,5 @@ + + + + + \ 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 223e386e..cedb151a 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -245,6 +245,15 @@ app:layout_constraintBottom_toTopOf="@id/main_activity_bottom_sheet" app:layout_constraintLeft_toLeftOf="@id/main_activity_top_sign_recyclerview" /> + + + app:layout_constraintBottom_toTopOf="@id/main_activity_map_update" + app:layout_constraintRight_toRightOf="@id/main_activity_map_update" /> + + + app:constraint_referenced_ids="main_activity_close_line,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,main_activity_map_update,main_activity_zoom_in,main_activity_zoom_out,main_activity_geometry,main_activity_location" /> - + + + + + + + + + + - - - - - - - - + diff --git a/collect-library/src/main/assets/omdb/icon_2013_3.svg b/collect-library/src/main/assets/omdb/icon_2013_3.svg new file mode 100644 index 00000000..9ddb8828 --- /dev/null +++ b/collect-library/src/main/assets/omdb/icon_2013_3.svg @@ -0,0 +1,13 @@ + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/icon_2013_4.svg b/collect-library/src/main/assets/omdb/icon_2013_4.svg new file mode 100644 index 00000000..84520005 --- /dev/null +++ b/collect-library/src/main/assets/omdb/icon_2013_4.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/icon_2204_0.svg b/collect-library/src/main/assets/omdb/icon_2204_0.svg index 5f413949..4d1195e5 100644 --- a/collect-library/src/main/assets/omdb/icon_2204_0.svg +++ b/collect-library/src/main/assets/omdb/icon_2204_0.svg @@ -1 +1 @@ - \ No newline at end of file +环岛 \ 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 c652a02b..d57fc710 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 @@ -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 { From 27d21f341fc6859af4b21b247b4c3f858436f77d Mon Sep 17 00:00:00 2001 From: qiji4215 Date: Thu, 17 Aug 2023 09:32:58 +0800 Subject: [PATCH 2/3] =?UTF-8?q?1.=E5=A2=9E=E5=8A=A0=E6=8A=A4=E6=A0=8F?= =?UTF-8?q?=E6=B8=B2=E6=9F=932.=E5=A2=9E=E5=8A=A0=E8=B7=AF=E7=89=99?= =?UTF-8?q?=E6=B8=B2=E6=9F=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../navinfo/omqs/ui/activity/map/MainViewModel.kt | 6 +++--- collect-library/src/main/assets/editormarker.xml | 9 ++------- .../src/main/assets/omdb/icon_2013_3.svg | 14 +------------- .../src/main/assets/omdb/icon_2013_4.svg | 2 +- 4 files changed, 7 insertions(+), 24 deletions(-) diff --git a/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainViewModel.kt b/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainViewModel.kt index 27113ebc..4d27637a 100644 --- a/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainViewModel.kt +++ b/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainViewModel.kt @@ -491,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 diff --git a/collect-library/src/main/assets/editormarker.xml b/collect-library/src/main/assets/editormarker.xml index 33d80083..16b86fcf 100644 --- a/collect-library/src/main/assets/editormarker.xml +++ b/collect-library/src/main/assets/editormarker.xml @@ -2064,20 +2064,15 @@ - - + - - + - diff --git a/collect-library/src/main/assets/omdb/icon_2013_3.svg b/collect-library/src/main/assets/omdb/icon_2013_3.svg index 9ddb8828..585ed2a4 100644 --- a/collect-library/src/main/assets/omdb/icon_2013_3.svg +++ b/collect-library/src/main/assets/omdb/icon_2013_3.svg @@ -1,13 +1 @@ - - - - - - - - - - \ No newline at end of file + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/icon_2013_4.svg b/collect-library/src/main/assets/omdb/icon_2013_4.svg index 84520005..5f1fd0b8 100644 --- a/collect-library/src/main/assets/omdb/icon_2013_4.svg +++ b/collect-library/src/main/assets/omdb/icon_2013_4.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file From 9fe1847f601b41f16320670d2af21dc060e82985 Mon Sep 17 00:00:00 2001 From: qiji4215 Date: Thu, 17 Aug 2023 10:04:48 +0800 Subject: [PATCH 3/3] merge code --- .../java/com/navinfo/collect/library/map/handler/LineHandler.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 d57fc710..8776d6e6 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 @@ -60,7 +60,7 @@ class LineHandler(context: AppCompatActivity, mapView: NIMapView) : BaseHandler( .fillColor(context.resources.getColor(R.color.draw_line_red_color)) .fillAlpha(0.5f) .strokeColor(context.resources.getColor(R.color.draw_line_red_color)) - .strokeWidth(2f) + .strokeWidth(3f) .fixed(true).build() ) addLayer(layer, NIMapView.LAYER_GROUPS.VECTOR)