//private static final String TAG = "MainActivity";
private Logger gLogger;
- private String mMacAddr = "";
+ //private String mMacAddr = "";
private NetworkMonitor networkMonitor;
private UsbMonitor mUsbMonitor;
private ServiceHealthMonitor mServiceHealthMonitor;
private CameraView mCameraView;
private void init(){
- // set config file
- UserInfo.setConfigPath(getExternalFilesDir(null) + File.separator + "config");
+ //UserInfo.setConfigPath(getExternalFilesDir(null) + File.separator + "config");
+ //UserInfo.readConfig(getExternalFilesDir(null) + File.separator + "config", getMacAddr());
- this.mMacAddr = getMacAddr();
+
+ //this.mMacAddr = getMacAddr();
mIntent = new Intent(this, MyService.class);
mUsbMonitor = new UsbMonitor(new UsbMonitor.UsbListener() {
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);
LogUtil.config(getExternalFilesDir(null));
gLogger = Logger.getLogger(getClass());
gLogger.error("#######################################");
- //configLog();
+ UserInfo.readConfig(getExternalFilesDir(null) + File.separator + "config", getMacAddr());
initCameraView();
init();
- loadConfig();
-
if(NetworkMonitor.isNetworkAvailable(this) && mUsbMonitor.hasUsbCamera()){
gLogger.error("Current network is available");
gLogger.debug("mServiceHealthMonitor start, interval " + INTERVAL);
mServiceHealthMonitor.start();
}
+ ////////// LogUtil.sendLogs(); /// Log test
}
@Override
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 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();
- }
- gLogger.error("saveConfig - url: " + info.toUrl(mMacAddr));
- }
-
private boolean canStartService(){
return mUsbMonitor.hasUsbCamera() && NetworkMonitor.isNetworkAvailable(this);
}