From b472e540ea87c45bdd874ec46d57ff799eeb9409 Mon Sep 17 00:00:00 2001 From: Peng Li Date: Sun, 27 May 2018 13:33:05 +0800 Subject: [PATCH] log4j, add thread name --- app/build.gradle | 1 + .../main/java/ai/suanzi/rtmpclient/LogUtil.java | 16 ++++++----- .../java/ai/suanzi/rtmpclient/MainActivity.java | 11 +++++--- .../main/java/ai/suanzi/rtmpclient/MyService.java | 2 +- .../main/java/ai/suanzi/rtmpclient/UserInfo.java | 32 ++++++++++------------ 5 files changed, 32 insertions(+), 30 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index cbded9d..dbdae8b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,6 +10,7 @@ android { versionName "v0.3.2" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" buildConfigField "String", "GIT_REVISION", "\"${getGitVersion()}\"" + buildConfigField "String", "COMPANY", "\"suanzi.ai\"" sourceSets.main { diff --git a/app/src/main/java/ai/suanzi/rtmpclient/LogUtil.java b/app/src/main/java/ai/suanzi/rtmpclient/LogUtil.java index a547c9c..789f518 100644 --- a/app/src/main/java/ai/suanzi/rtmpclient/LogUtil.java +++ b/app/src/main/java/ai/suanzi/rtmpclient/LogUtil.java @@ -1,7 +1,5 @@ package ai.suanzi.rtmpclient; -import android.content.Intent; - import org.apache.log4j.Level; import org.apache.log4j.Logger; import de.mindpipe.android.logging.log4j.LogConfigurator; @@ -50,13 +48,16 @@ public class LogUtil { logConfigurator.setRootLevel(Level.DEBUG); logConfigurator.setLevel("org.apache", Level.ERROR); logConfigurator.setMaxFileSize(MAX_SIZE); + logConfigurator.setFilePattern("%d [%-6.6t] %-5p [%c{2}]-[%L] %m%n"); logConfigurator.configure(); gLogger = Logger.getLogger("LogUtil"); - gLogger.error("#######################################"); - gLogger.error("RtmpClient for Android by suanzi.ai "); - gLogger.error("Git Revision: " + BuildConfig.GIT_REVISION); - gLogger.error("Version : " + BuildConfig.VERSION_NAME); - gLogger.debug("Log file is located at: " + logFile); + gLogger.error(""); + gLogger.error("##################################################"); + gLogger.error("### RtmpClient for Android by " + BuildConfig.COMPANY); + gLogger.error("### Git Revision: " + BuildConfig.GIT_REVISION); + gLogger.error("### Version : " + BuildConfig.VERSION_NAME); + gLogger.debug("### Log file is located at: " + logFile); + gLogger.debug(""); } catch (Exception e){ gLogger.error("LogUtil.config error: " + e.getMessage()); @@ -72,6 +73,7 @@ public class LogUtil { private String zfile = DIR + File.separator + "log.zip"; + @Override protected Boolean doInBackground(Void... voids) { 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 --- 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); } diff --git a/app/src/main/java/ai/suanzi/rtmpclient/MyService.java b/app/src/main/java/ai/suanzi/rtmpclient/MyService.java index ff2c182..3a21e5e 100644 --- a/app/src/main/java/ai/suanzi/rtmpclient/MyService.java +++ b/app/src/main/java/ai/suanzi/rtmpclient/MyService.java @@ -41,7 +41,7 @@ public class MyService extends Service implements Camera.PreviewCallback, Camer public Camera getCameraInstance() { if (mCamera == null) { - CameraHandlerThread mThread = new CameraHandlerThread("camera thread"); + CameraHandlerThread mThread = new CameraHandlerThread("ThreadCamera"); synchronized (mThread) { mThread.openCamera(); } diff --git a/app/src/main/java/ai/suanzi/rtmpclient/UserInfo.java b/app/src/main/java/ai/suanzi/rtmpclient/UserInfo.java index 404562b..8bb20b9 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; @@ -86,12 +81,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 +124,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 ""; +// } + } -- 2.11.0