xiaoyan159/OneMapQS
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS

Browse Source
This commit is contained in:
xiaoyan 2023-09-28 10:13:10 +08:00
commit f81e01309d
10 changed files with 192 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/navinfo/omqs/db/ImportOMDBHelper.kt
View File

@ -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",

2
app/src/main/java/com/navinfo/omqs/db/ImportPreProcess.kt
View File

@ -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

9
app/src/main/java/com/navinfo/omqs/ui/activity/map/MainActivity.kt
View File

@ -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)
}
}

3
app/src/main/java/com/navinfo/omqs/ui/widget/TextProgressButtonBar.kt
View File

@ -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) {

170
app/src/main/java/com/navinfo/omqs/util/SignUtil.kt
View File

@ -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()

20
collect-library/src/main/assets/editormarker.xml
View File

@ -1622,15 +1622,21 @@
<!-- 道路边界类型 -->
<m v="OMDB_RDBOUND_BOUNDARYTYPE">
<outline-layer id="boundaryType" stroke="#8e44ad" width="0.1" />
<m k="boundaryType" v="2|6|8">
<!--护栏-->
<m k="boundaryType" v="4">
<line stroke="#FFBC6E" use="boundaryType" width="0.1"/>
<symbol repeat-gap="12" repeat="true" repeat-start="0" src="assets:omdb/icon_2013_4.svg" symbol-width="16" symbol-height="46"></symbol>
</m>
<!--路牙-->
<m k="boundaryType" v="3">
<symbol repeat="true" repeat-gap="10" repeat-start="0" src="assets:omdb/icon_2013_3.svg" symbol-width="16" symbol-height="10"></symbol>
</m>
<m k="boundaryType" v="2|6">
<line stroke="#ffffff" use="boundaryType" width="0.1"/>
</m>
<!-- <m k="boundaryType" v="0|2|3|4|5|6|7|8|9">
<line stroke="#ffffff" use="boundaryType" width="0.1"/>
</m>-->
<m k="boundaryType" v="1">
<!--无标线无可区分边界-->
<line dasharray="2,2" repeat-start="0" stroke="#ffffff" width="0.2"/>
<m k="boundaryType" v="8">
<line stroke="#FFBC6E" use="boundaryType" width="0.1"/>
<symbol repeat-gap="12" repeat="true" repeat-start="0" src="assets:omdb/icon_2083_8.svg" symbol-width="24" symbol-height="32"></symbol>
</m>
</m>

1
collect-library/src/main/assets/omdb/icon_2083_8.svg Normal file
View File

@ -0,0 +1 @@
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1695778478511" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="11568" xmlns:xlink="http://www.w3.org/1999/xlink" width="64" height="64"><path d="M773.504 615.189333S771.157333 597.333333 746.688 597.333333h-79.338667c17.024 56.981333 31.936 109.546667 31.936 112.618667 0 50.922667-72.554667 72.384-190.229333 72.384-117.653333 0-184.554667-20.053333-184.554667-70.954667 0-3.562667 21.290667-57.429333 38.208-114.048h-86.677333c-17.194667 0-19.989333 15.978667-19.989333 15.978667L174.058667 874.368 188.053333 896h653.909334l8.021333-21.632-76.48-259.178667z" fill="#e54031" p-id="11569" data-spm-anchor-id="a313x.search_index.0.i15.29a03a81xPIsNv" class="selected"></path><path d="M512.021333 128c-21.952 0-39.765333 3.818667-39.765333 8.490667-10.496 31.637333-173.269333 557.717333-173.269333 571.178666 0 50.944 95.381333 81.642667 213.013333 81.642667s213.034667-30.698667 213.034667-81.642667c0-11.712-162.432-539.050667-173.269334-571.178666 0.021333-4.672-17.770667-8.490667-39.744-8.490667z" fill="#ffffff" p-id="11570" data-spm-anchor-id="a313x.search_index.0.i13.29a03a81xPIsNv" class=""></path><path d="M708.181333 649.536C683.349333 687.616 604.608 725.333333 512.981333 725.333333c-92.586667 0-173.994667-36.181333-197.994666-74.88-10.645333 31.637333-19.029333 56.469333-19.029334 69.973334 0 50.901333 96.704 90.218667 216.064 90.218666s216.128-39.338667 216.128-90.218666c0-11.690667-8.938667-38.72-19.968-70.890667zM669.589333 518.698667l-44.245333-144.938667s-39.616 31.552-113.301333 31.552c-73.664 0-113.408-31.552-113.408-31.552l-44.394667 145.194667S398.357333 576 512.042667 576c114.624 0 157.546667-57.301333 157.546666-57.301333zM581.141333 230.592l-29.354666-94.08s-1.770667-8.490667-39.765334-8.490667c-39.338667 0-39.765333 8.490667-39.765333 8.490667l-29.354667 94.016S461.781333 256 512 256c50.24 0 69.141333-25.408 69.141333-25.408z" fill="#e54031" p-id="11571" data-spm-anchor-id="a313x.search_index.0.i12.29a03a81xPIsNv" class="selected"></path></svg>
Side by Side

After

Width:  |  Height:  |  Size: 2.1 KiB

1
collect-library/src/main/assets/omdb/icon_2083_81.svg Normal file
View File

File diff suppressed because one or more lines are too long
Side by Side

After

Width:  |  Height:  |  Size: 108 KiB

BIN
collect-library/src/main/assets/omdb/icon_5001_1.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.7 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

2
collect-library/src/main/java/com/navinfo/collect/library/enums/DataCodeEnum.kt
View File

@ -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"),