X-Git-Url: http://47.100.26.94:8080/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fai%2Fsuanzi%2Frtmpclient%2FUserInfo.java;h=8009127542b46d61fa87b8ec5c46dbef5cd23533;hb=390f2fc2d835c37fb5c078fea795ae28cffc088e;hp=ebac93708c2d6ca1b5fc7b9aaf4510f2df104847;hpb=8af8da070650175d3a35a840fbd339ee572d144f;p=rtmpclient.git

diff --git a/app/src/main/java/ai/suanzi/rtmpclient/UserInfo.java b/app/src/main/java/ai/suanzi/rtmpclient/UserInfo.java
index ebac937..8009127 100644
--- 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,8 +137,18 @@ 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){
+        if(key.equals("server")) return server;
+        if(key.equals("user")) return user;
+        if(key.equals("macAddr")) return macAddr;
+        if(key.equals("cameraId")) return cameraId;
+        return "";
     }
 }