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

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)

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
+                    "1" -> return R.drawable.icon_speed_limit_off
-                    else -> return R.drawable.shape_icon_speed_limit
+                    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)
+                4002, 4003 -> getSpeedLimitIcon(data)
-                else -> R.drawable.shape_icon_speed_limit
+                //可变点限速
+                4004 -> R.drawable.icon_change_limit
+                else -> R.drawable.icon_speed_limit
             }
 
         }

app/src/main/res/drawable/shape_icon_speed_limit.xml

@@ -1,12 +0,0 @@
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="oval"
-    android:useLevel="false">
-    <stroke
-        android:width="1.33dp"
-        android:color="#DB4646" />
-    <size
-        android:width="24dp"
-        android:height="24dp" />
-    <solid android:color="@color/white" />
-
-</shape>

app/src/main/res/drawable/shape_icon_speed_limit_off.xml

@@ -1,12 +0,0 @@
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="oval"
-    android:useLevel="false">
-    <stroke
-        android:width="1.33dp"
-        android:color="#000000" />
-    <size
-        android:width="24dp"
-        android:height="24dp" />
-    <solid android:color="@color/white" />
-
-</shape>