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 f15e23d8..cc167be2 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 @@ -356,6 +356,11 @@ class MainActivity : BaseActivity() { lifecycleScope.launch{ delay(100) + + val bundle = Bundle() + bundle.putParcelable("SignBean", it) + bundle.putBoolean("AutoSave", false) + rightController.navigate(R.id.EvaluationResultFragment, bundle) val fragment = supportFragmentManager.findFragmentById(R.id.main_activity_sign_more_info_fragment) if (fragment == null) { @@ -365,10 +370,6 @@ class MainActivity : BaseActivity() { }else{ supportFragmentManager.beginTransaction().add(R.id.main_activity_sign_more_info_fragment, SignMoreInfoFragment()).commit() } - val bundle = Bundle() - bundle.putParcelable("SignBean", it) - bundle.putBoolean("AutoSave", false) - rightController.navigate(R.id.EvaluationResultFragment, bundle) } } 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 705c7fce..1aefbd52 100644 --- a/app/src/main/java/com/navinfo/omqs/util/SignUtil.kt +++ b/app/src/main/java/com/navinfo/omqs/util/SignUtil.kt @@ -568,6 +568,7 @@ class SignUtil { ) ) } + //符号 DataCodeEnum.OMDB_OBJECT_SYMBOL.code -> { list.add( TwoItemAdapterItem( @@ -614,6 +615,98 @@ class SignUtil { ) ) } + //杆状物 + DataCodeEnum.OMDB_POLE.code ->{ + list.add( + TwoItemAdapterItem( + title = "对象号码", + text = "${data.properties["objectPid"]}" + ) + ) + list.add( + TwoItemAdapterItem( + title = "类型", + text = when (data.properties["poleType"]) { + "1" -> "其他" + "2" -> "树干" + else -> "" + } + ) + ) + list.add( + TwoItemAdapterItem( + title = "顶面直径", + text = "${data.properties["diameterTop"]}" + ) + ) + list.add( + TwoItemAdapterItem( + title = "底面直径", + text = "${data.properties["diameterBottom"]}" + ) + ) + list.add( + TwoItemAdapterItem( + title = "符合高精", text = when (data.properties["compliant"]) { + "0" -> "否" + "1" -> "是" + else -> "" + } + ) + ) + list.add( + TwoItemAdapterItem( + title = "车道组", text = "${data.properties["lgList"]}" + ) + ) + } + //箭头 + DataCodeEnum.OMDB_OBJECT_ARROW.code ->{ + list.add( + TwoItemAdapterItem( + title = "对象号码", + text = "${data.properties["objectPid"]}" + ) + ) + list.add( + TwoItemAdapterItem( + title = "颜色", + text = when (data.properties["color"]) { + "0" -> "未验证" + "1" -> "白色" + "2" -> "黄色" + "3" -> "红色" + "4" -> "彩色" + "9" -> "其他" + else -> "" + } + ) + ) + list.add( + TwoItemAdapterItem( + title = "符合高精", text = when (data.properties["compliant"]) { + "0" -> "否" + "1" -> "是" + else -> "" + } + ) + ) + list.add( + TwoItemAdapterItem( + title = "关联车道中心线", text = "${data.properties["laneLinkPid"]}" + ) + ) + list.add( + TwoItemAdapterItem( + title = "长度", text = "${data.properties["length"]}mm" + ) + ) + list.add( + TwoItemAdapterItem( + title = "宽度", text = "${data.properties["width"]}mm" + ) + ) + } } adapter.data = list return adapter diff --git a/vtm b/vtm index 271e7b22..c046e788 160000 --- a/vtm +++ b/vtm @@ -1 +1 @@ -Subproject commit 271e7b22785b0570a34c50476e17a98dfcca7e71 +Subproject commit c046e788f5c739612a31c308639fca2de639669a