调整看板

app/src/main/assets/omdb_config.json

@@ -148,11 +148,6 @@
 				}
 			]
 		},
-		"4022":{
-			"table": "OMDB_TRAFFICLIGHT",
-			"code": 4022,
-			"name": "交通灯"
-		},
         "5001":{
             "table": "OMDB_LANE_LINK_LG",
             "code": 5001,

app/src/main/java/com/navinfo/omqs/ui/activity/map/MainActivity.kt

@@ -215,6 +215,7 @@ class MainActivity : BaseActivity() {
             }
         }
     }
+
     //根据输入的经纬度跳转坐标
     fun jumpPosition() {
         val view = this.layoutInflater.inflate(R.layout.dialog_view_edittext, null)
@@ -222,23 +223,26 @@ class MainActivity : BaseActivity() {
             this
         ).setTitle("标记原因").setView(view)
         var editText = view.findViewById<EditText>(R.id.dialog_edittext)
-        editText.hint = "请输入经纬度例如：116.1234567,39.1234567"
+        editText.hint = "请输入经纬度例如：\n116.1234567,39.1234567\n116.1234567 39.1234567"
         inputDialog.setNegativeButton("取消") { dialog, _ ->
             dialog.dismiss()
         }
         inputDialog.setPositiveButton("确定") { dialog, _ ->
             if (editText.text.isNotEmpty()) {
                 try {
-                    val parts = editText.text.split(",")
+                    val parts = editText.text.toString().split("[,，\\s]".toRegex())
                     if (parts.size == 2) {
                         val x = parts[0].toDouble()
                         val y = parts[0].toDouble()
                         mapController.animationHandler.animationByLatLon(y, x)
+                    }else{
+                        Toast.makeText(this, "输入格式不正确", Toast.LENGTH_SHORT).show()
                     }
                 } catch (e: Exception) {
                     Toast.makeText(this, "输入格式不正确", Toast.LENGTH_SHORT).show()
                 }
             }
+            dialog.dismiss()
         }
         inputDialog.show()
     }

app/src/main/java/com/navinfo/omqs/ui/activity/map/SignAdapter.kt

@@ -24,7 +24,7 @@ class SignAdapter(private var itemListener: ((Int, SignBean) -> Unit?)? = null)
         val bd = holder.viewBinding as AdapterSignBinding
         val item = data[position]
         if (item.iconId != 0)
-            bd.signMainIcon.background = holder.viewBinding.root.context.getDrawable(item.iconId)
+            bd.signMainIconBg.setImageResource(item.iconId)
         bd.signMainIcon.text = item.iconText
         bd.signBottomText.text = item.name
         bd.signBottomRightText.text = item.bottomRightText

app/src/main/res/layout/activity_main.xml

@@ -75,7 +75,8 @@
             <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/main_activity_sign_recyclerview"
                 android:layout_width="wrap_content"
-                android:layout_height="350dp"
+                android:layout_height="wrap_content"
+                android:maxHeight="350dp"
                 android:layout_marginTop="10dp"
                 app:layout_constraintLeft_toLeftOf="@id/main_activity_person_center"
                 app:layout_constraintTop_toBottomOf="@id/main_activity_person_center" />

app/src/main/res/layout/adapter_sign.xml

@@ -6,13 +6,19 @@
     android:background="@drawable/bg_sign"
     tools:context="com.navinfo.omqs.ui.activity.map.SignAdapter">
 
+    <ImageView
+        android:id="@+id/sign_main_icon_bg"
+        android:layout_marginLeft="19dp"
+        android:layout_marginTop="4dp"
+        android:layout_width="40dp"
+        android:layout_height="40dp"/>
+
     <TextView
         android:id="@+id/sign_main_icon"
         android:layout_width="40dp"
         android:layout_height="40dp"
         android:layout_marginLeft="19dp"
         android:layout_marginTop="4dp"
-        android:background="@drawable/icon_speed_limit"
         android:gravity="center"
         android:text="80"
         android:textColor="#2F2F2F"

vtm

@@ -1 +1 @@
-Subproject commit dd13e533c38b5738ab404c2737d7ccadeff01323
+Subproject commit 1ee201a41f78f169873848209a3f3bdac36f185a