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

 Conflicts:
	app/src/main/java/com/navinfo/omqs/ui/activity/map/MainViewModel.kt
	app/src/main/java/com/navinfo/omqs/ui/fragment/tasklist/TaskViewModel.kt
This commit is contained in:
squallzhjch
2023-07-14 16:32:39 +08:00
29 changed files with 700 additions and 210 deletions

View File

@@ -45,7 +45,7 @@ class SignUtil {
*获取道路功能等级文字
*/
private fun getLinkFunctionClassText(data: RenderEntity): String {
return "等级${data.properties["functionClass"]}"
return "FC${data.properties["functionClass"]}"
}
/**
@@ -55,9 +55,9 @@ class SignUtil {
val direct = data.properties["direct"]
when (direct?.toInt()) {
0 -> return "不应用"
1 -> return "方向"
2 -> return "方向"
3 -> return "方向"
1 -> return ""
2 -> return ""
3 -> return ""
}
return ""
}