Enhance Router Connection validation

KrxkGit · Sep 4, 2024 · 712375a · 712375a
1 parent 558a2a0
commit 712375a
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 5 deletions.
diff --git a/Android/app/build.gradle.kts b/Android/app/build.gradle.kts
@@ -11,8 +11,8 @@ android {
         applicationId = "com.krxkli.scut_router"
         minSdk = 24
         targetSdk = 34
-        versionCode = 4
-        versionName = "1.1.2"
+        versionCode = 5
+        versionName = "1.1.3"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
 

diff --git a/Android/app/release/app-release.apk b/Android/app/release/app-release.apk
diff --git a/Android/app/release/baselineProfiles/0/app-release.dm b/Android/app/release/baselineProfiles/0/app-release.dm
diff --git a/Android/app/release/baselineProfiles/1/app-release.dm b/Android/app/release/baselineProfiles/1/app-release.dm
diff --git a/Android/app/release/output-metadata.json b/Android/app/release/output-metadata.json
@@ -11,8 +11,8 @@
       "type": "SINGLE",
       "filters": [],
       "attributes": [],
-      "versionCode": 4,
-      "versionName": "1.1.2",
+      "versionCode": 5,
+      "versionName": "1.1.3",
       "outputFile": "app-release.apk"
     }
   ],

diff --git a/Android/app/src/main/java/com/example/scut_router/MainActivity.kt b/Android/app/src/main/java/com/example/scut_router/MainActivity.kt
@@ -116,10 +116,14 @@ class MainActivity : AppCompatActivity() {
         val context: Context = this
         val wifiManager = context.getSystemService(Context.WIFI_SERVICE) as WifiManager
         val wifiInfo = wifiManager.connectionInfo
+        val dhcpInfo = wifiManager.dhcpInfo
         val ipAddr = wifiInfo.ipAddress
+        val gateway = dhcpInfo.gateway
 
         val ipStr = Formatter.formatIpAddress(ipAddr)
+        val gatewayStr = Formatter.formatIpAddress(gateway)
         println("IP 地址： $ipStr")
+        println("网关地址： ${gatewayStr}")
 
         val interfaces = NetworkInterface.getNetworkInterfaces()
         while (interfaces.hasMoreElements()) {
@@ -137,7 +141,9 @@ class MainActivity : AppCompatActivity() {
 
                         println("IP 子网: ${subNet.networkAddress}")
 
-                        if (subNet.networkAddress == this.getString(R.string.default_router_conn)) {
+                        if (subNet.networkAddress == this.getString(R.string.default_router_conn) && gatewayStr == getString(
+                                R.string.default_router_gateway
+                            )) {
                             return true
                         } else {
                             return false

diff --git a/Android/app/src/main/res/values/strings.xml b/Android/app/src/main/res/values/strings.xml
@@ -27,4 +27,5 @@
     <string name="loadCore">Loading Core</string>
     <string name="core_loaded_successfully">Core Loaded successfully</string>
     <string name="wlanIfaName" translatable="false">wlan0</string>
+    <string name="default_router_gateway" translatable="false">192.168.0.101</string>
 </resources>