X-Git-Url: http://47.100.26.94:8080/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fai%2Fsuanzi%2Frtmpclient%2FMainActivity.java;h=33ac4a62dc6c6e71146add80621cf6cb87494f6e;hb=eed83fe1fd361c6eb64152e02c0f05d203d071f9;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..33ac4a6 100644
--- a/app/src/main/java/ai/suanzi/rtmpclient/MainActivity.java
+++ b/app/src/main/java/ai/suanzi/rtmpclient/MainActivity.java
@@ -2,6 +2,7 @@ package ai.suanzi.rtmpclient;
 
 import android.content.IntentFilter;
 import android.hardware.Camera;
+import android.net.Uri;
 import android.support.design.widget.TextInputEditText;
 import android.support.v7.app.ActionBar;
 import android.support.v7.app.AppCompatActivity;
@@ -32,14 +33,9 @@ import android.os.IBinder;
 import android.net.ConnectivityManager;
 import android.view.ViewGroup;
 
-//"rtmp://gpussh.suanzi.ai:1935/myapp/suanzi_ac83f34ead90";
-
 public class MainActivity extends AppCompatActivity implements MyService.MyServiceEventListener, CameraView.Callback {
 
-    //private static final String TAG = "MainActivity";
     private Logger gLogger;
-
-    private String mMacAddr = "";
     private NetworkMonitor networkMonitor;
     private UsbMonitor mUsbMonitor;
     private ServiceHealthMonitor mServiceHealthMonitor;
@@ -52,10 +48,6 @@ public class MainActivity extends AppCompatActivity implements MyService.MyServi
     private CameraView mCameraView;
 
     private void init(){
-        // set config file
-        UserInfo.setConfigPath(getExternalFilesDir(null) + File.separator + "config");
-
-        this.mMacAddr = getMacAddr();
 
         mIntent = new Intent(this, MyService.class);
         mUsbMonitor = new UsbMonitor(new UsbMonitor.UsbListener() {
@@ -134,7 +126,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);
@@ -189,16 +181,14 @@ public class MainActivity extends AppCompatActivity implements MyService.MyServi
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        LogUtil.config(getExternalFilesDir(null));
+        LogUtil.config(this);
         gLogger = Logger.getLogger(getClass());
-        gLogger.error("#######################################");
-        //configLog();
+        gLogger.error("onCreate ---------> ");
+        UserInfo.readConfig(getExternalFilesDir(null) + File.separator + "config", getMacAddr());
         initCameraView();
         init();
-        loadConfig();
 
-
-        if(NetworkMonitor.isNetworkAvailable(this) && mUsbMonitor.hasUsbCamera()){
+        if(canStartService()){
             gLogger.error("Current network is available");
             doBindService();
         } else {
@@ -209,6 +199,10 @@ public class MainActivity extends AppCompatActivity implements MyService.MyServi
             gLogger.debug("mServiceHealthMonitor start, interval " + INTERVAL);
             mServiceHealthMonitor.start();
         }
+        ////////// LogUtil.sendLogs();  /// Log test
+        //LogUtil.sendLogs();
+
+        new CheckVersionInfoTask(MainActivity.this).execute();
     }
 
     @Override
@@ -266,27 +260,11 @@ 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 boolean canStartService(){
 
-    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();
+        if(System.getProperty("os.arch").equals("i686")){
+            return  true;
         }
-        gLogger.error("saveConfig - url: " + info.toUrl(mMacAddr));
-    }
-
-    private boolean canStartService(){
         return mUsbMonitor.hasUsbCamera() && NetworkMonitor.isNetworkAvailable(this);
     }