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=488650186b987453dafc7eb85862708f8437954c;hpb=effab912d57394ec776ffc03d6c969866c70cdf9;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 4886501..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,73 +29,91 @@ 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";
+//"rtmp://gpussh.suanzi.ai:1935/myapp/suanzi_ac83f34ead90";
 
-public class MainActivity extends AppCompatActivity implements SurfaceHolder.Callback, Camera.PreviewCallback{
-
-    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 String mRtmpUrl;
+    private NetworkMonitor networkMonitor;
+    private UsbMonitor mUsbMonitor;
+    private ServiceHealthMonitor mServiceHealthMonitor;
+    private static final int INTERVAL = 3 * 60; // seconds
 
-    boolean mBounded;
+    boolean mBounded = false;
     MyService mServer;
     Intent mIntent;
 
-    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();
-        }
-    }
+    private CameraView mCameraView;
 
     private void init(){
-        configLog();
-        gLogger.debug("#######################################");
         // set config file
         UserInfo.setConfigPath(getExternalFilesDir(null) + File.separator + "config");
 
         this.mMacAddr = getMacAddr();
-        mBtnStart = findViewById(R.id.button);
-        mTextServer = findViewById(R.id.textServer);
-        mTextUser = findViewById(R.id.textUser);
-        mTextCamera = findViewById(R.id.textCamera);
-        mSufaceView = findViewById(R.id.surfaceView);
-        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");
+            }
+
+            @Override
+            public void onWifiDisabled() {
+                gLogger.error("onWifiDisabled");
+            }
+        });
+        IntentFilter filter = new IntentFilter();
+        filter.addAction(ConnectivityManager.CONNECTIVITY_ACTION);
+        registerReceiver(networkMonitor, filter);
 
-        //intent.setPackage(this.getPackageName());   // init service
-        //intent.setAction("ai.suanzi.rtmpclient.service");
+        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);
     }
 
 
@@ -133,36 +133,82 @@ public class MainActivity extends AppCompatActivity implements SurfaceHolder.Cal
             mBounded = true;
             LocalBinder mLocalBinder = (LocalBinder)service;
             mServer = mLocalBinder.getServiceInstance();
-            if(mServer.setRtmpUrl(UserInfo.getConfig().toUrl())){
-                mServer.startPreview(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();
         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 NOT available or no USB Camera connected");
+        }
 
-        mBtnStart.setText("start");
-        mBtnStart.setOnClickListener(new View.OnClickListener(){
-            @Override
-            public void onClick(View view){
-                gLogger.error("----------> onClick");
-                saveConfig();
-                unbindService(mConnection);
-                bindService(mIntent, mConnection, BIND_AUTO_CREATE);
-            }
-        });
+        if(!mServiceHealthMonitor.isAlive()) {
+            gLogger.debug("mServiceHealthMonitor start, interval " + INTERVAL);
+            mServiceHealthMonitor.start();
+        }
     }
 
     @Override
@@ -192,6 +238,9 @@ public class MainActivity extends AppCompatActivity implements SurfaceHolder.Cal
     @Override
     protected void onDestroy(){
         super.onDestroy();
+        mUsbMonitor.unregisterReceiver();
+        unregisterReceiver(networkMonitor);
+        unbindService(mConnection);
         gLogger.debug("onDestroy --------->");
     }
 
@@ -201,177 +250,77 @@ public class MainActivity extends AppCompatActivity implements SurfaceHolder.Cal
         gLogger.debug("onRestart ---------->");
     }
 
-
-
-
-    // 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.startPreview(holder);
-        }
-    }
-
-    @Override
-    public void surfaceDestroyed(SurfaceHolder holder){ gLogger.debug("surfaceDestroyed");
-    }
-
     @Override
-    public void  onPreviewFrame(final byte[] data, Camera camera){
-        gLogger.error("onPreviewFrame");
-
+    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();
-        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());
+//        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 - 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();
-
+    private boolean canStartService(){
+        return mUsbMonitor.hasUsbCamera() && NetworkMonitor.isNetworkAvailable(this);
+    }
 
-        }catch (Exception e){
-            e.printStackTrace();
-        }
+    // MyServiceEventListener
+    @Override
+    public void onCameraError(String msg){
+        gLogger.error("onCameraEvent " + msg);
+        //if(mUsbMonitor.hasUsbCamera()){
+            //mServer.reopenCamera();
+        //}
     }
 
-    private boolean checkCameraHardware(Context context) {
-        return context.getPackageManager().hasSystemFeature(PackageManager.FEATURE_CAMERA);
+    @Override
+    public void onEncoderError(String msg){
+        gLogger.error("onEncoderError: " + msg);
+        doUnbindService();
+        doBindService();
     }
 
-    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 onPublishing(String msg){
+        mServiceHealthMonitor.record();
     }
 
-    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();
+    @Override
+    public void onSurfaceChanged(SurfaceHolder holder, int format, int width, int height){
+        if(mServer != null){
+            mServer.startPreview(holder);
         }
-        //camera.setPreviewCallback(this);
     }
 
-    private void switchToBackground(){
-        Intent i = new Intent();
-        i.setAction(Intent.ACTION_MAIN);
-        i.addCategory(Intent.CATEGORY_HOME);
-        this.startActivity(i);
+    private void restartApplication() {
+        final Intent intent = getPackageManager().getLaunchIntentForPackage(getPackageName());
+        intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+        startActivity(intent);
     }
-
-//
-//    // class StreamTask AsyncTask
-//    private class StreamTask extends AsyncTask<Void, Void, Void>{
-//        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;
-//        }
-//    }
-
-            /*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;*/
-
-
-
 }