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=c1beb4f09757a37374a7ca96f35deae07c06aae7;hpb=edf5b6603fc32ed012f765763db6fa03de3715e5;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 c1beb4f..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,11 +48,6 @@ public class MainActivity extends AppCompatActivity implements MyService.MyServi
     private CameraView mCameraView;
 
     private void init(){
-        //UserInfo.setConfigPath(getExternalFilesDir(null) + File.separator + "config");
-        //UserInfo.readConfig(getExternalFilesDir(null) + File.separator + "config", getMacAddr());
-
-
-        //this.mMacAddr = getMacAddr();
 
         mIntent = new Intent(this, MyService.class);
         mUsbMonitor = new UsbMonitor(new UsbMonitor.UsbListener() {
@@ -190,14 +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("#######################################");
+        gLogger.error("onCreate ---------> ");
         UserInfo.readConfig(getExternalFilesDir(null) + File.separator + "config", getMacAddr());
         initCameraView();
         init();
 
-        if(NetworkMonitor.isNetworkAvailable(this) && mUsbMonitor.hasUsbCamera()){
+        if(canStartService()){
             gLogger.error("Current network is available");
             doBindService();
         } else {
@@ -209,6 +200,9 @@ public class MainActivity extends AppCompatActivity implements MyService.MyServi
             mServiceHealthMonitor.start();
         }
         ////////// LogUtil.sendLogs();  /// Log test
+        //LogUtil.sendLogs();
+
+        new CheckVersionInfoTask(MainActivity.this).execute();
     }
 
     @Override
@@ -267,6 +261,10 @@ public class MainActivity extends AppCompatActivity implements MyService.MyServi
     }
 
     private boolean canStartService(){
+
+        if(System.getProperty("os.arch").equals("i686")){
+            return  true;
+        }
         return mUsbMonitor.hasUsbCamera() && NetworkMonitor.isNetworkAvailable(this);
     }