log4j, add thread name

[rtmpclient.git] / app / src / main / java / ai / suanzi / rtmpclient / MainActivity.java

diff --git a/app/src/main/java/ai/suanzi/rtmpclient/MainActivity.java b/app/src/main/java/ai/suanzi/rtmpclient/MainActivity.java
index 4dcbb6d..3b86065 100644 (file)
--- a/app/src/main/java/ai/suanzi/rtmpclient/MainActivity.java
+++ b/app/src/main/java/ai/suanzi/rtmpclient/MainActivity.java
@@ -32,8 +32,6 @@ 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 Logger gLogger;
@@ -184,12 +182,12 @@ public class MainActivity extends AppCompatActivity implements MyService.MyServi
         super.onCreate(savedInstanceState);
         LogUtil.config(getExternalFilesDir(null));
         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 {
@@ -201,6 +199,7 @@ public class MainActivity extends AppCompatActivity implements MyService.MyServi
             mServiceHealthMonitor.start();
         }
         ////////// LogUtil.sendLogs();  /// Log test
+        //LogUtil.sendLogs();
     }
 
     @Override
@@ -259,6 +258,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);
     }