diff --git a/app/src/main/assets/omdb_config.json b/app/src/main/assets/omdb_config.json index c4b09ded..e4b50264 100644 --- a/app/src/main/assets/omdb_config.json +++ b/app/src/main/assets/omdb_config.json @@ -220,6 +220,7 @@ "zoomMin": 18, "zoomMax": 20, "is3D": true, + "catch":true, "transformer": [ { "k": "geometry", diff --git a/app/src/main/java/com/navinfo/omqs/ui/fragment/signMoreInfo/SignMoreInfoFragment.kt b/app/src/main/java/com/navinfo/omqs/ui/fragment/signMoreInfo/SignMoreInfoFragment.kt index 54de09fa..7f571e70 100644 --- a/app/src/main/java/com/navinfo/omqs/ui/fragment/signMoreInfo/SignMoreInfoFragment.kt +++ b/app/src/main/java/com/navinfo/omqs/ui/fragment/signMoreInfo/SignMoreInfoFragment.kt @@ -96,6 +96,12 @@ class SignMoreInfoFragment : BaseFragment() { binding.signInfoRecyclerview.adapter = adapter adapter.refreshData(SignUtil.getElectronicEyeMoreInfo(it)) } + //交通标牌 + DataCodeEnum.OMDB_TRAFFIC_SIGN.code -> { + val adapter = TwoItemAdapter() + binding.signInfoRecyclerview.adapter = adapter + adapter.refreshData(SignUtil.getTrafficSignMoreInfo(it)) + } else -> { val adapter = SignUtil.getMoreInfoAdapter(it) binding.signInfoRecyclerview.adapter = adapter 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 47bf4c38..6e66e316 100644 --- a/app/src/main/java/com/navinfo/omqs/util/SignUtil.kt +++ b/app/src/main/java/com/navinfo/omqs/util/SignUtil.kt @@ -1596,7 +1596,54 @@ class SignUtil { return list } + /** + * 获取交通标牌详细信息 + */ + fun getTrafficSignMoreInfo(renderEntity: RenderEntity): List { + val list = mutableListOf() + val trafsignShape = when (renderEntity.properties["trafsignShape"]) { + "1" -> "不规则形状" + "2" -> "长方形" + "3" -> "三角形" + "4" -> "圆形" + "5" -> "菱形" + "6" -> "到三角形" + "7" -> "正方形" + "8" -> "八角形" + else -> "" + } + if (trafsignShape != "") { + list.add( + TwoItemAdapterItem( + title = "形状", text = trafsignShape + ) + ) + } + + val color = when (renderEntity.properties["color"]) { + "0" -> "未验证" + "1" -> "白色" + "2" -> "黄色" + "3" -> "红色" + "5" -> "棕色" + "6" -> "蓝色" + "7" -> "绿色" + "8" -> "黑色" + "9" -> "其他" + else -> "" + } + list.add( + TwoItemAdapterItem( + title = "颜色", text = color + ) + ) + list.add( + TwoItemAdapterItem( + title = "正北夹角", text = "${renderEntity.properties["heading"]}" + ) + ) + return list + } } - } \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/appendix/1105_00101_0_12.svg b/collect-library/src/main/assets/omdb/appendix/1105_00101_0_12.svg new file mode 100644 index 00000000..ca783581 --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_00101_0_12.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/appendix/1105_00101_0_13.svg b/collect-library/src/main/assets/omdb/appendix/1105_00101_0_13.svg new file mode 100644 index 00000000..81ab8b1d --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_00101_0_13.svg @@ -0,0 +1 @@ + \ No newline at end of file