From 51b021ba5966f549d80a56e2f4a5e2a0b38259dd Mon Sep 17 00:00:00 2001 From: squallzhjch Date: Wed, 27 Sep 2023 11:00:25 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=8A=E6=96=B9?= =?UTF-8?q?=E9=9A=9C=E7=A2=8D=E7=89=A9=EF=BC=8C=E7=AC=A6=E5=8F=B7=EF=BC=8C?= =?UTF-8?q?=E8=B7=AF=E5=8F=A3=E5=86=85=E4=BA=A4=E9=80=9A=E5=B2=9B=20?= =?UTF-8?q?=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../signMoreInfo/SignMoreInfoFragment.kt | 2 +- .../java/com/navinfo/omqs/util/SignUtil.kt | 77 ++++++++++++++++++- .../collect/library/enums/DataCodeEnum.kt | 2 + 3 files changed, 76 insertions(+), 5 deletions(-) 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 2ecf8477..37023521 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 @@ -101,7 +101,7 @@ class SignMoreInfoFragment : BaseFragment() { DataCodeEnum.OMDB_TRAFFIC_SIGN.code -> { val adapter = TwoItemAdapter() binding.signInfoRecyclerview.adapter = adapter - adapter.refreshData(SignUtil.getTrafficSignMoreInfo(it)) + adapter.refreshData(SignUtil.getTrafficSignMoreInfo(it.renderEntity)) } else -> { val adapter = SignUtil.getMoreInfoAdapter(it.renderEntity) 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 ebe4a882..705c7fce 100644 --- a/app/src/main/java/com/navinfo/omqs/util/SignUtil.kt +++ b/app/src/main/java/com/navinfo/omqs/util/SignUtil.kt @@ -1,7 +1,6 @@ package com.navinfo.omqs.util import android.util.Log -import androidx.lifecycle.lifecycleScope import com.navinfo.collect.library.data.entity.RenderEntity import com.navinfo.collect.library.enums.DataCodeEnum import com.navinfo.collect.library.utils.FootAndDistance @@ -17,7 +16,6 @@ import com.navinfo.omqs.ui.fragment.signMoreInfo.TwoItemAdapterItem import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch -import kotlinx.coroutines.withContext import org.json.JSONArray import org.json.JSONObject import org.locationtech.jts.geom.Geometry @@ -432,6 +430,7 @@ class SignUtil { ) ) } + //停止位置 DataCodeEnum.OMDB_OBJECT_STOPLOCATION.code -> { list.add( TwoItemAdapterItem( @@ -501,6 +500,7 @@ class SignUtil { ) ) } + //文字 DataCodeEnum.OMDB_OBJECT_TEXT.code -> { list.add( TwoItemAdapterItem( @@ -545,7 +545,75 @@ class SignUtil { ) ) } - + //上方障碍物 + DataCodeEnum.OMDB_OBJECT_OH_STRUCT.code -> { + list.add( + TwoItemAdapterItem( + title = "对象号码", + text = "${data.properties["objectPid"]}" + ) + ) + list.add( + TwoItemAdapterItem( + title = "符合高精", text = when (data.properties["compliant"]) { + "0" -> "否" + "1" -> "是" + else -> "" + } + ) + ) + list.add( + TwoItemAdapterItem( + title = "车道组", text = "${data.properties["lgId"]}" + ) + ) + } + DataCodeEnum.OMDB_OBJECT_SYMBOL.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 @@ -838,7 +906,8 @@ class SignUtil { val job = scope.launch(Dispatchers.IO) { val typeCode = data.properties["typeCode"] if (typeCode != null) { - describe = roomAppDatabase.getScWarningCodeDao().findScWarningDescribe(typeCode).toString() + describe = roomAppDatabase.getScWarningCodeDao() + .findScWarningDescribe(typeCode).toString() } } job.join() diff --git a/collect-library/src/main/java/com/navinfo/collect/library/enums/DataCodeEnum.kt b/collect-library/src/main/java/com/navinfo/collect/library/enums/DataCodeEnum.kt index c7362231..3a3b4f1d 100644 --- a/collect-library/src/main/java/com/navinfo/collect/library/enums/DataCodeEnum.kt +++ b/collect-library/src/main/java/com/navinfo/collect/library/enums/DataCodeEnum.kt @@ -57,6 +57,7 @@ enum class DataCodeEnum(var tableName: String, var code: String) { OMDB_LINK_FORM2_11("风景路线", "2206-11"), OMDB_LINK_FORM2_12("车辆测试路段", "2206-12"), OMDB_LINK_FORM2_13("驾照考试路段", "2206-13"), + OMDB_OBJECT_OH_STRUCT("上方障碍物","3001"), OMDB_OBJECT_TEXT("文字", "3002"), OMDB_OBJECT_SYMBOL("符号", "3003"), OMDB_OBJECT_ARROW("箭头", "3004"), @@ -65,6 +66,7 @@ enum class DataCodeEnum(var tableName: String, var code: String) { OMDB_FILL_AREA("导流区", "3012"), OMDB_CROSS_WALK("人行横道", "3014"), OMDB_OBJECT_STOPLOCATION("停止位置", "3016"), + OMDB_OBJECT_REFUGE_ISLAND("路口内交通岛","3027"), OMDB_INTERSECTION("路口", "4001"), OMDB_SPEEDLIMIT("常规点限速", "4002"), OMDB_SPEEDLIMIT_COND("条件点限速", "4003"), From 4a84dcc9fba1ff650eb873322c57c039d20b5dbb Mon Sep 17 00:00:00 2001 From: squallzhjch Date: Wed, 27 Sep 2023 14:48:49 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BC=98=E5=8C=96UI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/navinfo/omqs/ui/widget/TextProgressButtonBar.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/navinfo/omqs/ui/widget/TextProgressButtonBar.kt b/app/src/main/java/com/navinfo/omqs/ui/widget/TextProgressButtonBar.kt index d74c6580..228a9650 100644 --- a/app/src/main/java/com/navinfo/omqs/ui/widget/TextProgressButtonBar.kt +++ b/app/src/main/java/com/navinfo/omqs/ui/widget/TextProgressButtonBar.kt @@ -29,7 +29,7 @@ class TextProgressButtonBar : View { private var backgroundcolor = 0 private var text: String? = null private var max = 100 - private val corner = 30 // 圆角的弧度 + private val corner = 15 // 圆角的弧度 private val mStartColor = resources.getColor(R.color.default_button_blue_color) private val mEndColor = resources.getColor(R.color.ripple_end_color) private val mValueAnimator = ValueAnimator.ofInt( @@ -109,6 +109,7 @@ class TextProgressButtonBar : View { canvas.drawRoundRect(oval, corner.toFloat(), corner.toFloat(), it) it.style = Paint.Style.FILL it.color = this.backgroundcolor + oval = RectF(1F, 1F, width.toFloat()-1, height.toFloat()-1) canvas.drawRoundRect(oval, corner.toFloat(), corner.toFloat(), it) if (progress <= corner) { From 7b603e6af3cb2b08dc7ccccf9f2615d3a0ab38b6 Mon Sep 17 00:00:00 2001 From: qiji4215 Date: Wed, 27 Sep 2023 16:20:58 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=81=93=E8=B7=AF?= =?UTF-8?q?=E8=BE=B9=E7=95=8C=E7=B1=BB=E5=9E=8B=E8=B7=AF=E7=89=99=E3=80=81?= =?UTF-8?q?=E6=8A=A4=E6=A0=8F=E6=B8=B2=E6=9F=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/navinfo/omqs/db/ImportOMDBHelper.kt | 2 +- .../com/navinfo/omqs/db/ImportPreProcess.kt | 2 +- .../src/main/assets/editormarker.xml | 20 ++++++++++++------ .../src/main/assets/omdb/icon_2083_8.svg | 1 + .../src/main/assets/omdb/icon_2083_81.svg | 1 + .../src/main/assets/omdb/icon_5001_1.png | Bin 3755 -> 1264 bytes 6 files changed, 17 insertions(+), 9 deletions(-) create mode 100644 collect-library/src/main/assets/omdb/icon_2083_8.svg create mode 100644 collect-library/src/main/assets/omdb/icon_2083_81.svg 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 ea4befcf..f1a83914 100644 --- a/app/src/main/java/com/navinfo/omqs/db/ImportOMDBHelper.kt +++ b/app/src/main/java/com/navinfo/omqs/db/ImportOMDBHelper.kt @@ -346,7 +346,7 @@ class ImportOMDBHelper @AssistedInject constructor( renderEntity.properties["boundaryType"] if (boundaryType != null) { when (boundaryType.toInt()) { - 0, 3, 4, 5, 7, 9 -> { + 0, 1, 5, 7, 9 -> { renderEntity.enable = 0 Log.e( "qj", diff --git a/app/src/main/java/com/navinfo/omqs/db/ImportPreProcess.kt b/app/src/main/java/com/navinfo/omqs/db/ImportPreProcess.kt index 8c2a6b53..487b62af 100644 --- a/app/src/main/java/com/navinfo/omqs/db/ImportPreProcess.kt +++ b/app/src/main/java/com/navinfo/omqs/db/ImportPreProcess.kt @@ -582,7 +582,7 @@ class ImportPreProcess { angleReference.renderEntityId = renderEntity.id angleReference.name = "${renderEntity.name}车道中线面" angleReference.table = renderEntity.table - angleReference.geometry = GeometryTools.computeLine(0.00002,0.00002,renderEntity.geometry) + angleReference.geometry = GeometryTools.computeLine(0.00003,0.00003,renderEntity.geometry) angleReference.properties["qi_table"] = renderEntity.table angleReference.properties["widthProperties"] = "3" angleReference.zoomMin = renderEntity.zoomMin diff --git a/collect-library/src/main/assets/editormarker.xml b/collect-library/src/main/assets/editormarker.xml index 8ac29097..d0a5f0c6 100644 --- a/collect-library/src/main/assets/editormarker.xml +++ b/collect-library/src/main/assets/editormarker.xml @@ -1622,15 +1622,21 @@ - + + + + + + + + + + - - - - + + + diff --git a/collect-library/src/main/assets/omdb/icon_2083_8.svg b/collect-library/src/main/assets/omdb/icon_2083_8.svg new file mode 100644 index 00000000..a5e7bda8 --- /dev/null +++ b/collect-library/src/main/assets/omdb/icon_2083_8.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/icon_2083_81.svg b/collect-library/src/main/assets/omdb/icon_2083_81.svg new file mode 100644 index 00000000..d23d1847 --- /dev/null +++ b/collect-library/src/main/assets/omdb/icon_2083_81.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/icon_5001_1.png b/collect-library/src/main/assets/omdb/icon_5001_1.png index 1bf39a45b3b0c601e3a93ba421936490f97b8839..74e11ad6a42ea1de16c44eb7de85d500a6180dee 100644 GIT binary patch delta 431 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 Date: Thu, 28 Sep 2023 10:12:21 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=AC=A6=E5=8F=B7?= =?UTF-8?q?=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../omqs/ui/activity/map/MainActivity.kt | 9 +- .../java/com/navinfo/omqs/util/SignUtil.kt | 93 +++++++++++++++++++ vtm | 2 +- 3 files changed, 99 insertions(+), 5 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 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