versionName "v0.3.2"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
buildConfigField "String", "GIT_REVISION", "\"${getGitVersion()}\""
+ buildConfigField "String", "COMPANY", "\"suanzi.ai\""
sourceSets.main {
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;
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());
private String zfile = DIR + File.separator + "log.zip";
+
@Override
protected Boolean doInBackground(Void... voids) {
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;
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 {
mServiceHealthMonitor.start();
}
////////// LogUtil.sendLogs(); /// Log test
+ //LogUtil.sendLogs();
}
@Override
}
private boolean canStartService(){
+
+ if(System.getProperty("os.arch").equals("i686")){
+ return true;
+ }
return mUsbMonitor.hasUsbCamera() && NetworkMonitor.isNetworkAvailable(this);
}
public Camera getCameraInstance() {
if (mCamera == null) {
- CameraHandlerThread mThread = new CameraHandlerThread("camera thread");
+ CameraHandlerThread mThread = new CameraHandlerThread("ThreadCamera");
synchronized (mThread) {
mThread.openCamera();
}
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;
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();
}
- 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 "";
+// }
+
}