From d293c92b0ffd5892affc13a11a8d742f5b67f4f9 Mon Sep 17 00:00:00 2001
From: renwj <renwenjie@zhidaoauto.com>
Date: Thu, 9 Jun 2022 14:27:57 +0800
Subject: [PATCH] =?UTF-8?q?[=E7=8A=B6=E6=80=81=E6=A0=8F]=E6=A0=87=E9=A2=98?=
 =?UTF-8?q?=E5=85=A8=E9=83=A8=E6=94=B9=E5=A4=A7=E5=86=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[RouterOpt]测试代码
---
 .../status/flow/nets/NetsImpl.kt                          | 2 +-
 .../mogo_core_function_devatools/status/ui/StatusView.kt  | 3 ---
 .../status/ui/adapter/StatusAdapter.kt                    | 8 ++++----
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/flow/nets/NetsImpl.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/flow/nets/NetsImpl.kt
index a7e6c9ebdb..4ea16362fb 100644
--- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/flow/nets/NetsImpl.kt
+++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/flow/nets/NetsImpl.kt
@@ -94,7 +94,7 @@ internal class NetsImpl(ctx: Context): IFlow<NetStatus>(ctx) {
     private fun checkAndSend() {
         val connectionInfo = wifiMgr.connectionInfo
         val enabled = isNetConnected()
-        val name = if (isLocationEnabled()) connectionInfo.ssid?.replace(Regex("[\\W]"), "") else "Wi-Fi"
+        val name = if (isLocationEnabled()) connectionInfo.ssid?.replace(Regex("[\\W]"), "") else "WI-FI"
         loopCheckAndSendJob?.safeCancel()
         launch(Dispatchers.Default) { delay(1000); checkAndSend() }.also { loopCheckAndSendJob = it }
         var tr = 0
diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/ui/StatusView.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/ui/StatusView.kt
index 647483f81b..7c9013a2dd 100644
--- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/ui/StatusView.kt
+++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/ui/StatusView.kt
@@ -5,7 +5,6 @@ import android.content.*
 import android.graphics.*
 import android.graphics.drawable.*
 import android.transition.*
-import android.util.*
 import android.view.*
 import androidx.appcompat.widget.*
 import androidx.constraintlayout.widget.*
@@ -80,8 +79,6 @@ internal class StatusView(private val model: StatusModel, ctx: Context): Constra
                         dot.visibility = View.INVISIBLE
                     }
                     val old = adapter.data
-                    Log.d(TAG, "receive update --new - data: ${data.second.joinToString(",")}")
-                    Log.d(TAG, "receive update --old - data: ${old.joinToString(",")}")
                     val result = DiffUtil.calculateDiff(StatusDiffCallback(old, data.second))
                     adapter.data = data.second
                     result.dispatchUpdatesTo(adapter)
diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/ui/adapter/StatusAdapter.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/ui/adapter/StatusAdapter.kt
index 727fb1d199..6a1085ed3d 100644
--- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/ui/adapter/StatusAdapter.kt
+++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/ui/adapter/StatusAdapter.kt
@@ -50,15 +50,15 @@ internal class StatusAdapter(val ctx: Context, var data: ArrayList<Status>): Rec
                     } else {
                         iv.background = ContextCompat.getDrawable(itemView.context, drawable.icon_dev_status_can_disable)
                     }
-                    tv.text = "Can"
+                    tv.text = "CAN"
                 }
                 is NetStatus -> {
                     if (status.enabled) {
                         iv.background = ContextCompat.getDrawable(itemView.context, drawable.icon_dev_status_net_enable)
-                        tv.text = status.name ?: "Wi-Fi"
+                        tv.text = status.name ?: "WI-FI"
                     } else {
                         iv.background = ContextCompat.getDrawable(itemView.context, drawable.icon_dev_status_net_disable)
-                        tv.text = "Wi-Fi"
+                        tv.text = "WI-FI"
                     }
                 }
                 is GpsStatus -> {
@@ -67,7 +67,7 @@ internal class StatusAdapter(val ctx: Context, var data: ArrayList<Status>): Rec
                     } else {
                         iv.background = ContextCompat.getDrawable(itemView.context, drawable.icon_dev_status_gps_disable)
                     }
-                    tv.text = "Gps"
+                    tv.text = "GPS"
                 }
                 is TracingStatus -> {
                     when(status.state) {