X-Git-Url: http://47.100.26.94:8080/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fai%2Fsuanzi%2Frtmpclient%2FUserInfo.java;h=403e506d7e681495e1135f3b6511180c7a4dea8f;hb=a2555d7a8d228c91da9f8014ca4a09dbd0d050ae;hp=404562b9521e14bd12819aaa0ff5bdd95eca0acb;hpb=edf5b6603fc32ed012f765763db6fa03de3715e5;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 404562b..403e506 100644
--- a/app/src/main/java/ai/suanzi/rtmpclient/UserInfo.java
+++ b/app/src/main/java/ai/suanzi/rtmpclient/UserInfo.java
@@ -1,10 +1,5 @@
 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;
 import java.io.BufferedWriter;
 import java.io.File;
@@ -64,7 +59,8 @@ public class UserInfo {
             }
             cameraId = jobj.getString("cameraId");
         } catch (JSONException e){
-            gLogger.error("getConfig - error: " + e.getMessage());
+            gLogger.error("readConfig - error: " + e.getMessage());
+            macAddr = addr;
             e.printStackTrace();
         }
     }
@@ -86,12 +82,12 @@ public class UserInfo {
         return true;
     }
 
-    public void update(String server, String user, String macAddr, String cameraId) {
-        server = server;
-        user = user;
-        macAddr = macAddr;
-        cameraId = cameraId;
-    }
+//    public void update(String server, String user, String macAddr, String cameraId) {
+//        server = server;
+//        user = user;
+//        macAddr = macAddr;
+//        cameraId = cameraId;
+//    }
 
     public String toString () {
         JSONObject obj = toJsonObj();
@@ -129,11 +125,12 @@ public class UserInfo {
 
     }
 
-    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 "";
-    }
+//    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 "";
+//    }
+
 }