From 8fba6764bba28c67894976203ddf802e54dcdabc Mon Sep 17 00:00:00 2001 From: squallzhjch Date: Tue, 15 Aug 2023 09:47:55 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=85=A8=E5=B0=81=E9=97=AD?= =?UTF-8?q?=EF=BC=8C=E5=8C=9D=E9=81=93=E5=86=85=E5=AE=B9=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../omqs/ui/activity/map/MainActivity.kt | 10 ++- .../omqs/ui/activity/map/MainViewModel.kt | 83 ++++++++++++------- .../com/navinfo/omqs/ui/widget/SignUtil.kt | 47 +++++++++++ vtm | 2 +- 4 files changed, 107 insertions(+), 35 deletions(-) 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..3c714088 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 @@ -158,9 +158,13 @@ class MainActivity : BaseActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - val checkIntent = Intent() - checkIntent.action = TextToSpeech.Engine.ACTION_CHECK_TTS_DATA - someActivityResultLauncher.launch(checkIntent) + try { + val checkIntent = Intent() + checkIntent.action = TextToSpeech.Engine.ACTION_CHECK_TTS_DATA + someActivityResultLauncher.launch(checkIntent) + } catch (e: Exception) { + Log.e("jingo", "检查TTS失败 $e") + } binding = DataBindingUtil.setContentView(this, R.layout.activity_main) 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 84761c47..a741ab5e 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 @@ -484,11 +484,11 @@ class MainViewModel @Inject constructor( captureLinkState = true if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { -/* val linkList = realmOperateHelper.queryLink( + val linkList = realmOperateHelper.queryLink( point = point, - )*/ + ) - val linkList = realmOperateHelper.queryLine(point = point, buffer = 2.5, table = "OMDB_LANE_MARK_BOUNDARYTYPE") +// val linkList = realmOperateHelper.queryLine(point = point, buffer = 2.5, table = "OMDB_LANE_MARK_BOUNDARYTYPE") var hisRoadName = false @@ -532,11 +532,19 @@ class MainViewModel @Inject constructor( ) Log.e("jingo", "捕捉到的数据code ${element.code}") when (element.code) { + //全封闭 + 2022 -> { + if (signBean.iconText.isNotEmpty()) { + topSignList.add( + signBean + ) + } + } //车道数，种别，功能等级,线限速,道路方向 - 2041, 2008, 2002, 2019, 2010 -> topSignList.add( - signBean - ) - + 2041, 2008, 2002, 2019, 2010, 2037 -> + topSignList.add( + signBean + ) 4002, 4003, 4004, 4010, 4022, 4601 -> signList.add( signBean ) @@ -1100,13 +1108,13 @@ class MainViewModel @Inject constructor( * 设置测量类型 0：距离 2：面积 3：角度 */ fun setMeasuringToolType(type: MeasureLayerHandler.MEASURE_TYPE) { - if(measuringType != type) { + if (measuringType != type) { measuringType = type mapController.measureLayerHandler.clear() } } - fun click2Dor3D(){ + fun click2Dor3D() { viewModelScope.launch(Dispatchers.IO) { Log.e( "qj", @@ -1122,39 +1130,48 @@ class MainViewModel @Inject constructor( * @param searchEnum 枚举类 * @param msg 搜索内容 */ - fun search(searchEnum: SearchEnum,msg:String,dialog:DialogInterface){ - if(searchEnum!=null&&msg.isNotEmpty()&&dialog!=null){ + fun search(searchEnum: SearchEnum, msg: String, dialog: DialogInterface) { + if (searchEnum != null && msg.isNotEmpty() && dialog != null) { when (searchEnum) { SearchEnum.LINK -> { - viewModelScope.launch(Dispatchers.IO) { - val link = realmOperateHelper.queryLink(linkPid = msg) - if(link!=null){ - link?.let { l -> - mapController.lineHandler.showLine(l.geometry) - dialog.dismiss() - } - }else{ - withContext(Dispatchers.Main){ - Toast.makeText(mapController.mMapView.context, "未查询到数据", Toast.LENGTH_SHORT).show() - } - } - } + viewModelScope.launch(Dispatchers.IO) { + val link = realmOperateHelper.queryLink(linkPid = msg) + if (link != null) { + link?.let { l -> + mapController.lineHandler.showLine(l.geometry) + dialog.dismiss() + } + } else { + withContext(Dispatchers.Main) { + Toast.makeText( + mapController.mMapView.context, + "未查询到数据", + Toast.LENGTH_SHORT + ).show() + } + } + } } SearchEnum.MARK -> { viewModelScope.launch(Dispatchers.IO) { val qsRecordBean = realmOperateHelper.queryQcRecordBean(markId = msg) - if(qsRecordBean!=null){ + if (qsRecordBean != null) { qsRecordBean?.let { l -> - val naviController = (mapController.mMapView.context as Activity).findNavController(R.id.main_activity_right_fragment) + val naviController = + (mapController.mMapView.context as Activity).findNavController(R.id.main_activity_right_fragment) val bundle = Bundle() bundle.putString("QsId", l.id) naviController.navigate(R.id.EvaluationResultFragment, bundle) ToastUtils.showLong(l.classType) dialog.dismiss() } - }else{ - withContext(Dispatchers.Main){ - Toast.makeText(mapController.mMapView.context, "未查询到数据", Toast.LENGTH_SHORT).show() + } else { + withContext(Dispatchers.Main) { + Toast.makeText( + mapController.mMapView.context, + "未查询到数据", + Toast.LENGTH_SHORT + ).show() } } } @@ -1165,10 +1182,14 @@ class MainViewModel @Inject constructor( val x = parts[0].toDouble() val y = parts[1].toDouble() mapController.animationHandler.animationByLatLon(y, x) - mapController.markerHandle.addMarker(GeoPoint(y,x),"location") + mapController.markerHandle.addMarker(GeoPoint(y, x), "location") dialog.dismiss() } else { - Toast.makeText(mapController.mMapView.context, "输入格式不正确", Toast.LENGTH_SHORT).show() + Toast.makeText( + mapController.mMapView.context, + "输入格式不正确", + Toast.LENGTH_SHORT + ).show() } } } diff --git a/app/src/main/java/com/navinfo/omqs/ui/widget/SignUtil.kt b/app/src/main/java/com/navinfo/omqs/ui/widget/SignUtil.kt index f0b50afc..08482f52 100644 --- a/app/src/main/java/com/navinfo/omqs/ui/widget/SignUtil.kt +++ b/app/src/main/java/com/navinfo/omqs/ui/widget/SignUtil.kt @@ -28,6 +28,10 @@ class SignUtil { 2010 -> getRoadDirectionText(data) //常规线限速 2019 -> getLineSpeedLimitText(data) + //全封闭 + 2022 -> getConAccessText(data) + //匝道 + 2037 -> getRampText(data) //车道数 2041 -> getLaneNumText(data) //常规点限速,条件点限速 @@ -43,6 +47,45 @@ class SignUtil { return "${data.properties["maxSpeed"]}" } + /** + * 获取全封闭值 + */ + private fun getConAccessText(data: RenderEntity): String { + val conAccess = data.properties["conAccess"] + try { + if (conAccess?.toInt() == 1) + return "是" + } catch (e: Throwable) { + + } + return "" + } + + /** + * 获取匝道值 + */ + private fun getRampText(data: RenderEntity): String { + try { + val ramp = data.properties["formOfWay"] + return when (ramp?.toInt()) { + 93 -> "普通匝" + 98 -> "高入匝" + 99 -> "高出匝" + 100 -> "高连匝" + 102 -> "直入匝" + 103 -> "直出匝" + 104 -> "出入匝" + + else -> { + "" + } + } + } catch (e: Throwable) { + + } + return "" + } + /** *获取道路功能等级文字 */ @@ -86,6 +129,10 @@ class SignUtil { 2013 -> "车道边界类型" //常规线限速 2019 -> "线限速" + //全封闭 + 2022 -> "全封闭" + //匝道 + 2037 -> "匝道" //车道数 2041 -> "车道数" //常规点限速 diff --git a/vtm b/vtm index c1234a9f..bd83adb7 160000 --- a/vtm +++ b/vtm @@ -1 +1 @@ -Subproject commit c1234a9fd22d69d83eb50bdaa8eda6a56247dc94 +Subproject commit bd83adb7df464686b3f19e8a08aeef2cb49f5c17