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=14b8d5eafa83c7ae75e18af877d2247b1da13242;hb=410441c06aa4257d7d9dcb1b581abb4017c67c50;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..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,24 +48,25 @@ 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 Ffmpeg ffmpeg;
-    private Camera mCamera ;
-    private StreamTask mStreamTask;
+    private static final String TAG = "MainActivity";
+    //private Ffmpeg ffmpeg;
+    //private Camera mCamera ;
+    //private StreamTask mStreamTask;
     private SurfaceHolder mHolder;
     private SurfaceView mSufaceView;
     //private UVCCamera uvcCamera;
-    ExecutorService mExecutor = Executors.newSingleThreadExecutor();
+    //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;
+    //private UsbManager usbManager;
+    //private UsbDevice usbCamera;
 
     private Logger gLogger;
 
@@ -73,7 +75,16 @@ public class MainActivity extends AppCompatActivity implements SurfaceHolder.Cal
     private TextInputEditText mTextUser;
     private TextInputEditText mTextCamera;
     private String mMacAddr = "";
-    private CameraView mCameraView;
+    //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 {
@@ -94,42 +105,74 @@ public class MainActivity extends AppCompatActivity implements SurfaceHolder.Cal
     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();
 
+        this.mMacAddr = getMacAddr();
         mBtnStart = findViewById(R.id.button);
         mTextServer = findViewById(R.id.textServer);
         mTextUser = findViewById(R.id.textUser);
         mTextCamera = findViewById(R.id.textCamera);
-        loadConfig();
-
-        // init service
-        intent.setPackage(this.getPackageName());
-        intent.setAction("ai.suanzi.rtmpclient.service");
-
-        // init surface view
         mSufaceView = findViewById(R.id.surfaceView);
         mHolder = mSufaceView.getHolder();
         mHolder.addCallback(this);
 
-        // camera
-        //mCamera = getCameraInstance();
-        //configCamera(mCamera);
+        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);
     }
 
 
-    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,39 +180,54 @@ 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(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);
         setContentView(R.layout.activity_main);
-        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);
-
-
 
+        init();
+        loadConfig();
 
+        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(){
             @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);
+                gLogger.error("----------> onClick");
                 saveConfig();
+                doUnbindService();
             }
         });
     }
@@ -177,62 +235,40 @@ public class MainActivity extends AppCompatActivity implements SurfaceHolder.Cal
     @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");
+        unregisterReceiver(networkMonitor);
+        gLogger.debug("onDestroy --------->");
     }
 
     @Override
     protected void onRestart(){
-        super.onStart();
-        gLogger.debug("onRestart");
+        super.onRestart();
+        gLogger.debug("onRestart ---------->");
     }
 
-
-    // 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;
-        }
-    }
-
-
-
-
     // SurfaceHolder.Callback implementation
     @Override
     public void surfaceCreated(final SurfaceHolder holder){
@@ -243,127 +279,21 @@ public class MainActivity extends AppCompatActivity implements SurfaceHolder.Cal
     public void surfaceChanged(SurfaceHolder holder, int format, int widht, int height){
         gLogger.error("surfaceChanged");
         mHolder = holder;
-
         if (mServer != null) {
-            mServer.onChange(holder);
+            mServer.startPreview(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");
+    public void surfaceDestroyed(SurfaceHolder holder){ gLogger.debug("surfaceDestroyed");
     }
 
     @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);
-    }
 
     private String getMacAddr() {
         WifiManager manager = (WifiManager) getApplicationContext().getSystemService(Context.WIFI_SERVICE);
@@ -373,11 +303,12 @@ public class MainActivity extends AppCompatActivity implements SurfaceHolder.Cal
 
     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());
+        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(mMacAddr));
     }
 
     private void saveConfig() {
@@ -388,27 +319,103 @@ public class MainActivity extends AppCompatActivity implements SurfaceHolder.Cal
         } 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"});
-
-            Process sh = Runtime.getRuntime().exec("/system/xbin/su", null,null);
-            //Process sh = Runtime.getRuntime().exec("su", null,null);
+    private boolean canStartService(){
+        //gLogger.debug("canStartService - Camera: " + mUsbMonitor.hasUsbCamera() + ". Network: " + NetworkMonitor.isNetworkAvailable());
+        return mUsbMonitor.hasUsbCamera() && NetworkMonitor.isNetworkAvailable(this);
+    }
 
-            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();
+    // MyServiceEventListener
+    @Override
+    public void onCameraError(String msg){
+        gLogger.error("onCameraEvent " + msg);
+    }
 
+    @Override
+    public void onEncoderError(String msg){
+        gLogger.error("onEncoderEvent: " + msg);
+    }
 
-        }catch (Exception e){
-            e.printStackTrace();
-        }
+    @Override
+    public void onIsPreviewing(String msg){
+        gLogger.error("onIsPreviewing: " + msg);
     }
+
+
+//    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"});
+//
+//            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 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);
+//    }
 }