Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS
Conflicts: vtm
This commit is contained in:
qiji4215
commit
7c0375c211
@ -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)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -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) {
|
||||
|
||||
@ -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()
|
||||
|
||||
@ -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>
|
||||
|
||||
|
||||
@ -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"),
|
||||
|
||||
@ -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;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user