From 1086b3e0603e2b828b7f0ea065714b64d3d7a12e Mon Sep 17 00:00:00 2001
From: Matthew <wakinchau@msn.com>
Date: Tue, 2 Jul 2024 23:17:58 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BD=93=E5=89=8D=E8=BF=9E=E6=8E=A5=E7=9A=84?=
 =?UTF-8?q?=E7=83=AD=E7=82=B9=E5=9B=BE=E6=A0=87=E7=94=A8=E7=BB=BF=E8=89=B2?=
 =?UTF-8?q?=E8=A1=A8=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/xypower/mpremote/MainActivity.java    | 13 +++++----
 .../res/drawable/ic_wifi_signal_0_green.xml   | 26 +++++++++++++++++
 .../res/drawable/ic_wifi_signal_1_green.xml   | 29 +++++++++++++++++++
 .../res/drawable/ic_wifi_signal_2_green.xml   | 29 +++++++++++++++++++
 .../res/drawable/ic_wifi_signal_3_green.xml   | 29 +++++++++++++++++++
 .../res/drawable/ic_wifi_signal_4_green.xml   | 26 +++++++++++++++++
 6 files changed, 146 insertions(+), 6 deletions(-)
 create mode 100644 app/src/main/res/drawable/ic_wifi_signal_0_green.xml
 create mode 100644 app/src/main/res/drawable/ic_wifi_signal_1_green.xml
 create mode 100644 app/src/main/res/drawable/ic_wifi_signal_2_green.xml
 create mode 100644 app/src/main/res/drawable/ic_wifi_signal_3_green.xml
 create mode 100644 app/src/main/res/drawable/ic_wifi_signal_4_green.xml

diff --git a/app/src/main/java/com/xypower/mpremote/MainActivity.java b/app/src/main/java/com/xypower/mpremote/MainActivity.java
index cfdba59..4a7e2f3 100644
--- a/app/src/main/java/com/xypower/mpremote/MainActivity.java
+++ b/app/src/main/java/com/xypower/mpremote/MainActivity.java
@@ -431,26 +431,27 @@ public class MainActivity extends AppCompatActivity {
 
             int signalLevel = WifiManager.calculateSignalLevel(scanResult.level, RSSI_LEVELS);
             int drawableId = R.drawable.ic_wifi_signal_0;
+            boolean connected = TextUtils.equals(ssid, scanResult.SSID);
             switch (signalLevel) {
                 case 1:
-                    drawableId = R.drawable.ic_wifi_signal_1;
+                    drawableId = connected ? R.drawable.ic_wifi_signal_1_green : R.drawable.ic_wifi_signal_1;
                     break;
                 case 2:
-                    drawableId = R.drawable.ic_wifi_signal_2;
+                    drawableId = connected ? R.drawable.ic_wifi_signal_2_green : R.drawable.ic_wifi_signal_2;
                     break;
                 case 3:
-                    drawableId = R.drawable.ic_wifi_signal_3;
+                    drawableId = connected ? R.drawable.ic_wifi_signal_3_green : R.drawable.ic_wifi_signal_3;
                     break;
                 case 4:
-                    drawableId = R.drawable.ic_wifi_signal_4;
+                    drawableId = connected ? R.drawable.ic_wifi_signal_4_green : R.drawable.ic_wifi_signal_4;
                     break;
                 default:
-                    drawableId = R.drawable.ic_wifi_signal_0;
+                    drawableId = connected ? R.drawable.ic_wifi_signal_0_green : R.drawable.ic_wifi_signal_0;
                     break;
             }
             map.put("img", drawableId);
             // if (scanR)
-            map.put("text", scanResult.SSID + (TextUtils.equals(ssid, scanResult.SSID) ? "  当前已连接" : ""));
+            map.put("text", scanResult.SSID);
             mItems.add(map);
         }
         return mItems;
diff --git a/app/src/main/res/drawable/ic_wifi_signal_0_green.xml b/app/src/main/res/drawable/ic_wifi_signal_0_green.xml
new file mode 100644
index 0000000..44c792a
--- /dev/null
+++ b/app/src/main/res/drawable/ic_wifi_signal_0_green.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (C) 2015 The Android Open Source Project
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="#00FF00">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M12,4c3.42,0,6.73,1.27,9.3,3.53L12,18.85L2.7,7.53C5.27,5.27,8.58,4,12,4 M12,2C7.25,2,2.97,4.08,0,7.39L12,22L24,7.39 C21.03,4.08,16.75,2,12,2L12,2z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_wifi_signal_1_green.xml b/app/src/main/res/drawable/ic_wifi_signal_1_green.xml
new file mode 100644
index 0000000..63cdd12
--- /dev/null
+++ b/app/src/main/res/drawable/ic_wifi_signal_1_green.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (C) 2015 The Android Open Source Project
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="#00FF00">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M12,2.01c-4.75,0-9.03,2.08-12,5.39L12,22L24,7.4C21.03,4.09,16.75,2.01,12,2.01z M12,18.86L2.7,7.54 C5.27,5.28,8.58,4.01,12,4.01s6.73,1.27,9.3,3.53L12,18.86z" />
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M16.42,16.63L12,22l-4.42-5.37c0.15-0.74,0.48-1.43,0.95-1.99C9.35,13.64,10.6,13,12,13s2.65,0.64,3.47,1.64 C15.94,15.2,16.27,15.89,16.42,16.63z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_wifi_signal_2_green.xml b/app/src/main/res/drawable/ic_wifi_signal_2_green.xml
new file mode 100644
index 0000000..6685f51
--- /dev/null
+++ b/app/src/main/res/drawable/ic_wifi_signal_2_green.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (C) 2015 The Android Open Source Project
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="#00FF00">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M12,2C7.25,2,2.97,4.08,0,7.39L12,22L24,7.39C21.03,4.08,16.75,2,12,2z M12,18.85L2.7,7.53C5.27,5.27,8.58,4,12,4 s6.73,1.27,9.3,3.53L12,18.85z" />
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M18.61,13.95L12,22l-6.61-8.05c0.33-0.61,0.74-1.17,1.22-1.66c1.36-1.42,3.27-2.3,5.39-2.3s4.03,0.88,5.39,2.3 C17.87,12.78,18.28,13.34,18.61,13.95z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_wifi_signal_3_green.xml b/app/src/main/res/drawable/ic_wifi_signal_3_green.xml
new file mode 100644
index 0000000..83c5e13
--- /dev/null
+++ b/app/src/main/res/drawable/ic_wifi_signal_3_green.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (C) 2015 The Android Open Source Project
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="#00FF00">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M12,2C7.25,2,2.97,4.08,0,7.39L12,22L24,7.39C21.03,4.08,16.75,2,12,2z M12,18.85L2.7,7.53C5.27,5.27,8.58,4,12,4 s6.73,1.27,9.3,3.53L12,18.85z" />
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M20.7,11.41L12,22L3.3,11.41c0.38-0.52,0.8-0.99,1.26-1.43C6.49,8.13,9.1,6.99,12,6.99s5.51,1.13,7.44,2.99 C19.9,10.41,20.33,10.89,20.7,11.41z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_wifi_signal_4_green.xml b/app/src/main/res/drawable/ic_wifi_signal_4_green.xml
new file mode 100644
index 0000000..ac2ca6c
--- /dev/null
+++ b/app/src/main/res/drawable/ic_wifi_signal_4_green.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (C) 2015 The Android Open Source Project
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="#00FF00">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M24,7.39L12,22L0,7.39C2.97,4.08,7.25,2,12,2S21.03,4.08,24,7.39z" />
+</vector>
\ No newline at end of file