From 51b021ba5966f549d80a56e2f4a5e2a0b38259dd Mon Sep 17 00:00:00 2001
From: squallzhjch <zhangjingchao@navinfo.com>
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 <zhangjingchao@navinfo.com>
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 a92dc071d211be8790404cca824bd6ccd16876e4 Mon Sep 17 00:00:00 2001
From: squallzhjch <zhangjingchao@navinfo.com>
Date: Thu, 28 Sep 2023 10:12:21 +0800
Subject: [PATCH 3/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
From dffd44da0db67e7fb76676006c5d05bca1c22185 Mon Sep 17 00:00:00 2001
From: xiaoyan <xiaoyan159@163.com>
Date: Thu, 28 Sep 2023 10:12:37 +0800
Subject: [PATCH 4/4] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E6=9C=80=E5=A4=A7?=
=?UTF-8?q?=E7=BA=A7=E5=88=AB=E4=B8=BA20=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
collect-library/src/main/assets/editormarker.xml | 2 +-
.../main/java/com/navinfo/collect/library/system/Constant.java | 2 +-
vtm | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/collect-library/src/main/assets/editormarker.xml b/collect-library/src/main/assets/editormarker.xml
index 781a6268..ad6eafc6 100644
--- a/collect-library/src/main/assets/editormarker.xml
+++ b/collect-library/src/main/assets/editormarker.xml
@@ -1510,7 +1510,7 @@
<line outline="kind0" use="trunk" fix="true" width="2.6"/>
</m>
- <m k="kind" v="4">width="0.4"
+ <m k="kind" v="4">
<line outline="kind0" use="primary:z11" fix="true" width="2.2"/>
</m>
diff --git a/collect-library/src/main/java/com/navinfo/collect/library/system/Constant.java b/collect-library/src/main/java/com/navinfo/collect/library/system/Constant.java
index 764f6f71..e0d8e464 100644
--- a/collect-library/src/main/java/com/navinfo/collect/library/system/Constant.java
+++ b/collect-library/src/main/java/com/navinfo/collect/library/system/Constant.java
@@ -28,7 +28,7 @@ public class Constant {
public static String[] HAD_LAYER_INVISIABLE_ARRAY;
// 渲染引擎开始切割的级别
public static final int OVER_ZOOM = 18;
- public static final int MAX_ZOOM = 22;
+ public static final int MAX_ZOOM = 20;
// 数据保存时的zoom
public static final int DATA_ZOOM = 23;
public static final int OMDB_MIN_ZOOM = 15;
diff --git a/vtm b/vtm
index 271e7b22..c046e788 160000
--- a/vtm
+++ b/vtm
@@ -1 +1 @@
-Subproject commit 271e7b22785b0570a34c50476e17a98dfcca7e71
+Subproject commit c046e788f5c739612a31c308639fca2de639669a