1、优化地图主页布局,适配2560尺寸

2、优化右侧面板UI
3、修改评测任务列表UI
4、增加当前任务UI及相关功能
This commit is contained in:
squallzhjch
2023-05-18 17:17:08 +08:00
parent a13e1f660d
commit 4749bc66cd
226 changed files with 1789 additions and 1545 deletions

View File

@@ -63,13 +63,13 @@ class SignUtil {
try {
//限速标志 0 限速开始 1 限速解除
return when (data.properties["speed_flag"]) {
"1" -> return R.drawable.icon_speed_limit_off
else -> return R.drawable.icon_speed_limit
"1" -> return R.drawable.shape_icon_speed_limit_off
else -> return R.drawable.shape_icon_speed_limit
}
} catch (e: Exception) {
Log.e("jingo", "获取限速面板ICON出错2 $e")
}
return R.drawable.icon_speed_limit
return R.drawable.shape_icon_speed_limit
}
/**
@@ -86,7 +86,7 @@ class SignUtil {
2041 -> getLaneNumIcon(data)
//限速
4002 -> getSpeedLimitIcon(data)
else -> R.drawable.icon_speed_limit
else -> R.drawable.shape_icon_speed_limit
}
}
@@ -99,24 +99,24 @@ class SignUtil {
try {
val kind = data.properties["kind"]
return when (kind!!.toInt()) {
1 -> R.mipmap.icon_kind_code_k1
2 -> R.mipmap.icon_kind_code_k2
3 -> R.mipmap.icon_kind_code_k3
4 -> R.mipmap.icon_kind_code_k4
6 -> R.mipmap.icon_kind_code_k6
7 -> R.mipmap.icon_kind_code_k7
8 -> R.mipmap.icon_kind_code_k8
9 -> R.mipmap.icon_kind_code_k9
10 -> R.mipmap.icon_kind_code_k10
11 -> R.mipmap.icon_kind_code_k11
13 -> R.mipmap.icon_kind_code_k13
15 -> R.mipmap.icon_kind_code_k15
else -> R.mipmap.icon_kind_code
1 -> R.drawable.icon_kind_code_k1
2 -> R.drawable.icon_kind_code_k2
3 -> R.drawable.icon_kind_code_k3
4 -> R.drawable.icon_kind_code_k4
6 -> R.drawable.icon_kind_code_k6
7 -> R.drawable.icon_kind_code_k7
8 -> R.drawable.icon_kind_code_k8
9 -> R.drawable.icon_kind_code_k9
10 -> R.drawable.icon_kind_code_k10
11 -> R.drawable.icon_kind_code_k11
13 -> R.drawable.icon_kind_code_k13
15 -> R.drawable.icon_kind_code_k15
else -> R.drawable.icon_kind_code
}
} catch (e: Exception) {
Log.e("jingo", "获取种别面板ICON出错 $e")
}
return R.mipmap.icon_kind_code
return R.drawable.icon_kind_code
}
/**
@@ -126,41 +126,41 @@ class SignUtil {
try {
val lineNum = data.properties["laneNum"]
return when (lineNum!!.toInt()) {
1 -> R.mipmap.icon_lane_num1
2 -> R.mipmap.icon_lane_num2
3 -> R.mipmap.icon_lane_num3
4 -> R.mipmap.icon_lane_num4
5 -> R.mipmap.icon_lane_num5
6 -> R.mipmap.icon_lane_num6
7 -> R.mipmap.icon_lane_num7
8 -> R.mipmap.icon_lane_num8
9 -> R.mipmap.icon_lane_num9
10 -> R.mipmap.icon_lane_num10
11 -> R.mipmap.icon_lane_num11
12 -> R.mipmap.icon_lane_num12
else -> R.mipmap.icon_lane_num1
1 -> R.drawable.icon_lane_num1
2 -> R.drawable.icon_lane_num2
3 -> R.drawable.icon_lane_num3
4 -> R.drawable.icon_lane_num4
5 -> R.drawable.icon_lane_num5
6 -> R.drawable.icon_lane_num6
7 -> R.drawable.icon_lane_num7
8 -> R.drawable.icon_lane_num8
9 -> R.drawable.icon_lane_num9
10 -> R.drawable.icon_lane_num10
11 -> R.drawable.icon_lane_num11
12 -> R.drawable.icon_lane_num12
else -> R.drawable.icon_lane_num1
}
} catch (e: Exception) {
Log.e("jingo", "获取车道数面板ICON出错 $e")
}
return R.mipmap.icon_road_direction
return R.drawable.icon_road_direction
}
fun getRoadDirection(data: RenderEntity): Int {
try {
val direct = data.properties["direct"]
return when (direct!!.toInt()) {
0 -> R.mipmap.icon_road_direction
1 -> R.mipmap.icon_road_direction
2 -> R.mipmap.icon_road_direction
3 -> R.mipmap.icon_road_direction
-99 -> R.mipmap.icon_road_direction
else -> R.mipmap.icon_road_direction
0 -> R.drawable.icon_road_direction
1 -> R.drawable.icon_road_direction
2 -> R.drawable.icon_road_direction
3 -> R.drawable.icon_road_direction
-99 -> R.drawable.icon_road_direction
else -> R.drawable.icon_road_direction
}
} catch (e: Exception) {
Log.e("jingo", "获取道路方向面板ICON出错 $e")
}
return R.mipmap.icon_road_direction
return R.drawable.icon_road_direction
}
}
}