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 af8ba850..d4996311 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/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/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) { 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..1aefbd52 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,168 @@ 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" + ) + ) + } + //杆状物 + 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 @@ -838,7 +999,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/assets/editormarker.xml b/collect-library/src/main/assets/editormarker.xml index ad6eafc6..62746515 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 1bf39a45..74e11ad6 100644 Binary files a/collect-library/src/main/assets/omdb/icon_5001_1.png and b/collect-library/src/main/assets/omdb/icon_5001_1.png differ 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"),