diff --git a/app/src/main/assets/omdb_config.json b/app/src/main/assets/omdb_config.json index 75c2cf04..92b092a0 100644 --- a/app/src/main/assets/omdb_config.json +++ b/app/src/main/assets/omdb_config.json @@ -80,7 +80,6 @@ "name": "车道边界类型", "zoomMin": 18, "zoomMax": 20, - "checkLinkId": true, "filterData": true, "catch":true, "transformer": [ @@ -140,7 +139,6 @@ "table": "OMDB_LANE_CONSTRUCTION", "code": 2090, "name": "车道施工", - "checkLinkId": true, "existSubCode": true, "catch":true, "zoomMin": 18, @@ -150,7 +148,6 @@ "table": "OMDB_BRIDGE", "code": 2201, "name": "桥", - "checkLinkId": true, "zoomMin": 15, "zoomMax": 20, "transformer": [ @@ -166,7 +163,6 @@ "table": "OMDB_TUNNEL", "code": 2202, "name": "隧道", - "checkLinkId": true, "zoomMin": 15, "zoomMax": 20, "transformer": [ @@ -241,7 +237,6 @@ "name": "杆状物", "is3D": true, "catch":true, - "checkLinkId": true, "filterData": true, "zoomMin": 18, "zoomMax": 20, @@ -301,6 +296,7 @@ "table": "OMDB_SPEEDLIMIT", "code": 4002, "name": "常规点限速", + "catch":true, "zoomMin": 15, "zoomMax": 20, "transformer": [ @@ -405,6 +401,7 @@ "table": "OMDB_WARNINGSIGN", "code": 4009, "name": "警示信息", + "catch":true, "zoomMin": 15, "zoomMax": 20, "transformer": [ @@ -438,6 +435,7 @@ "table": "OMDB_ELECTRONICEYE", "code": 4010, "name": "电子眼", + "catch":true, "zoomMin": 15, "zoomMax": 20, "transformer": [ @@ -471,6 +469,7 @@ "table": "OMDB_TRAFFICLIGHT", "code": 4022, "name": "交通灯", + "catch":true, "zoomMin": 15, "zoomMax": 20, "transformer": [ @@ -480,6 +479,7 @@ "table": "OMDB_TOLLGATE", "code": 4023, "name": "收费站", + "catch":true, "zoomMin": 15, "zoomMax": 20, "transformer": [ @@ -489,6 +489,7 @@ "table": "OMDB_LANEINFO", "code": 4601, "name": "车信", + "catch":true, "zoomMin": 15, "zoomMax": 17, "transformer": [ diff --git a/app/src/main/java/com/navinfo/omqs/db/RealmOperateHelper.kt b/app/src/main/java/com/navinfo/omqs/db/RealmOperateHelper.kt index b9ba12e8..e4dfd1f7 100644 --- a/app/src/main/java/com/navinfo/omqs/db/RealmOperateHelper.kt +++ b/app/src/main/java/com/navinfo/omqs/db/RealmOperateHelper.kt @@ -65,7 +65,7 @@ class RealmOperateHelper() { val realm = getSelectTaskRealmInstance() val realmList = getSelectTaskRealmTools(RenderEntity::class.java, false) - .equalTo("table", "OMDB_RD_LINK") + .equalTo("table", "OMDB_RD_LINK_KIND") .greaterThanOrEqualTo("tileX", xStart) .lessThanOrEqualTo("tileX", xEnd) .greaterThanOrEqualTo("tileY", yStart) @@ -74,6 +74,7 @@ class RealmOperateHelper() { // 将获取到的数据和查询的polygon做相交,只返回相交的数据 val dataList = realm.copyFromRealm(realmList) realm.close() + val queryResult = dataList?.stream()?.filter { polygon.intersects(it.wkt) }?.toList() @@ -200,7 +201,7 @@ class RealmOperateHelper() { var link: RenderEntity? = null val realm = getSelectTaskRealmInstance() val realmR = - getSelectTaskRealmTools(RenderEntity::class.java, true).equalTo("table", "OMDB_RD_LINK") + getSelectTaskRealmTools(RenderEntity::class.java, true).equalTo("table", "OMDB_RD_LINK_KIND") .equalTo("properties['${LinkTable.linkPid}']", linkPid).findFirst() if (realmR != null) { link = realm.copyFromRealm(realmR) @@ -330,7 +331,7 @@ class RealmOperateHelper() { val result = mutableListOf() val realm = getSelectTaskRealmInstance() val realmList = getSelectTaskRealmTools(RenderEntity::class.java, false) - .notEqualTo("table", DataCodeEnum.OMDB_RD_LINK.name) + .notEqualTo("table", DataCodeEnum.OMDB_RD_LINK_KIND.name) .equalTo("properties['${LinkTable.linkPid}']", linkPid) .findAll() result.addAll(realm.copyFromRealm(realmList)) @@ -478,5 +479,5 @@ enum class BUFFER_TYPE(val index: Int) { } } -private val DEFAULT_BUFFER: Double = 15.0 +private const val DEFAULT_BUFFER: Double = 15.0 private val DEFAULT_BUFFER_TYPE = BUFFER_TYPE.METER 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 bd93f665..73c73440 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 @@ -281,8 +281,10 @@ class MainActivity : BaseActivity() { viewModel.liveDataRoadName.observe(this) { if (it != null) { binding.mainActivityRoadName.text = it.properties["name"] + binding.mainActivityRoadName.visibility = View.VISIBLE } else { binding.mainActivityRoadName.text = " " + binding.mainActivityRoadName.visibility = View.GONE } } @@ -444,7 +446,8 @@ class MainActivity : BaseActivity() { } } - findNavController(R.id.main_activity_right_fragment).addOnDestinationChangedListener { _, destination, arguments -> + findNavController(R.id.main_activity_right_fragment).addOnDestinationChangedListener { _, destination, _ -> + backSignMoreInfo() if (destination.id == R.id.RightEmptyFragment) { binding.mainActivityRightVisibilityButtonsGroup.visibility = View.VISIBLE } else { @@ -1125,6 +1128,7 @@ class MainActivity : BaseActivity() { * 打开道路名称属性看板,选择的道路在viewmodel里记录,不用 */ fun openRoadNameFragment() { + backSignMoreInfo() if (viewModel.liveDataRoadName.value != null) { viewModel.showSignMoreInfo(viewModel.liveDataRoadName.value!!) } @@ -1152,10 +1156,18 @@ class MainActivity : BaseActivity() { rightController.navigate(R.id.TaskLinkFragment) } - /** - * 右侧按钮+经纬度按钮 - */ fun setRightButtonsVisible(visible: Int) { binding.mainActivityRightVisibilityButtonsGroup2.visibility = visible } + + /** + * 隐藏更多信息面板 + */ + fun backSignMoreInfo(){ + val fragment = + supportFragmentManager.findFragmentById(R.id.main_activity_sign_more_info_fragment) + if(fragment!=null&&!fragment.isHidden){ + supportFragmentManager.beginTransaction().remove(fragment).commit() + } + } } \ No newline at end of file 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 4f6e9564..13ea94ea 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 @@ -407,7 +407,7 @@ class MainViewModel @Inject constructor( route.pointList = GeometryTools.getGeoPoints(link.geometry) //查询每条link的snode,enode val res1 = realm.where(RenderEntity::class.java) - .equalTo("table", DataCodeEnum.OMDB_RD_LINK.name).and() + .equalTo("table", DataCodeEnum.OMDB_RD_LINK_KIND.name).and() .equalTo("properties['linkPid']", link.linkPid).findFirst() res1?.let { @@ -678,7 +678,7 @@ class MainViewModel @Inject constructor( point.longitude, point.latitude ), - buffer = 2.4, catchAll = false, + buffer = 3.2, catchAll = false, ) //增加道路线过滤原则 val filterResult = itemList.filter { @@ -712,12 +712,6 @@ class MainViewModel @Inject constructor( val linkList = realmOperateHelper.queryLink(point = point) - /* val linkList = realmOperateHelper.queryLine( - point = point, - buffer = 1.0, - table = "OMDB_RD_LINK_KIND" - )*/ - var hisRoadName = false if (linkList.isNotEmpty()) { @@ -841,7 +835,7 @@ class MainViewModel @Inject constructor( RenderEntity::class.java, true ) - .equalTo("table", DataCodeEnum.OMDB_RD_LINK.name).and() + .equalTo("table", DataCodeEnum.OMDB_RD_LINK_KIND.name).and() .equalTo( "properties['${RenderEntity.Companion.LinkTable.linkPid}']", outLink diff --git a/app/src/main/java/com/navinfo/omqs/ui/activity/map/TopSignAdapter.kt b/app/src/main/java/com/navinfo/omqs/ui/activity/map/TopSignAdapter.kt index cf76f01b..64c2641d 100644 --- a/app/src/main/java/com/navinfo/omqs/ui/activity/map/TopSignAdapter.kt +++ b/app/src/main/java/com/navinfo/omqs/ui/activity/map/TopSignAdapter.kt @@ -30,7 +30,7 @@ class TopSignAdapter(private var itemListener: ((Int, SignBean) -> Unit?)? = nul DataCodeEnum.OMDB_TUNNEL.code, DataCodeEnum.OMDB_ROUNDABOUT.code, DataCodeEnum.OMDB_VIADUCT.code, - -> bd.topSignName.text = "" + -> bd.topSignName.text = "形态" else -> bd.topSignName.text = item.name } diff --git a/app/src/main/java/com/navinfo/omqs/util/SignUtil.kt b/app/src/main/java/com/navinfo/omqs/util/SignUtil.kt index cbda1321..2a234341 100644 --- a/app/src/main/java/com/navinfo/omqs/util/SignUtil.kt +++ b/app/src/main/java/com/navinfo/omqs/util/SignUtil.kt @@ -126,9 +126,9 @@ class SignUtil { //常规线限速 DataCodeEnum.OMDB_LINK_SPEEDLIMIT.code -> "线限速" - DataCodeEnum.OMDB_LINK_ATTRIBUTE_MAIN_SIDE_ACCESS.code, DataCodeEnum.OMDB_LINK_ATTRIBUTE_FORNTAGE.code, DataCodeEnum.OMDB_LINK_ATTRIBUTE_SA.code, DataCodeEnum.OMDB_LINK_ATTRIBUTE_PA.code -> "道路属性" + DataCodeEnum.OMDB_LINK_ATTRIBUTE_MAIN_SIDE_ACCESS.code, DataCodeEnum.OMDB_LINK_ATTRIBUTE_FORNTAGE.code, DataCodeEnum.OMDB_LINK_ATTRIBUTE_SA.code, DataCodeEnum.OMDB_LINK_ATTRIBUTE_PA.code -> "形态" - DataCodeEnum.OMDB_LINK_FORM1_1.code, DataCodeEnum.OMDB_LINK_FORM1_2.code, DataCodeEnum.OMDB_LINK_FORM1_3.code, DataCodeEnum.OMDB_LINK_FORM2_1.code, DataCodeEnum.OMDB_LINK_FORM2_2.code, DataCodeEnum.OMDB_LINK_FORM2_3.code, DataCodeEnum.OMDB_LINK_FORM2_4.code, DataCodeEnum.OMDB_LINK_FORM2_5.code, DataCodeEnum.OMDB_LINK_FORM2_6.code, DataCodeEnum.OMDB_LINK_FORM2_7.code, DataCodeEnum.OMDB_LINK_FORM2_8.code, DataCodeEnum.OMDB_LINK_FORM2_9.code, DataCodeEnum.OMDB_LINK_FORM2_10.code, DataCodeEnum.OMDB_LINK_FORM2_11.code, DataCodeEnum.OMDB_LINK_FORM2_12.code, DataCodeEnum.OMDB_LINK_FORM2_13.code -> "道路形态" + DataCodeEnum.OMDB_LINK_FORM1_1.code, DataCodeEnum.OMDB_LINK_FORM1_2.code, DataCodeEnum.OMDB_LINK_FORM1_3.code, DataCodeEnum.OMDB_LINK_FORM2_1.code, DataCodeEnum.OMDB_LINK_FORM2_2.code, DataCodeEnum.OMDB_LINK_FORM2_3.code, DataCodeEnum.OMDB_LINK_FORM2_4.code, DataCodeEnum.OMDB_LINK_FORM2_5.code, DataCodeEnum.OMDB_LINK_FORM2_6.code, DataCodeEnum.OMDB_LINK_FORM2_7.code, DataCodeEnum.OMDB_LINK_FORM2_8.code, DataCodeEnum.OMDB_LINK_FORM2_9.code, DataCodeEnum.OMDB_LINK_FORM2_10.code, DataCodeEnum.OMDB_LINK_FORM2_11.code, DataCodeEnum.OMDB_LINK_FORM2_12.code, DataCodeEnum.OMDB_LINK_FORM2_13.code -> "形态" else -> DataCodeEnum.findTableNameByCode(data.code) } diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 95e1f5b9..54a6017a 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -235,6 +235,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:background="@drawable/shape_road_name_bg" + android:visibility="gone" android:onClick="@{()->mainActivity.openRoadNameFragment()}" android:layout_marginLeft="10dp" android:paddingLeft="10dp" diff --git a/app/src/main/res/menu/personal_center_menu.xml b/app/src/main/res/menu/personal_center_menu.xml index 1d3d7da5..ec8d8d54 100644 --- a/app/src/main/res/menu/personal_center_menu.xml +++ b/app/src/main/res/menu/personal_center_menu.xml @@ -54,7 +54,7 @@ + android:title="版本:23QE4_V1.5.2_20230919_A" /> diff --git a/collect-library/src/main/assets/editormarker.xml b/collect-library/src/main/assets/editormarker.xml index 360326ff..b8d15a15 100644 --- a/collect-library/src/main/assets/editormarker.xml +++ b/collect-library/src/main/assets/editormarker.xml @@ -1598,7 +1598,7 @@ - + @@ -1774,7 +1774,7 @@ + src="assets:omdb/icon_2202_0.svg" symbol-height="24" symbol-width="24"> @@ -1790,7 +1790,7 @@ + src="assets:omdb/icon_2201_1_1.svg" symbol-height="56" symbol-width="56"> + src="assets:omdb/icon_2201_2_1.svg" symbol-height="56" symbol-width="56"> + src="assets:omdb/icon_2201_3_1.svg" symbol-height="56" symbol-width="56"> - + diff --git a/vtm b/vtm index 3ea6a7c9..41610ce5 160000 --- a/vtm +++ b/vtm @@ -1 +1 @@ -Subproject commit 3ea6a7c90627e6e8ea10b3896004d9082167a7ff +Subproject commit 41610ce5fe5a10d5c9c32409cbc712e7047a9b9b