diff --git a/app/src/main/java/com/navinfo/omqs/hilt/ActivityModule.kt b/app/src/main/java/com/navinfo/omqs/hilt/ActivityModule.kt index 5c0829ef..305d50a5 100644 --- a/app/src/main/java/com/navinfo/omqs/hilt/ActivityModule.kt +++ b/app/src/main/java/com/navinfo/omqs/hilt/ActivityModule.kt @@ -1,6 +1,5 @@ package com.navinfo.omqs.hilt -import android.content.Context import com.navinfo.collect.library.map.NIMapController import com.navinfo.omqs.db.RealmOperateHelper import com.navinfo.omqs.db.RoomAppDatabase @@ -12,7 +11,6 @@ import dagger.Module import dagger.Provides import dagger.hilt.InstallIn import dagger.hilt.android.components.ActivityRetainedComponent -import dagger.hilt.android.qualifiers.ActivityContext import dagger.hilt.android.scopes.ActivityRetainedScoped @InstallIn(ActivityRetainedComponent::class) diff --git a/app/src/main/java/com/navinfo/omqs/ui/widget/SignUtil.kt b/app/src/main/java/com/navinfo/omqs/ui/widget/SignUtil.kt index 5be587b3..265b9c8d 100644 --- a/app/src/main/java/com/navinfo/omqs/ui/widget/SignUtil.kt +++ b/app/src/main/java/com/navinfo/omqs/ui/widget/SignUtil.kt @@ -13,7 +13,7 @@ class SignUtil { fun getSignIconText(data: RenderEntity): String { return when (data.code) { //常规点限速 - 4002 -> getSpeedLimitText(data) + 4002, 4003 -> getSpeedLimitText(data) // //道路种别 // 2008 -> getKindCodeIcon(data) // //道路方向 @@ -63,13 +63,13 @@ class SignUtil { try { //限速标志 0 限速开始 1 限速解除 return when (data.properties["speed_flag"]) { - "1" -> return R.drawable.shape_icon_speed_limit_off - else -> return R.drawable.shape_icon_speed_limit + "1" -> return R.drawable.icon_speed_limit_off + else -> return R.drawable.icon_speed_limit } } catch (e: Exception) { Log.e("jingo", "获取限速面板ICON出错2 $e") } - return R.drawable.shape_icon_speed_limit + return R.drawable.icon_speed_limit } /** @@ -85,8 +85,10 @@ class SignUtil { //车道数 2041 -> getLaneNumIcon(data) //限速 - 4002 -> getSpeedLimitIcon(data) - else -> R.drawable.shape_icon_speed_limit + 4002, 4003 -> getSpeedLimitIcon(data) + //可变点限速 + 4004 -> R.drawable.icon_change_limit + else -> R.drawable.icon_speed_limit } } diff --git a/app/src/main/res/drawable-xxhdpi/icon_change_limit.png b/app/src/main/res/drawable-xxhdpi/icon_change_limit.png new file mode 100644 index 00000000..0719bf51 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/icon_change_limit.png differ diff --git a/app/src/main/res/drawable-xxhdpi/icon_speed_limit.png b/app/src/main/res/drawable-xxhdpi/icon_speed_limit.png new file mode 100644 index 00000000..e806e57b Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/icon_speed_limit.png differ diff --git a/app/src/main/res/drawable-xxhdpi/icon_speed_limit_off.png b/app/src/main/res/drawable-xxhdpi/icon_speed_limit_off.png new file mode 100644 index 00000000..59c526c7 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/icon_speed_limit_off.png differ diff --git a/app/src/main/res/drawable/shape_icon_speed_limit.xml b/app/src/main/res/drawable/shape_icon_speed_limit.xml deleted file mode 100644 index e6ac7102..00000000 --- a/app/src/main/res/drawable/shape_icon_speed_limit.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_icon_speed_limit_off.xml b/app/src/main/res/drawable/shape_icon_speed_limit_off.xml deleted file mode 100644 index 2811d192..00000000 --- a/app/src/main/res/drawable/shape_icon_speed_limit_off.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - \ No newline at end of file