X-Git-Url: http://47.100.26.94:8080/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fai%2Fsuanzi%2Frtmpclient%2FMainActivity.java;h=14b8d5eafa83c7ae75e18af877d2247b1da13242;hb=410441c06aa4257d7d9dcb1b581abb4017c67c50;hp=708ed3c8923156923bcabde439a14939e0488333;hpb=8af8da070650175d3a35a840fbd339ee572d144f;p=rtmpclient.git diff --git a/app/src/main/java/ai/suanzi/rtmpclient/MainActivity.java b/app/src/main/java/ai/suanzi/rtmpclient/MainActivity.java index 708ed3c..14b8d5e 100644 --- a/app/src/main/java/ai/suanzi/rtmpclient/MainActivity.java +++ b/app/src/main/java/ai/suanzi/rtmpclient/MainActivity.java @@ -10,6 +10,7 @@ import android.hardware.usb.UsbDevice; import android.hardware.usb.UsbManager; import android.os.Environment; import android.support.design.widget.TextInputEditText; +import android.support.v4.content.LocalBroadcastManager; import android.support.v7.app.AppCompatActivity; import android.os.Bundle; import android.text.TextUtils; @@ -47,12 +48,13 @@ import android.content.ComponentName; import ai.suanzi.rtmpclient.MyService.LocalBinder; import android.os.IBinder; +import android.net.ConnectivityManager; //"rtmp://gpussh.suanzi.ai:1935/myapp/suanzi_ac83f34ead90_cameraid"; -public class MainActivity extends AppCompatActivity implements SurfaceHolder.Callback, Camera.PreviewCallback{ +public class MainActivity extends AppCompatActivity implements SurfaceHolder.Callback, Camera.PreviewCallback, MyService.MyServiceEventListener{ - private static final String TAG = "PENG"; + private static final String TAG = "MainActivity"; //private Ffmpeg ffmpeg; //private Camera mCamera ; //private StreamTask mStreamTask; @@ -61,7 +63,7 @@ public class MainActivity extends AppCompatActivity implements SurfaceHolder.Cal //private UVCCamera uvcCamera; //ExecutorService mExecutor = Executors.newSingleThreadExecutor(); //Intent it = new Intent(getApplicationContext(), MyService.class); - Intent intent = new Intent(); + //Intent intent = new Intent(); //private UsbManager usbManager; //private UsbDevice usbCamera; @@ -75,11 +77,15 @@ public class MainActivity extends AppCompatActivity implements SurfaceHolder.Cal private String mMacAddr = ""; //private CameraView mCameraView; private String mRtmpUrl; + private NetworkMonitor networkMonitor; + private UsbMonitor mUsbMonitor; boolean mBounded; MyService mServer; Intent mIntent; + // private ServiceReceiver mServiceReceiver; + private void configLog(){ try { final LogConfigurator logConfigurator = new LogConfigurator(); @@ -111,9 +117,54 @@ public class MainActivity extends AppCompatActivity implements SurfaceHolder.Cal mHolder = mSufaceView.getHolder(); mHolder.addCallback(this); + mIntent = new Intent(this, MyService.class); + mUsbMonitor = new UsbMonitor(new UsbMonitor.UsbListener() { + @Override + public void onCameraConnected() { + gLogger.error("onCameraConnected, current Usb Camera count: " + mUsbMonitor.getUsbCameraCount()); + doUnbindService(); + if(mUsbMonitor.hasUsbCamera()){ + doBindService(); + } + } + + @Override + public void onCameraDisconnected() { + gLogger.error("onCameraDisconnected, current camera count: " + mUsbMonitor.getUsbCameraCount()); + doUnbindService(); + if(mUsbMonitor.hasUsbCamera()){ + doBindService(); + } + + } + }, this); + + networkMonitor = new NetworkMonitor(new NetworkMonitor.NetworkListener() { + @Override + public void onWifiConnected() { + gLogger.error("onWifiConnected"); + doBindService(); + } + + @Override + public void onWifiDisconnected() { + gLogger.error("onWifiDisconnected"); + doUnbindService(); + } + + @Override + public void onWifiEnabled() { + gLogger.error("onWifiEnabled"); + } - //intent.setPackage(this.getPackageName()); // init service - //intent.setAction("ai.suanzi.rtmpclient.service"); + @Override + public void onWifiDisabled() { + gLogger.error("onWifiDisabled"); + } + }); + IntentFilter filter = new IntentFilter(); + filter.addAction(ConnectivityManager.CONNECTIVITY_ACTION); + registerReceiver(networkMonitor, filter); } @@ -133,13 +184,28 @@ public class MainActivity extends AppCompatActivity implements SurfaceHolder.Cal mBounded = true; LocalBinder mLocalBinder = (LocalBinder)service; mServer = mLocalBinder.getServiceInstance(); - if(mServer.setRtmpUrl(UserInfo.getConfig().toUrl())){ + mServer.setServiceEventListener(MainActivity.this); + if(mServer.setRtmpUrl(UserInfo.getConfig().toUrl(mMacAddr))){ mServer.startPreview(mHolder); } - } }; + private void doBindService(){ + if(!mBounded && canStartService()) { + gLogger.debug("doBindService"); + bindService(mIntent, mConnection, BIND_AUTO_CREATE); + } + } + + private void doUnbindService() { + if(mBounded){ + gLogger.debug("doUnbindService"); + unbindService(mConnection); + mBounded = false; + } + } + @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -148,10 +214,12 @@ public class MainActivity extends AppCompatActivity implements SurfaceHolder.Cal init(); loadConfig(); - //startService(intent); - mIntent = new Intent(this, MyService.class); - bindService(mIntent, mConnection, BIND_AUTO_CREATE); - + if(NetworkMonitor.isNetworkAvailable(this) && mUsbMonitor.hasUsbCamera()){ + gLogger.error("Current network is available"); + doBindService(); + } else { + gLogger.error("Current network is NOT available"); + } mBtnStart.setText("start"); mBtnStart.setOnClickListener(new View.OnClickListener(){ @@ -159,8 +227,7 @@ public class MainActivity extends AppCompatActivity implements SurfaceHolder.Cal public void onClick(View view){ gLogger.error("----------> onClick"); saveConfig(); - unbindService(mConnection); - bindService(mIntent, mConnection, BIND_AUTO_CREATE); + doUnbindService(); } }); } @@ -192,6 +259,7 @@ public class MainActivity extends AppCompatActivity implements SurfaceHolder.Cal @Override protected void onDestroy(){ super.onDestroy(); + unregisterReceiver(networkMonitor); gLogger.debug("onDestroy --------->"); } @@ -201,9 +269,6 @@ public class MainActivity extends AppCompatActivity implements SurfaceHolder.Cal gLogger.debug("onRestart ---------->"); } - - - // SurfaceHolder.Callback implementation @Override public void surfaceCreated(final SurfaceHolder holder){ @@ -238,11 +303,12 @@ public class MainActivity extends AppCompatActivity implements SurfaceHolder.Cal private void loadConfig() { UserInfo info = UserInfo.getConfig(); - mTextServer.setText(info.server); + gLogger.error("server is:" + info.server); + mTextServer.setText(info.server.equals("") ? "rtmp://gpussh.suanzi.ai:1935/myapp" : info.server); mTextUser.setText(info.user); mTextCamera.setText(info.cameraId); //mMacAddr = info.macAddr.equals("") ? this.mMacAddr : info.macAddr; - gLogger.error("loadConfig - url is :" + info.toUrl()); + gLogger.error("loadConfig - url is :" + info.toUrl(mMacAddr)); } private void saveConfig() { @@ -253,124 +319,103 @@ public class MainActivity extends AppCompatActivity implements SurfaceHolder.Cal } else { Toast.makeText(getApplicationContext(), "Error: config saved", Toast.LENGTH_LONG).show(); } - gLogger.error("saveConfig - url: " + info.toUrl()); + gLogger.error("saveConfig - url: " + info.toUrl(mMacAddr)); } - private void changePermission(){ - try { - Log.e(TAG, "change permission"); - //Process sh = Runtime.getRuntime().exec(new String[]{"su", "-c", "chmod 666 /dev/video0"}); - - Process sh = Runtime.getRuntime().exec("/system/xbin/su", null,null); - //Process sh = Runtime.getRuntime().exec("su", null,null); - - OutputStream os = sh.getOutputStream(); - os.write(("/system/bin/chmod 666 /dev/video0").getBytes("ASCII")); - //os.write(("/system/bin/echo 'wowo' >> /data/local/test").getBytes("ASCII")); - os.flush(); - os.close(); - sh.waitFor(); - - - }catch (Exception e){ - e.printStackTrace(); - } + private boolean canStartService(){ + //gLogger.debug("canStartService - Camera: " + mUsbMonitor.hasUsbCamera() + ". Network: " + NetworkMonitor.isNetworkAvailable()); + return mUsbMonitor.hasUsbCamera() && NetworkMonitor.isNetworkAvailable(this); } - private boolean checkCameraHardware(Context context) { - return context.getPackageManager().hasSystemFeature(PackageManager.FEATURE_CAMERA); + // MyServiceEventListener + @Override + public void onCameraError(String msg){ + gLogger.error("onCameraEvent " + msg); } - private static Camera getCameraInstance(){ - Camera c = null; - try { - Log.e(TAG, "Open Camera"); - c = Camera.open(1); - } catch (Exception e){ - e.printStackTrace(); - } - return c; + @Override + public void onEncoderError(String msg){ + gLogger.error("onEncoderEvent: " + msg); } - private void configCamera(Camera camera){ - Camera.Parameters paras = camera.getParameters(); - gLogger.error("Supported Picture Sizes:"); - for (Camera.Size cc : paras.getSupportedPictureSizes()){ - gLogger.error(cc.width + "x" + cc.height); - } - gLogger.error("Supported Preview fps range:"); - for(int[] i : paras.getSupportedPreviewFpsRange()){ - gLogger.error("[" + i[0] + "," + i[1] + "]"); - } - gLogger.error("Set parameters"); - camera.setParameters(paras); - camera.setDisplayOrientation(0); - gLogger.error("Preview Format: " + paras.getPreviewFormat() + ". Size: " + paras.getPreviewSize().width + "x" + paras.getPreviewSize().height); - gLogger.error("Picture Format: " + paras.getPictureFormat() + ". Size: " + paras.getPictureSize().width + "x" + paras.getPictureSize().height); - - try { - camera.setPreviewDisplay(mHolder); - } catch (IOException e){ - e.printStackTrace(); - } - //camera.setPreviewCallback(this); + @Override + public void onIsPreviewing(String msg){ + gLogger.error("onIsPreviewing: " + msg); } - private void switchToBackground(){ - Intent i = new Intent(); - i.setAction(Intent.ACTION_MAIN); - i.addCategory(Intent.CATEGORY_HOME); - this.startActivity(i); - } +// class ServiceReceiver extends BroadcastReceiver{ +// @Override +// public void onReceive(Context context, Intent intent) { +// String value = intent.getStringExtra("extra_data"); +// gLogger.error("ServiceReceiver onReceive - " + value); +// } +// } + +// private void changePermission(){ +// try { +// Log.e(TAG, "change permission"); +// //Process sh = Runtime.getRuntime().exec(new String[]{"su", "-c", "chmod 666 /dev/video0"}); // -// // class StreamTask AsyncTask -// private class StreamTask extends AsyncTask{ -// private byte[] data; +// Process sh = Runtime.getRuntime().exec("/system/xbin/su", null,null); +// //Process sh = Runtime.getRuntime().exec("su", null,null); // -// StreamTask(byte[] data){ -// this.data = data; +// OutputStream os = sh.getOutputStream(); +// os.write(("/system/bin/chmod 666 /dev/video0").getBytes("ASCII")); +// //os.write(("/system/bin/echo 'wowo' >> /data/local/test").getBytes("ASCII")); +// os.flush(); +// os.close(); +// sh.waitFor(); +// +// +// }catch (Exception e){ +// e.printStackTrace(); // } +// } // -// @Override -// protected Void doInBackground(Void... params) { +// private boolean checkCameraHardware(Context context) { +// return context.getPackageManager().hasSystemFeature(PackageManager.FEATURE_CAMERA); +// } // -// if (this.data != null){ -// Log.e(TAG, "fps: " + mCamera.getParameters().getPreviewFrameRate()); -// ffmpeg.process(this.data); -// } -// return null; +// private static Camera getCameraInstance(){ +// Camera c = null; +// try { +// Log.e(TAG, "Open Camera"); +// c = Camera.open(1); +// } catch (Exception e){ +// e.printStackTrace(); // } +// return c; +// } +// +// private void configCamera(Camera camera){ +// Camera.Parameters paras = camera.getParameters(); +// gLogger.error("Supported Picture Sizes:"); +// for (Camera.Size cc : paras.getSupportedPictureSizes()){ +// gLogger.error(cc.width + "x" + cc.height); +// } +// gLogger.error("Supported Preview fps range:"); +// for(int[] i : paras.getSupportedPreviewFpsRange()){ +// gLogger.error("[" + i[0] + "," + i[1] + "]"); +// } +// gLogger.error("Set parameters"); +// camera.setParameters(paras); +// camera.setDisplayOrientation(0); +// gLogger.error("Preview Format: " + paras.getPreviewFormat() + ". Size: " + paras.getPreviewSize().width + "x" + paras.getPreviewSize().height); +// gLogger.error("Picture Format: " + paras.getPictureFormat() + ". Size: " + paras.getPictureSize().width + "x" + paras.getPictureSize().height); +// +// try { +// camera.setPreviewDisplay(mHolder); +// } catch (IOException e){ +// e.printStackTrace(); +// } +// //camera.setPreviewCallback(this); +// } +// +// private void switchToBackground(){ +// Intent i = new Intent(); +// i.setAction(Intent.ACTION_MAIN); +// i.addCategory(Intent.CATEGORY_HOME); +// this.startActivity(i); // } - - /*if (null != mStreamTask){ - switch (mStreamTask.getStatus()){ - case RUNNING: - Log.e(TAG, "onPreviewFrame Running"); - return; - case PENDING: - Log.e(TAG,"OnPreviewFrame Pending"); - mStreamTask.cancel(false); - break; - } - } - mStreamTask = new StreamTask(data); - mStreamTask.execute((Void)null); -*/ - -// ong endTime = System.currentTimeMillis(); -// mExecutor.execute(new Runnable() { -// @Override -// public void run() { -// //long encodeTime = System.currentTimeMillis(); -// ffmpeg.process(data); - //Log.e(TAG, "编码第:" + (encodeCount++) + "帧，耗时:" + (System.currentTimeMillis() - encodeTime)); -// } -// }); - //Log.e(TAG, "采集第:" + (++count) + "帧，距上一帧间隔时间:" -// + (endTime - previewTime) + " " + Thread.currentThread().getName()); -// previewTime = endTime;*/ - - - }