Add UsbMonitor

[rtmpclient.git] / app / src / main / java / ai / suanzi / rtmpclient / UserInfo.java

diff --git a/app/src/main/java/ai/suanzi/rtmpclient/UserInfo.java b/app/src/main/java/ai/suanzi/rtmpclient/UserInfo.java
index 9d95894..8009127 100644 (file)
--- a/app/src/main/java/ai/suanzi/rtmpclient/UserInfo.java
+++ b/app/src/main/java/ai/suanzi/rtmpclient/UserInfo.java
@@ -1,5 +1,8 @@
 package ai.suanzi.rtmpclient;
 
+import android.content.Context;
+import android.net.wifi.WifiInfo;
+import android.net.wifi.WifiManager;
 import android.widget.Toast;
 
 import java.io.BufferedReader;
@@ -23,6 +26,8 @@ public class UserInfo {
     private static String configPath;
     private static Logger gLogger = Logger.getLogger("UserInfo");
 
+    private static String DEFAULT_SERVER = "rtmp://gpussh.suanzi.ai:1935/myapp";
+    private static String DEFAULT_USER = "yunzhi";
 
     private static UserInfo instance = null;
     private UserInfo () {}
@@ -132,9 +137,11 @@ public class UserInfo {
         }
     }
 
-    public String toUrl () {
+    public String toUrl (String mac) {
         //rtmp://gpussh.suanzi.ai:1935/myapp/suanzi_ac83f34ead90_cameraid
-        return server + "/" + user + "_" + macAddr + "_" + cameraId;
+        //return server + "/" + user + "_" + macAddr + "_" + cameraId;
+        return (server.equals("") ? DEFAULT_SERVER : server) + "/" + (user.equals("") ? DEFAULT_USER : user) + "_" + mac;
+
     }
 
     public String getValue(String key){