X-Git-Url: http://47.100.26.94:8080/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fai%2Fsuanzi%2Frtmpclient%2FMainActivity.java;h=a0b4cc1a12877d47c3090d910345b1af8a95abc5;hb=390f2fc2d835c37fb5c078fea795ae28cffc088e;hp=6531b9f4ad090e909e1a0f593c43e86478d9384c;hpb=f8fb13b9804d9b4b6fb227fbd07b80de9b092b55;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 6531b9f..a0b4cc1 100644 --- a/app/src/main/java/ai/suanzi/rtmpclient/MainActivity.java +++ b/app/src/main/java/ai/suanzi/rtmpclient/MainActivity.java @@ -1,42 +1,24 @@ package ai.suanzi.rtmpclient; -import android.app.Activity; -import android.app.PendingIntent; -import android.content.BroadcastReceiver; import android.content.IntentFilter; -import android.graphics.ImageFormat; -import android.graphics.SurfaceTexture; -import android.hardware.usb.UsbDevice; -import android.hardware.usb.UsbManager; -import android.os.Environment; +import android.hardware.Camera; import android.support.design.widget.TextInputEditText; +import android.support.v7.app.ActionBar; import android.support.v7.app.AppCompatActivity; import android.os.Bundle; -import android.text.TextUtils; +import android.util.DisplayMetrics; import android.util.Log; import android.view.SurfaceHolder; -import android.hardware.Camera; import android.view.SurfaceView; import android.view.View; +import android.view.Window; +import android.view.WindowManager; import android.widget.Button; import android.widget.Toast; import android.content.Context; -import android.content.pm.PackageManager; -import android.os.AsyncTask; import java.io.File; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.io.IOException; -import java.util.concurrent.Executor; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; import android.content.Intent; -import java.io.OutputStream; -import android.hardware.usb.UsbManager; -import android.hardware.usb.UsbDeviceConnection; - import de.mindpipe.android.logging.log4j.LogConfigurator; import org.apache.log4j.Level; import org.apache.log4j.Logger; @@ -47,89 +29,99 @@ import android.content.ComponentName; import ai.suanzi.rtmpclient.MyService.LocalBinder; import android.os.IBinder; +import android.net.ConnectivityManager; +import android.view.ViewGroup; -//"rtmp://gpussh.suanzi.ai:1935/myapp/suanzi_ac83f34ead90_cameraid"; - -public class MainActivity extends AppCompatActivity implements SurfaceHolder.Callback, Camera.PreviewCallback{ +//"rtmp://gpussh.suanzi.ai:1935/myapp/suanzi_ac83f34ead90"; - private static final String TAG = "PENG"; - private Ffmpeg ffmpeg; - private Camera mCamera ; - private StreamTask mStreamTask; - private SurfaceHolder mHolder; - private SurfaceView mSufaceView; - //private UVCCamera uvcCamera; - ExecutorService mExecutor = Executors.newSingleThreadExecutor(); - //Intent it = new Intent(getApplicationContext(), MyService.class); - Intent intent = new Intent(); - - private UsbManager usbManager; - private UsbDevice usbCamera; +public class MainActivity extends AppCompatActivity implements MyService.MyServiceEventListener, CameraView.Callback { + //private static final String TAG = "MainActivity"; private Logger gLogger; - private Button mBtnStart; - private TextInputEditText mTextServer; - private TextInputEditText mTextUser; - private TextInputEditText mTextCamera; private String mMacAddr = ""; - private CameraView mCameraView; + private NetworkMonitor networkMonitor; + private UsbMonitor mUsbMonitor; + private ServiceHealthMonitor mServiceHealthMonitor; + private static final int INTERVAL = 3 * 60; // seconds - private void configLog(){ - try { - final LogConfigurator logConfigurator = new LogConfigurator(); - String fname = getExternalFilesDir(null) + File.separator + "log.txt"; - logConfigurator.setFileName(fname); - Log.e(TAG, "Log file is located at: " + fname); - logConfigurator.setRootLevel(Level.DEBUG); - logConfigurator.setLevel("org.apache", Level.ERROR); - logConfigurator.setMaxFileSize(1024 * 1024 * 10); - logConfigurator.configure(); - gLogger = Logger.getLogger(getClass()); - } catch (Exception e){ - e.printStackTrace(); - } - } + boolean mBounded = false; + MyService mServer; + Intent mIntent; + + private CameraView mCameraView; private void init(){ - configLog(); - gLogger.debug("#######################################"); + // set config file UserInfo.setConfigPath(getExternalFilesDir(null) + File.separator + "config"); + this.mMacAddr = getMacAddr(); - ffmpeg = Ffmpeg.getInstance(); - //uvcCamera = new UVCCamera(); + 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(); + } + } - mBtnStart = findViewById(R.id.button); - mTextServer = findViewById(R.id.textServer); - mTextUser = findViewById(R.id.textUser); - mTextCamera = findViewById(R.id.textCamera); - loadConfig(); + @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(); + } - // init service - intent.setPackage(this.getPackageName()); - intent.setAction("ai.suanzi.rtmpclient.service"); + @Override + public void onWifiDisconnected() { + gLogger.error("onWifiDisconnected"); + doUnbindService(); + } - // init surface view - mSufaceView = findViewById(R.id.surfaceView); - mHolder = mSufaceView.getHolder(); - mHolder.addCallback(this); + @Override + public void onWifiEnabled() { + gLogger.error("onWifiEnabled"); + } - // camera - //mCamera = getCameraInstance(); - //configCamera(mCamera); + @Override + public void onWifiDisabled() { + gLogger.error("onWifiDisabled"); + } + }); + IntentFilter filter = new IntentFilter(); + filter.addAction(ConnectivityManager.CONNECTIVITY_ACTION); + registerReceiver(networkMonitor, filter); + mServiceHealthMonitor = new ServiceHealthMonitor(new ServiceHealthMonitor.Callback() { + @Override + public void onNotHealthy() { + gLogger.error("onNotHealthy, in " + INTERVAL + " seconds, the publishing may stopped or have error "); + doUnbindService(); + doBindService(); + } + }); + mServiceHealthMonitor.setInterval(INTERVAL); } - boolean mBounded; - MyService mServer; ServiceConnection mConnection = new ServiceConnection() { @Override public void onServiceDisconnected(ComponentName name) { Toast.makeText(MainActivity.this, "Service is disconnected", 1000).show(); - gLogger.error("onServiceDisconnected"); - + gLogger.error("onServiceDisconnected ---------->"); mBounded = false; mServer = null; } @@ -137,278 +129,198 @@ public class MainActivity extends AppCompatActivity implements SurfaceHolder.Cal @Override public void onServiceConnected(ComponentName name, IBinder service) { Toast.makeText(MainActivity.this, "Service is connected", 1000).show(); - gLogger.error("onServiceConnected"); + gLogger.error("onServiceConnected ---------->"); mBounded = true; LocalBinder mLocalBinder = (LocalBinder)service; mServer = mLocalBinder.getServiceInstance(); - mServer.onChange(mHolder); + mServer.setServiceEventListener(MainActivity.this); + if(mServer.setRtmpUrl(UserInfo.getConfig().toUrl(mMacAddr))){ + mServer.startPreview(mCameraView.getHolder()); + Camera.Size cs = mServer.getBestPictureSize(); + mCameraView.setLayout(cs.width, cs.height); + } + + } }; + private void doBindService(){ + gLogger.debug("doBindService"); + if(!mBounded && canStartService()) { + gLogger.debug("Start service --------->"); + bindService(mIntent, mConnection, BIND_AUTO_CREATE); + } + } + + private void doUnbindService() { + gLogger.debug("doUnbindService"); + if(mBounded){ + gLogger.debug("Stop service <---------"); + unbindService(mConnection); + mBounded = false; + } + } + + private void initCameraView (){ + getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN); + requestWindowFeature(Window.FEATURE_NO_TITLE); + getWindow().setFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON, WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON); + ///setContentView(R.layout.activity_main); + + ActionBar actionBar = getSupportActionBar(); + actionBar.hide(); + + DisplayMetrics outMetrics = new DisplayMetrics(); + this.getWindowManager().getDefaultDisplay().getMetrics(outMetrics); + + CameraView.SCREEN_WIDTH = outMetrics.widthPixels; + CameraView.SCREEN_HEIGHT = outMetrics.heightPixels; + gLogger.debug("Screen size is w: " + CameraView.SCREEN_WIDTH + ", h: " + CameraView.SCREEN_HEIGHT); + + + + mCameraView = new CameraView(getApplicationContext(), this); + setContentView(R.layout.activity_main); + + ViewGroup.LayoutParams lp = new ViewGroup.LayoutParams(640, 480); + addContentView(mCameraView, lp); + //setContentView(mCameraView); + } @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - setContentView(R.layout.activity_main); + LogUtil.config(getExternalFilesDir(null)); + gLogger = Logger.getLogger(getClass()); + gLogger.error("#######################################"); + //configLog(); + initCameraView(); init(); - //mCameraView = new CameraView(this); - //intent.putExtra("url", "xxxxxxxxxxxxxxxxxx"); - //intent.putExtra("view", mCameraView); - - //startService(intent); - Intent mIntent = new Intent(this, MyService.class); - bindService(mIntent, mConnection, BIND_AUTO_CREATE); - - + loadConfig(); + if(NetworkMonitor.isNetworkAvailable(this) && mUsbMonitor.hasUsbCamera()){ + gLogger.error("Current network is available"); + doBindService(); + } else { + gLogger.error("Current network NOT available or no USB Camera connected"); + } - mBtnStart.setOnClickListener(new View.OnClickListener(){ - @Override - public void onClick(View view){ - String url = mTextServer.getText().toString() + "/" + mTextUser.getText().toString() + "_" + mMacAddr + "_" + mTextCamera.getText().toString(); - gLogger.error("----------> onClick, Url is: " + url); - intent.putExtra("url", url); - startService(intent); - saveConfig(); - } - }); + if(!mServiceHealthMonitor.isAlive()) { + gLogger.debug("mServiceHealthMonitor start, interval " + INTERVAL); + mServiceHealthMonitor.start(); + } } @Override protected void onPause(){ super.onPause(); - gLogger.debug("OnPause"); + gLogger.error("OnPause --------->"); } @Override protected void onResume() { super.onResume(); - gLogger.debug("OnResume"); + gLogger.error("OnResume ---------> "); } @Override protected void onStop() { super.onStop(); - gLogger.debug("onStop"); + gLogger.debug("onStop --------->"); } @Override protected void onStart(){ super.onStart(); - gLogger.debug("onStart"); + gLogger.debug("onStart --------->"); } @Override protected void onDestroy(){ super.onDestroy(); - gLogger.debug("onDestroy"); + mUsbMonitor.unregisterReceiver(); + unregisterReceiver(networkMonitor); + unbindService(mConnection); + gLogger.debug("onDestroy --------->"); } @Override protected void onRestart(){ - super.onStart(); - gLogger.debug("onRestart"); - } - - - // class StreamTask AsyncTask - private class StreamTask extends AsyncTask{ - private byte[] data; - - StreamTask(byte[] data){ - this.data = data; - } - - @Override - protected Void doInBackground(Void... params) { - - if (this.data != null){ - Log.e(TAG, "fps: " + mCamera.getParameters().getPreviewFrameRate()); - ffmpeg.process(this.data); - } - return null; - } - } - - - - - // SurfaceHolder.Callback implementation - @Override - public void surfaceCreated(final SurfaceHolder holder){ - gLogger.error("SurfacedCreated"); - } - - @Override - public void surfaceChanged(SurfaceHolder holder, int format, int widht, int height){ - gLogger.error("surfaceChanged"); - mHolder = holder; - - if (mServer != null) { - mServer.onChange(holder); - } - - /* final SurfaceHolder hh = holder; - Thread tr = new Thread(new Runnable() { - @Override - public void run() { - try { - Thread.sleep(3000); - } catch (Exception e){ - e.printStackTrace(); - } - if (mServer != null) { - gLogger.error("onChange"); - mServer.onChange(hh); - }else { - gLogger.error("service XXXXXXXXXXXXXXX"); - } - - } - }); - tr.run();*/ - - - /* - try { - mCamera.setPreviewDisplay(holder); - mCamera.startPreview(); - } catch (Exception e){ - gLogger.error("Error starting camera previewe: " + e.getMessage()); - Toast.makeText(this, "Camera Error: " + e.getMessage(), Toast.LENGTH_LONG).show(); - } - */ - } - - @Override - public void surfaceDestroyed(SurfaceHolder holder){ - Log.e(TAG, "surfaceDestroyed"); + super.onRestart(); + gLogger.debug("onRestart ---------->"); } @Override - public void onPreviewFrame(final byte[] data, Camera camera){ - gLogger.error("onPreviewFrame"); - /*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;*/ - - } - - // private - private boolean checkCameraHardware(Context context) { - return context.getPackageManager().hasSystemFeature(PackageManager.FEATURE_CAMERA); - } - - 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); + public void onBackPressed() { + gLogger.error("onBackPressed --------->"); + Intent intent = new Intent(Intent.ACTION_MAIN); + intent.addCategory(Intent.CATEGORY_HOME); + intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); + startActivity(intent); } private String getMacAddr() { WifiManager manager = (WifiManager) getApplicationContext().getSystemService(Context.WIFI_SERVICE); WifiInfo info = manager.getConnectionInfo(); + gLogger.debug("Mac Address is " + info.getMacAddress()); return info.getMacAddress().replace(":", ""); //02:00:00:00:00:00 - 020000000000 } private void loadConfig() { - UserInfo info = UserInfo.getConfig(); - mTextServer.setText(info.server.equals("") ? "rtmp://gpussh.suanzi.ai:1935/myapp" : info.server); - mTextUser.setText(info.user.equals("") ? "suanzi" : info.user ); - mTextCamera.setText(info.cameraId.equals("") ? "001" : info.cameraId); - mMacAddr = info.macAddr.equals("") ? this.mMacAddr : info.macAddr; - gLogger.debug("loadConfig " + info.toString()); +// 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()); + //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: " + info.toString()); + 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"}); + private boolean canStartService(){ + return mUsbMonitor.hasUsbCamera() && NetworkMonitor.isNetworkAvailable(this); + } - Process sh = Runtime.getRuntime().exec("/system/xbin/su", null,null); - //Process sh = Runtime.getRuntime().exec("su", null,null); + // MyServiceEventListener + @Override + public void onCameraError(String msg){ + gLogger.error("onCameraEvent " + msg); + //if(mUsbMonitor.hasUsbCamera()){ + //mServer.reopenCamera(); + //} + } - 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(); + @Override + public void onEncoderError(String msg){ + gLogger.error("onEncoderError: " + msg); + doUnbindService(); + doBindService(); + } + @Override + public void onPublishing(String msg){ + mServiceHealthMonitor.record(); + } - }catch (Exception e){ - e.printStackTrace(); + @Override + public void onSurfaceChanged(SurfaceHolder holder, int format, int width, int height){ + if(mServer != null){ + mServer.startPreview(holder); } } + + private void restartApplication() { + final Intent intent = getPackageManager().getLaunchIntentForPackage(getPackageName()); + intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP); + startActivity(intent); + } }