X-Git-Url: http://47.100.26.94:8080/?a=blobdiff_plain;ds=sidebyside;f=app%2Fsrc%2Fmain%2Fjava%2Fai%2Fsuanzi%2Frtmpclient%2FMainActivity.java;h=c257b9f97ffcb66b334e0efa1b98d0d954e1975a;hb=a2555d7a8d228c91da9f8014ca4a09dbd0d050ae;hp=abef9c8fb756addc7893ade8f7786bebf794be1b;hpb=6d410bf5e67288660c675d0aa76891eb8367e7cc;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 abef9c8..c257b9f 100644 --- a/app/src/main/java/ai/suanzi/rtmpclient/MainActivity.java +++ b/app/src/main/java/ai/suanzi/rtmpclient/MainActivity.java @@ -1,303 +1,361 @@ package ai.suanzi.rtmpclient; -import android.graphics.ImageFormat; -import android.graphics.SurfaceTexture; +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.os.Bundle; +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.util.List; -import java.io.IOException; -import java.util.concurrent.Executor; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; - - - -public class MainActivity extends AppCompatActivity implements SurfaceHolder.Callback, Camera.PreviewCallback{ - - private static final String TAG = "PENG"; - private Ffmpeg ffmpeg = new Ffmpeg(); - private Camera mCamera ;//= getCameraInstance(); - private StreamTask mStreamTask; - private SurfaceHolder mHolder; - ExecutorService mExecutor = Executors.newSingleThreadExecutor(); - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.activity_main); - Log.e(TAG, "Ffmpeg Version: " + ffmpeg.getVersion()); - - final Button btn = findViewById(R.id.button); - btn.setText("Start"); - btn.setOnClickListener(new View.OnClickListener() { +import java.io.File; +import android.content.Intent; +import de.mindpipe.android.logging.log4j.LogConfigurator; +import org.apache.log4j.Level; +import org.apache.log4j.Logger; +import android.net.wifi.WifiManager; +import android.net.wifi.WifiInfo; +import android.content.ServiceConnection; +import android.content.ComponentName; + +import ai.suanzi.rtmpclient.MyService.LocalBinder; +import android.os.IBinder; +import android.net.ConnectivityManager; +import android.view.ViewGroup; +import org.apache.http.impl.client.HttpClients; +import org.apache.http.impl.client.CloseableHttpClient; +import org.apache.http.client.methods.CloseableHttpResponse; + +//import org.apache.http.client.methods; +import android.view.MotionEvent; +import android.graphics.Color; +import android.os.Build; +import android.content.pm.ActivityInfo; + +public class MainActivity extends AppCompatActivity implements MyService.MyServiceEventListener, CameraView.Callback { + + private Logger gLogger; + private NetworkMonitor networkMonitor; + private UsbMonitor mUsbMonitor; + private ServiceHealthMonitor mServiceHealthMonitor; + private static final int INTERVAL = 3 * 60; // seconds + + boolean mBounded = false; + MyService mServer; + Intent mIntent; + private boolean isFullScreen = false; + + private CameraView mCameraView; + + private void init(){ + + mIntent = new Intent(this, MyService.class); + mUsbMonitor = new UsbMonitor(new UsbMonitor.UsbListener() { @Override - public void onClick(View v) { - Log.e(TAG, "Button " + btn.getText() + " onClick"); - if (mCamera == null) return; - if(btn.getText().equals("Start")){ - mCamera.startPreview(); - Camera.Parameters params = mCamera.getParameters(); - //params.setPreviewFpsRange(30000, 30000); - //params.setPictureSize(320, 240); - //params.setPictureFormat(ImageFormat.NV21); - //mCamera.setParameters(params); - - - - - ffmpeg.init(params.getPictureSize().width, params.getPictureSize().height); - } else { - mCamera.setPreviewCallback(null); - Toast.makeText(MainActivity.this, "encode done", Toast.LENGTH_SHORT).show(); - ffmpeg.flush(); - ffmpeg.close(); + public void onCameraConnected() { + gLogger.error("onCameraConnected, current Usb Camera count: " + mUsbMonitor.getUsbCameraCount()); + doUnbindService(); + if(mUsbMonitor.hasUsbCamera()){ + doBindService(); } - btn.setText(btn.getText().equals("Start") ? "Stop" : "Start"); } - }); - /*this.mCamera = getCameraInstance(); - if(checkCameraHardware(this)) Log.e(TAG, "has cameras: " + Camera.getNumberOfCameras()); -*/ - final SurfaceView surfaceView = findViewById(R.id.surfaceView); - mHolder = surfaceView.getHolder(); - mHolder.addCallback(this); + @Override + public void onCameraDisconnected() { + gLogger.error("onCameraDisconnected, current camera count: " + mUsbMonitor.getUsbCameraCount()); + doUnbindService(); + if(mUsbMonitor.hasUsbCamera()){ + doBindService(); + } + } + }, this); - // - //mCamera.setPreviewCallback(this); + networkMonitor = new NetworkMonitor(new NetworkMonitor.NetworkListener() { + @Override + public void onWifiConnected() { + gLogger.error("onWifiConnected"); + doBindService(); + } - /*try{ - mCamera.setPreviewTexture(st); - }catch (IOException e){ - e.printStackTrace(); - }*/ + @Override + public void onWifiDisconnected() { + gLogger.error("onWifiDisconnected"); + doUnbindService(); + } - final Button btn2 = findViewById(R.id.button2); - btn2.setOnClickListener(new View.OnClickListener(){ @Override - public void onClick(View view){ - Log.e(TAG, "onclick2"); - ffmpeg.play(mHolder.getSurface(),"/storage/sdcard0/output.flv"); + public void onWifiEnabled() { + gLogger.error("onWifiEnabled"); + } + @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); + } - Log.e(TAG, "onclick2"); - //ffmpeg.play(mHolder.getSurface(),"/storage/emulated/0/Movies/output.flv"); - //ffmpeg.play(mHolder.getSurface(),"/data/local/tmp/big_buck_bunny_720p_10mb.mp4"); + ServiceConnection mConnection = new ServiceConnection() { + @Override + public void onServiceDisconnected(ComponentName name) { + Toast.makeText(MainActivity.this, "Service is disconnected", 1000).show(); + gLogger.error("onServiceDisconnected ---------->"); + mBounded = false; + mServer = null; + } - btn2.post(new Runnable(){ - @Override - public void run() { - btn2.performClick(); + @Override + public void onServiceConnected(ComponentName name, IBinder service) { + Toast.makeText(MainActivity.this, "Service is connected", 1000).show(); + gLogger.error("onServiceConnected ---------->"); + mBounded = true; + LocalBinder mLocalBinder = (LocalBinder)service; + mServer = mLocalBinder.getServiceInstance(); + mServer.setServiceEventListener(MainActivity.this); + if(mServer.setRtmpUrl(UserInfo.toUrl())){ + mServer.startPreview(mCameraView.getHolder()); + Camera.Size cs = mServer.getBestPictureSize(); + mCameraView.setLayout(cs.width, cs.height); + } else { + gLogger.error("onServiceConnected - setRtmpUrl failed"); } - }); + } + }; + 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; + } } - //SurfaceTexture st = new SurfaceTexture(0); + 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); +// //getWindow().setNavigationBarColor(Color.TRANSPARENT); +// +// View decorView = getWindow().getDecorView(); +// int uiOptions = View.SYSTEM_UI_FLAG_HIDE_NAVIGATION +// | View.SYSTEM_UI_FLAG_FULLSCREEN; +// decorView.setSystemUiVisibility(uiOptions); +// +// +// ActionBar actionBar = getSupportActionBar(); +// try { +// actionBar.hide(); +// }catch (NullPointerException e){ +// gLogger.error("initCameraView - " + e.getMessage()); +// e.printStackTrace(); +// } + setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);//竖屏 + + + 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); + LogUtil.config(this); + gLogger = Logger.getLogger(getClass()); + gLogger.error("onCreate ---------> "); + UserInfo.readConfig(getExternalFilesDir(null) + File.separator + "config", getMacAddr()); + initCameraView(); + init(); + + if(canStartService()){ + gLogger.error("Current network is available"); + doBindService(); + } else { + gLogger.error("Current network NOT available or no USB Camera connected"); + } + + if(!mServiceHealthMonitor.isAlive()) { + gLogger.debug("mServiceHealthMonitor start, interval " + INTERVAL); + mServiceHealthMonitor.start(); + } + ////////// LogUtil.sendLogs(); /// Log test + //LogUtil.sendLogs(); + // test + //new CheckVersionInfoTask(MainActivity.this).execute(); + } @Override protected void onPause(){ super.onPause(); - Log.e(TAG, "OnPause"); - //ffmpeg.flush(); - //ffmpeg.close(); + gLogger.debug("OnPause --------->"); } @Override protected void onResume() { super.onResume(); - Log.e(TAG, "OnResume"); + gLogger.debug("OnResume ---------> "); } @Override protected void onStop() { super.onStop(); - Log.e(TAG,"onStop"); + gLogger.debug("onStop --------->"); } @Override protected void onStart(){ super.onStart(); - Log.e(TAG,"onStart"); + gLogger.debug("onStart --------->"); } @Override protected void onDestroy(){ super.onDestroy(); - Log.e(TAG,"onDestroy"); + mUsbMonitor.unregisterReceiver(); + unregisterReceiver(networkMonitor); + unbindService(mConnection); + gLogger.debug("onDestroy --------->"); } @Override protected void onRestart(){ - super.onStart(); - Log.e(TAG,"onRestart"); + super.onRestart(); + 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; - } + @Override + public void onBackPressed() { + gLogger.debug("onBackPressed --------->"); + Intent intent = new Intent(Intent.ACTION_MAIN); + intent.addCategory(Intent.CATEGORY_HOME); + intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); + startActivity(intent); } - // SurfaceHolder.Callback implementation @Override - public void surfaceCreated(final SurfaceHolder holder){ - Log.e(TAG,"SurfacedCreated"); - /*try { - mCamera.setPreviewDisplay(holder); - mCamera.startPreview(); - } catch (IOException e) { - Log.d(TAG, "Error setting camera preview: " + e.getMessage()); - }*/ + public boolean onTouchEvent(MotionEvent event) { + if(event.getAction() == MotionEvent.ACTION_UP) { + toggleFullScreen(); + } + return super.onTouchEvent(event); } @Override - public void surfaceChanged(SurfaceHolder holder, int format, int widht, int height){ - Log.e(TAG, "surfaceChanged"); - //if(mCamera==null) return; - //Camera.Parameters parameters=mCamera.getParameters(); - //parameters.setPreviewSize(640,480); - //parameters.setPictureSize(640,480); - //mCamera.setParameters(parameters); - - //try{ - //Thread.sleep(10000); - /*Log.e(TAG, "xxxxxxxxxxxxxx"); - mExecutor.execute(new Runnable() { - @Override - public void run() { - mCamera.startPreview(); - final Button btn = findViewById(R.id.button); - Camera.Parameters params = mCamera.getParameters(); - ffmpeg.init(params.getPictureSize().width, params.getPictureSize().height); - } - });*/ - - //btn.performClick(); - //} catch (InterruptedException e){ - // e.printStackTrace(); - //} + public void onWindowFocusChanged(boolean hasFocus) { + super.onWindowFocusChanged(hasFocus); + if (hasFocus && Build.VERSION.SDK_INT >= 19) { + toggleFullScreen(); + } + } + 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 boolean canStartService(){ - //Camera.Parameters params = mCamera.getParameters(); - //ffmpeg.init(params.getPictureSize().width, params.getPictureSize().height); - /*Thread t = new Thread(new Runnable() { - @Override - public void run() { - ffmpeg.play(mHolder.getSurface(),"/storage/emulated/0/Movies/output.flv"); + if(System.getProperty("os.arch").equals("i686")){ + return true; + } + return mUsbMonitor.hasUsbCamera() && NetworkMonitor.isNetworkAvailable(this); + } - } - });*/ + // MyServiceEventListener + @Override + public void onCameraError(String msg){ + gLogger.error("onCameraEvent " + msg); + //if(mUsbMonitor.hasUsbCamera()){ + //mServer.reopenCamera(); + //} + } + @Override + public void onEncoderError(String msg){ + gLogger.error("onEncoderError: " + msg); + doUnbindService(); + doBindService(); } @Override - public void surfaceDestroyed(SurfaceHolder holder){ - Log.e(TAG, "surfaceDestroyed"); + public void onPublishing(String msg){ + mServiceHealthMonitor.record(); } - private long encodeCount = 0; - private long count = 0; - private long previewTime; - // Camera.PreviewCallback @Override - public void onPreviewFrame(final byte[] data, Camera camera){ - /*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; - } + public void onSurfaceChanged(SurfaceHolder holder, int format, int width, int height){ + if(mServer != null){ + mServer.startPreview(holder); } - mStreamTask = new StreamTask(data); - mStreamTask.execute((Void)null);*/ - - - /*long 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 void restartApplication() { + final Intent intent = getPackageManager().getLaunchIntentForPackage(getPackageName()); + intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP); + startActivity(intent); } - private static Camera getCameraInstance(){ - Camera c = null; - try { - Log.e(TAG, "Open Camera"); - c = Camera.open(0); - Camera.Parameters params = c.getParameters(); - Log.e(TAG, "Camera parameters: " + params.getPreviewSize().width + "x" + params.getPreviewSize().height); - Log.e(TAG, "Preview format (17 is NV21): " + params.getPreviewFormat() + ". Picture format(256 is JPEG): " + params.getPictureFormat()); - List fps = params.getSupportedPreviewFpsRange(); - for(int[] i : fps){ - Log.e(TAG, "### fps range : [" + i[0] + "," + i[1] + "]\n"); - } - - - - Camera.Parameters parameters = c.getParameters(); - - List sizes = parameters.getSupportedPictureSizes(); - for (Camera.Size cc : sizes){ - Log.e(TAG, "=== width: " + cc.width + ". height:" + cc.height); - } - Camera.Size cs = sizes.get(3); - //params.setPreviewSize(cs.width, cs.height); - params.setPictureSize(cs.width, cs.height); - //params.setPictureFormat(ImageFormat.NV21); - c.setParameters(params); + private void toggleFullScreen (){ + View decorView = getWindow().getDecorView(); + if(!isFullScreen) { + decorView.setSystemUiVisibility( + View.SYSTEM_UI_FLAG_LAYOUT_STABLE + | View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION + | View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN + | View.SYSTEM_UI_FLAG_HIDE_NAVIGATION + | View.SYSTEM_UI_FLAG_FULLSCREEN + | View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY); + } else { + decorView.setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_STABLE | View.SYSTEM_UI_FLAG_VISIBLE); } - catch (Exception e){ - e.printStackTrace(); - } - return c; + isFullScreen = !isFullScreen; } - }