fix: 1.优化WEB端页面样式，并支持完全无外网传输

uchiha-ben · Apr 8, 2022 · 5573dfe · 5573dfe
1 parent b83e577
commit 5573dfe
Show file tree

Hide file tree

Showing 7 changed files with 34 additions and 24 deletions.
diff --git a/app/src/main/assets/public/css/fonts/element-icons.woff b/app/src/main/assets/public/css/fonts/element-icons.woff
diff --git a/app/src/main/assets/public/css/index.css b/app/src/main/assets/public/css/index.css
diff --git a/app/src/main/assets/public/index.html b/app/src/main/assets/public/index.html
@@ -6,7 +6,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>文件中转区</title>
     <!-- 引入 ElementUI 样式 -->
-    <link rel="stylesheet" href="https://unpkg.com/element-ui/lib/theme-chalk/index.css">
+    <link rel="stylesheet" href="/css/index.css">
     <style>
         a {
             text-decoration: none;
@@ -54,11 +54,11 @@
     </div>
 
     <!-- 引入 Vue.js -->
-    <script src="https://cdn.jsdelivr.net/npm/vue@2"></script>
+    <script src="/js/vue@2.js"></script>
     <!-- 引入 ElementUI 组件库 -->
-    <script src="https://unpkg.com/element-ui/lib/index.js"></script>
+    <script src="/js/index.js"></script>
     <!-- 引入 Axios.js -->
-    <script src="https://unpkg.com/axios/dist/axios.min.js"></script>
+    <script src="/js/axios.min.js"></script>
 </body>
 <script>
     var app = new Vue({

diff --git a/app/src/main/assets/public/js/axios.min.js b/app/src/main/assets/public/js/axios.min.js
diff --git a/app/src/main/assets/public/js/index.js b/app/src/main/assets/public/js/index.js
diff --git a/app/src/main/assets/public/js/vue@2.js b/app/src/main/assets/public/js/vue@2.js
diff --git a/app/src/main/java/com/example/filetransfer/utils/IpUtil.java b/app/src/main/java/com/example/filetransfer/utils/IpUtil.java
@@ -10,6 +10,8 @@
 import java.net.InetAddress;
 import java.net.NetworkInterface;
 import java.net.SocketException;
+import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Enumeration;
 
 /**
@@ -27,31 +29,30 @@ public class IpUtil {
      * @return
      */
     public static String getIPAddress(Context context) {
-        NetworkInfo info = ((ConnectivityManager) context
-                .getSystemService(Context.CONNECTIVITY_SERVICE)).getActiveNetworkInfo();
-        if (info != null && info.isConnected()) {
-            if (info.getType() == ConnectivityManager.TYPE_MOBILE) {
-                try {
-                    for (Enumeration<NetworkInterface> en = NetworkInterface.getNetworkInterfaces(); en.hasMoreElements(); ) {
-                        NetworkInterface intf = en.nextElement();
-                        for (Enumeration<InetAddress> enumIpAddr = intf.getInetAddresses(); enumIpAddr.hasMoreElements(); ) {
-                            InetAddress inetAddress = enumIpAddr.nextElement();
-                            if (!inetAddress.isLoopbackAddress() && inetAddress instanceof Inet4Address) {
-                                return inetAddress.getHostAddress();
-                            }
+        ConnectivityManager conMann = (ConnectivityManager)
+                context.getSystemService(Context.CONNECTIVITY_SERVICE);
+        NetworkInfo wifiNetworkInfo = conMann.getNetworkInfo(ConnectivityManager.TYPE_WIFI);
+        if (wifiNetworkInfo.isConnected()) {
+            WifiManager wifiManager = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
+            WifiInfo wifiInfo = wifiManager.getConnectionInfo();
+            String ipAddress = intIP2StringIP(wifiInfo.getIpAddress());
+            return ipAddress;
+        } else {
+            try {
+                for (Enumeration<NetworkInterface> en = NetworkInterface.getNetworkInterfaces(); en.hasMoreElements(); ) {
+                    NetworkInterface intf = en.nextElement();
+                    for (Enumeration<InetAddress> enumIpAddr = intf.getInetAddresses(); enumIpAddr.hasMoreElements(); ) {
+                        InetAddress inetAddress = enumIpAddr.nextElement();
+                        if (!inetAddress.isLoopbackAddress() && inetAddress instanceof Inet4Address) {
+                            return inetAddress.getHostAddress();
                         }
                     }
-                } catch (SocketException e) {
-                    e.printStackTrace();
                 }
-            } else if (info.getType() == ConnectivityManager.TYPE_WIFI) {
-                WifiManager wifiManager = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
-                WifiInfo wifiInfo = wifiManager.getConnectionInfo();
-                String ipAddress = intIP2StringIP(wifiInfo.getIpAddress());
-                return ipAddress;
+            } catch (SocketException e) {
+                e.printStackTrace();
             }
         }
-        return null;
+        return "127.0.0.1";
     }
 
     /**