projects
/
rtmpclient.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix bug when update.json file not exist
[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
c1beb4f
..
33ac4a6
100644
(file)
--- 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.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;
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;
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 {
public class MainActivity extends AppCompatActivity implements MyService.MyServiceEventListener, CameraView.Callback {
- //private static final String TAG = "MainActivity";
private Logger gLogger;
private Logger gLogger;
-
- //private String mMacAddr = "";
private NetworkMonitor networkMonitor;
private UsbMonitor mUsbMonitor;
private ServiceHealthMonitor mServiceHealthMonitor;
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(){
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() {
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);
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
- LogUtil.config(
getExternalFilesDir(null)
);
+ LogUtil.config(
this
);
gLogger = Logger.getLogger(getClass());
gLogger = Logger.getLogger(getClass());
- gLogger.error("
#######################################
");
+ gLogger.error("
onCreate --------->
");
UserInfo.readConfig(getExternalFilesDir(null) + File.separator + "config", getMacAddr());
initCameraView();
init();
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 {
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
mServiceHealthMonitor.start();
}
////////// LogUtil.sendLogs(); /// Log test
+ //LogUtil.sendLogs();
+
+ new CheckVersionInfoTask(MainActivity.this).execute();
}
@Override
}
@Override
@@
-267,6
+261,10
@@
public class MainActivity extends AppCompatActivity implements MyService.MyServi
}
private boolean canStartService(){
}
private boolean canStartService(){
+
+ if(System.getProperty("os.arch").equals("i686")){
+ return true;
+ }
return mUsbMonitor.hasUsbCamera() && NetworkMonitor.isNetworkAvailable(this);
}
return mUsbMonitor.hasUsbCamera() && NetworkMonitor.isNetworkAvailable(this);
}