X-Git-Url: http://47.100.26.94:8080/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fai%2Fsuanzi%2Frtmpclient%2FMainActivity.java;h=c1beb4f09757a37374a7ca96f35deae07c06aae7;hb=edf5b6603fc32ed012f765763db6fa03de3715e5;hp=a0b4cc1a12877d47c3090d910345b1af8a95abc5;hpb=390f2fc2d835c37fb5c078fea795ae28cffc088e;p=rtmpclient.git

diff --git a/app/src/main/java/ai/suanzi/rtmpclient/MainActivity.java b/app/src/main/java/ai/suanzi/rtmpclient/MainActivity.java
index a0b4cc1..c1beb4f 100644
--- a/app/src/main/java/ai/suanzi/rtmpclient/MainActivity.java
+++ b/app/src/main/java/ai/suanzi/rtmpclient/MainActivity.java
@@ -39,7 +39,7 @@ public class MainActivity extends AppCompatActivity implements MyService.MyServi
     //private static final String TAG = "MainActivity";
     private Logger gLogger;
 
-    private String mMacAddr = "";
+    //private String mMacAddr = "";
     private NetworkMonitor networkMonitor;
     private UsbMonitor mUsbMonitor;
     private ServiceHealthMonitor mServiceHealthMonitor;
@@ -52,10 +52,11 @@ public class MainActivity extends AppCompatActivity implements MyService.MyServi
     private CameraView mCameraView;
 
     private void init(){
-        // set config file
-        UserInfo.setConfigPath(getExternalFilesDir(null) + File.separator + "config");
+        //UserInfo.setConfigPath(getExternalFilesDir(null) + File.separator + "config");
+        //UserInfo.readConfig(getExternalFilesDir(null) + File.separator + "config", getMacAddr());
 
-        this.mMacAddr = getMacAddr();
+
+        //this.mMacAddr = getMacAddr();
 
         mIntent = new Intent(this, MyService.class);
         mUsbMonitor = new UsbMonitor(new UsbMonitor.UsbListener() {
@@ -134,7 +135,7 @@ public class MainActivity extends AppCompatActivity implements MyService.MyServi
             LocalBinder mLocalBinder = (LocalBinder)service;
             mServer = mLocalBinder.getServiceInstance();
             mServer.setServiceEventListener(MainActivity.this);
-            if(mServer.setRtmpUrl(UserInfo.getConfig().toUrl(mMacAddr))){
+            if(mServer.setRtmpUrl(UserInfo.toUrl())){
                 mServer.startPreview(mCameraView.getHolder());
                 Camera.Size cs = mServer.getBestPictureSize();
                 mCameraView.setLayout(cs.width, cs.height);
@@ -192,11 +193,9 @@ public class MainActivity extends AppCompatActivity implements MyService.MyServi
         LogUtil.config(getExternalFilesDir(null));
         gLogger = Logger.getLogger(getClass());
         gLogger.error("#######################################");
-        //configLog();
+        UserInfo.readConfig(getExternalFilesDir(null) + File.separator + "config", getMacAddr());
         initCameraView();
         init();
-        loadConfig();
-
 
         if(NetworkMonitor.isNetworkAvailable(this) && mUsbMonitor.hasUsbCamera()){
             gLogger.error("Current network is available");
@@ -209,6 +208,7 @@ public class MainActivity extends AppCompatActivity implements MyService.MyServi
             gLogger.debug("mServiceHealthMonitor start, interval " + INTERVAL);
             mServiceHealthMonitor.start();
         }
+        ////////// LogUtil.sendLogs();  /// Log test
     }
 
     @Override
@@ -266,26 +266,6 @@ public class MainActivity extends AppCompatActivity implements MyService.MyServi
         return info.getMacAddress().replace(":", ""); //02:00:00:00:00:00 - 020000000000
     }
 
-    private void loadConfig() {
-//        UserInfo info = UserInfo.getConfig();
-//        gLogger.error("server is:" + info.server);
-//        mTextServer.setText(info.server.equals("") ? "rtmp://gpussh.suanzi.ai:1935/myapp" : info.server);
-//        mTextUser.setText(info.user);
-//        //mMacAddr = info.macAddr.equals("") ?  this.mMacAddr : info.macAddr;
-//        gLogger.error("loadConfig - url is :" + info.toUrl(mMacAddr));
-    }
-
-    private void saveConfig() {
-        UserInfo info = UserInfo.getConfig();
-        //info.update(mTextServer.getText().toString(), mTextUser.getText().toString(), mMacAddr, mTextCamera.getText().toString());
-        if(info.saveConfig()) {
-            Toast.makeText(getApplicationContext(), "Config saved", Toast.LENGTH_LONG).show();
-        } else {
-            Toast.makeText(getApplicationContext(), "Error: config saved", Toast.LENGTH_LONG).show();
-        }
-        gLogger.error("saveConfig - url: " + info.toUrl(mMacAddr));
-    }
-
     private boolean canStartService(){
         return mUsbMonitor.hasUsbCamera() && NetworkMonitor.isNetworkAvailable(this);
     }