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=679195d4e27980faf7fd4ef577301b005ab054f1;hp=00e5e2324dac77b7a452e000ea7bc7e834203c26;hpb=061580c83656bf358b01a6b78fd22ae9bd497728;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 00e5e23..8009127 100644
--- a/app/src/main/java/ai/suanzi/rtmpclient/UserInfo.java
+++ b/app/src/main/java/ai/suanzi/rtmpclient/UserInfo.java
@@ -1,7 +1,8 @@
 package ai.suanzi.rtmpclient;
 
 import android.content.Context;
-import android.util.Log;
+import android.net.wifi.WifiInfo;
+import android.net.wifi.WifiManager;
 import android.widget.Toast;
 
 import java.io.BufferedReader;
@@ -10,29 +11,50 @@ import java.io.File;
 import java.io.FileReader;
 import java.io.FileWriter;
 import java.io.IOException;
-import java.io.InputStream;
+
 
 import org.json.JSONException;
 import org.json.JSONObject;
+import org.apache.log4j.Logger;
 
 public class UserInfo {
 
     public String server = "";
-    public String user = "suanzi";
-    public String macAddr = "ac83f34ead90";
-    public String cameraId = "cameraId";
+    public String user = "";
+    public String macAddr = "";
+    public String cameraId = "";
     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 () {}
 
     public static void setConfigPath(String fname){
         configPath = fname;
+        File file = new File(configPath);
+        if(!file.exists()) {
+            gLogger.error("Config file: " + configPath + " not exists! Create it");
+            try {
+                file.createNewFile();
+            }catch (IOException e){
+                gLogger.error("Create file error: " + e.getMessage());
+                e.printStackTrace();
+            }
+        }
     }
 
     public static UserInfo getConfig() {
         if (instance != null) return instance;
+
         File file = new File(configPath);
+        if (!file.exists()){
+            gLogger.error("getConfig - file configpath: " + configPath + " not exists");
+            return new UserInfo();
+        }
+
         StringBuilder text = new StringBuilder();
         try {
             BufferedReader br = new BufferedReader(new FileReader(file));
@@ -56,6 +78,7 @@ public class UserInfo {
             info.macAddr = jobj.getString("macAddr");
             info.cameraId = jobj.getString("cameraId");
         } catch (JSONException e){
+            gLogger.error("getConfig - error: " + e.getMessage());
             e.printStackTrace();
         }
         instance = info;
@@ -66,14 +89,13 @@ public class UserInfo {
 
         String jstring = toString();
 
-        Log.e("Config", "xxxxxxxxx "  + jstring);
-
         File file = new File(configPath);
         try{
             BufferedWriter bw = new BufferedWriter(new FileWriter(file));
             bw.write(jstring);
             bw.close();
         } catch (IOException e){
+            gLogger.error("saveConfig - error: " + e.getMessage());
             e.printStackTrace();
             return false;
         }
@@ -89,8 +111,16 @@ public class UserInfo {
 
     public String toString () {
         JSONObject obj = toJsonObj();
-        if (obj.equals(null)) return "";
-        return obj.toString();
+        String str = "";
+        if (!obj.equals(null)) {
+            try {
+                str = obj.toString(4);
+            }catch (JSONException e){
+                gLogger.error("toString - error: " + e.getMessage());
+                e.printStackTrace();
+            }
+        }
+        return str;
     }
 
     private JSONObject toJsonObj () {
@@ -106,4 +136,19 @@ public class UserInfo {
             return null;
         }
     }
+
+    public String toUrl (String mac) {
+        //rtmp://gpussh.suanzi.ai:1935/myapp/suanzi_ac83f34ead90_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 "";
+    }
 }