X-Git-Url: http://47.100.26.94:8080/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fai%2Fsuanzi%2Frtmpclient%2FMainActivity.java;h=6531b9f4ad090e909e1a0f593c43e86478d9384c;hb=f8fb13b9804d9b4b6fb227fbd07b80de9b092b55;hp=cd426373bc327e048e3100b7c4186c0425e57000;hpb=a85b59e50709ca043c1464d3456dcd1abee84b8c;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 cd42637..6531b9f 100644
--- a/app/src/main/java/ai/suanzi/rtmpclient/MainActivity.java
+++ b/app/src/main/java/ai/suanzi/rtmpclient/MainActivity.java
@@ -1,9 +1,18 @@
 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.support.design.widget.TextInputEditText;
 import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
+import android.text.TextUtils;
 import android.util.Log;
 import android.view.SurfaceHolder;
 import android.hardware.Camera;
@@ -14,159 +23,194 @@ 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;
+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;
 
+//"rtmp://gpussh.suanzi.ai:1935/myapp/suanzi_ac83f34ead90_cameraid";
 
 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 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();
 
-    @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() {
-            @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();
-                }
-                btn.setText(btn.getText().equals("Start") ? "Stop" : "Start");
-            }
-        });
+    private UsbManager usbManager;
+    private UsbDevice usbCamera;
 
-        /*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);
+    private Logger gLogger;
 
-        //
-        //mCamera.setPreviewCallback(this);
+    private Button mBtnStart;
+    private TextInputEditText mTextServer;
+    private TextInputEditText mTextUser;
+    private TextInputEditText mTextCamera;
+    private String mMacAddr = "";
+    private CameraView mCameraView;
 
-        /*try{
-            mCamera.setPreviewTexture(st);
-        }catch (IOException e){
+    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();
-        }*/
+        }
+    }
 
-        final Button btn2 = findViewById(R.id.button);
-        btn2.setOnClickListener(new View.OnClickListener(){
-            @Override
-            public void onClick(View view){
-                Log.e(TAG, "onclick2");
-                //ffmpeg.play(mHolder.getSurface(),"/storage/sdcard0/output.flv");
-                ffmpeg.push(mHolder.getSurface());
-                //ffmpeg.preview(mHolder.getSurface());
+    private void init(){
+        configLog();
+        gLogger.debug("#######################################");
+        UserInfo.setConfigPath(getExternalFilesDir(null) + File.separator + "config");
+        this.mMacAddr = getMacAddr();
 
-            }
+        ffmpeg = Ffmpeg.getInstance();
+        //uvcCamera = new UVCCamera();
 
-        });
+        mBtnStart = findViewById(R.id.button);
+        mTextServer = findViewById(R.id.textServer);
+        mTextUser = findViewById(R.id.textUser);
+        mTextCamera = findViewById(R.id.textCamera);
+        loadConfig();
 
-        Log.e(TAG, "onclick2");
-        /*
-        try {
-            Log.e(TAG, "Run command");
-            Process sh = Runtime.getRuntime().exec(new String[]{"su", "-c", "chmod 666 /dev/video0"});
-            sh.waitFor();
-        }catch (Exception e){
-            e.printStackTrace();
-        }*/
+        // 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);
 
+    }
 
 
-        btn2.post(new Runnable(){
-            @Override
-            public void run() {
-                btn2.performClick();
-            }
-        });
+    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");
 
+            mBounded = false;
+            mServer = null;
+        }
 
-        Intent i = new Intent();
-        i.setAction(Intent.ACTION_MAIN);
-        i.addCategory(Intent.CATEGORY_HOME);
-        this.startActivity(i);
+        @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.onChange(mHolder);
+        }
+    };
+
+    @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);
 
 
-    }
 
-    //SurfaceTexture st = new SurfaceTexture(0);
 
 
+        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();
+            }
+        });
+    }
+
     @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");
+        gLogger.debug("onDestroy");
     }
 
     @Override
     protected void onRestart(){
         super.onStart();
-        Log.e(TAG,"onRestart");
+        gLogger.debug("onRestart");
     }
 
+
     // class StreamTask AsyncTask
     private class StreamTask extends AsyncTask<Void, Void, Void>{
         private byte[] data;
@@ -186,57 +230,54 @@ public class MainActivity extends AppCompatActivity implements SurfaceHolder.Cal
         }
     }
 
+
+
+
     // 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());
-        }*/
+        gLogger.error("SurfacedCreated");
     }
 
     @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();
-        //}
-
+        gLogger.error("surfaceChanged");
+        mHolder = holder;
 
+        if (mServer != null) {
+            mServer.onChange(holder);
+        }
 
-        //Camera.Parameters params = mCamera.getParameters();
-        //ffmpeg.init(params.getPictureSize().width, params.getPictureSize().height);
-        /*Thread t = new Thread(new Runnable() {
+       /* final SurfaceHolder hh = holder;
+        Thread tr = new Thread(new Runnable() {
             @Override
             public void run() {
-                ffmpeg.play(mHolder.getSurface(),"/storage/emulated/0/Movies/output.flv");
+                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
@@ -244,12 +285,9 @@ public class MainActivity extends AppCompatActivity implements SurfaceHolder.Cal
         Log.e(TAG, "surfaceDestroyed");
     }
 
-    private long encodeCount = 0;
-    private long count = 0;
-    private long previewTime;
-    // Camera.PreviewCallback
     @Override
     public void  onPreviewFrame(final byte[] data, Camera camera){
+        gLogger.error("onPreviewFrame");
         /*if (null != mStreamTask){
             switch (mStreamTask.getStatus()){
                 case RUNNING:
@@ -262,21 +300,21 @@ public class MainActivity extends AppCompatActivity implements SurfaceHolder.Cal
             }
         }
         mStreamTask = new StreamTask(data);
-        mStreamTask.execute((Void)null);*/
-
+        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;*/
+//        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;*/
 
     }
 
@@ -289,33 +327,88 @@ public class MainActivity extends AppCompatActivity implements SurfaceHolder.Cal
         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<int[]> fps = params.getSupportedPreviewFpsRange();
-            for(int[] i : fps){
-                Log.e(TAG, "###  fps range : [" + i[0] + "," + i[1] + "]\n");
-            }
+            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);
+    }
 
-            Camera.Parameters parameters = c.getParameters();
+    private void switchToBackground(){
+        Intent i = new Intent();
+        i.setAction(Intent.ACTION_MAIN);
+        i.addCategory(Intent.CATEGORY_HOME);
+        this.startActivity(i);
+    }
 
-            List<Camera.Size> 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 String getMacAddr() {
+        WifiManager manager = (WifiManager) getApplicationContext().getSystemService(Context.WIFI_SERVICE);
+        WifiInfo info = manager.getConnectionInfo();
+        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());
+    }
+
+    private void saveConfig() {
+        UserInfo info = UserInfo.getConfig();
+        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();
         }
-        catch (Exception e){
+        gLogger.error("saveConfig: " + info.toString());
+    }
+
+    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();
         }
-        return c;
     }
-
 }