From b53aa520d4c34001fab091610a5afbb1cf17cb2f Mon Sep 17 00:00:00 2001 From: qiji4215 Date: Thu, 17 Aug 2023 17:35:06 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=81=93=E8=B7=AF=E5=BD=A2?= =?UTF-8?q?=E6=80=81code=E4=B8=8D=E5=AF=B9=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/navinfo/omqs/db/ImportOMDBHelper.kt | 6 +- .../omqs/ui/activity/map/MainActivity.kt | 4 +- .../omqs/ui/activity/map/MainViewModel.kt | 7 +-- .../main/res/menu/personal_center_menu.xml | 2 +- .../src/main/assets/editormarker.xml | 10 +-- .../src/main/assets/omdb/icon_2013_4.svg | 62 ++++++++++++++++++- vtm | 2 +- 7 files changed, 75 insertions(+), 18 deletions(-) diff --git a/app/src/main/java/com/navinfo/omqs/db/ImportOMDBHelper.kt b/app/src/main/java/com/navinfo/omqs/db/ImportOMDBHelper.kt index fbeed81c..3460f39c 100644 --- a/app/src/main/java/com/navinfo/omqs/db/ImportOMDBHelper.kt +++ b/app/src/main/java/com/navinfo/omqs/db/ImportOMDBHelper.kt @@ -324,7 +324,7 @@ class ImportOMDBHelper @AssistedInject constructor( } }else if(renderEntity.code == DataCodeEnum.OMDB_RAMP.code){ /*匝道*/ - var formWay = renderEntity.properties["FORM_OF_WAY"] + var formWay = renderEntity.properties["formOfWay"] if(formWay!=null){ when (formWay) { "93"-> renderEntity.code = DataCodeEnum.OMDB_RAMP_1.code @@ -338,7 +338,7 @@ class ImportOMDBHelper @AssistedInject constructor( } }else if(renderEntity.code == DataCodeEnum.OMDB_LINK_FORM1.code){ /*道路形态1*/ - var formWay = renderEntity.properties["FORM_OF_WAY"] + var formWay = renderEntity.properties["formOfWay"] if(formWay!=null){ when (formWay) { "35"-> renderEntity.code = DataCodeEnum.OMDB_LINK_FORM1_1.code @@ -348,7 +348,7 @@ class ImportOMDBHelper @AssistedInject constructor( } }else if(renderEntity.code == DataCodeEnum.OMDB_LINK_FORM2.code){ /*道路形态2*/ - var formWay = renderEntity.properties["FORM_OF_WAY"] + var formWay = renderEntity.properties["formOfWay"] if(formWay!=null){ when (formWay) { "10"-> renderEntity.code = DataCodeEnum.OMDB_LINK_FORM2_1.code 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 7ebdb43a..3eaeeeaf 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 @@ -1010,7 +1010,7 @@ class MainActivity : BaseActivity() { */ private fun showMainActivityBottomSheetGroup() { binding.mainActivityBottomSheetGroup.visibility = View.VISIBLE - mapController.mMapView.setScaleBarLayer(GLViewport.Position.BOTTOM_CENTER, 128, 60) + mapController.mMapView.setScaleBarLayer(GLViewport.Position.BOTTOM_CENTER, 256, 60) mapController.mMapView.vtmMap.animator().animateTo( GeoPoint( mapController.mMapView.vtmMap.mapPosition.geoPoint.latitude, @@ -1024,7 +1024,7 @@ class MainActivity : BaseActivity() { */ private fun hideMainActivityBottomSheetGroup() { binding.mainActivityBottomSheetGroup.visibility = View.GONE - mapController.mMapView.setScaleBarLayer(GLViewport.Position.BOTTOM_CENTER, 128, 0) + mapController.mMapView.setScaleBarLayer(GLViewport.Position.BOTTOM_CENTER, 256, 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 8beb2dbb..308befac 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 @@ -452,7 +452,7 @@ class MainViewModel @Inject constructor( withContext(Dispatchers.Main) { if (Constant.AUTO_LOCATION) { mapController.mMapView.vtmMap.animator() - .animateTo(GeoPoint(location.longitude, location.latitude)) + .animateTo(GeoPoint(location.latitude, location.longitude)) } } } @@ -494,11 +494,8 @@ class MainViewModel @Inject constructor( val linkList = realmOperateHelper.queryLink(point = point) - /*val linkList = realmOperateHelper.queryLine( +/* val linkList = realmOperateHelper.queryLine( point = point, - ) - -// val linkList = realmOperateHelper.queryLine(point = point, buffer = 2.5, table = "OMDB_LANE_MARK_BOUNDARYTYPE") buffer = 2.5, table = "OMDB_LANE_MARK_BOUNDARYTYPE" )*/ diff --git a/app/src/main/res/menu/personal_center_menu.xml b/app/src/main/res/menu/personal_center_menu.xml index 5204c596..810f0e1b 100644 --- a/app/src/main/res/menu/personal_center_menu.xml +++ b/app/src/main/res/menu/personal_center_menu.xml @@ -39,7 +39,7 @@ + android:title="版本：ONE_23QE4_V1.3.0_20230817_A" /> diff --git a/collect-library/src/main/assets/editormarker.xml b/collect-library/src/main/assets/editormarker.xml index ff9c4716..e8a1c689 100644 --- a/collect-library/src/main/assets/editormarker.xml +++ b/collect-library/src/main/assets/editormarker.xml @@ -2068,13 +2068,13 @@ - - - - + + + + + - 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 5f1fd0b8..934f848e 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,61 @@ - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/vtm b/vtm index bd83adb7..ebe23ed7 160000 --- a/vtm +++ b/vtm @@ -1 +1 @@ -Subproject commit bd83adb7df464686b3f19e8a08aeef2cb49f5c17 +Subproject commit ebe23ed7731e301669b2b4ea03918e313a63617e