Add CameraView and set fullscreen for preview

[rtmpclient.git] / app / src / main / java / ai / suanzi / rtmpclient / MainActivity.java

diff --git a/app/src/main/java/ai/suanzi/rtmpclient/MainActivity.java b/app/src/main/java/ai/suanzi/rtmpclient/MainActivity.java
index bf53ce4..685d85d 100644 (file)
--- a/app/src/main/java/ai/suanzi/rtmpclient/MainActivity.java
+++ b/app/src/main/java/ai/suanzi/rtmpclient/MainActivity.java
@@ -2,12 +2,16 @@ package ai.suanzi.rtmpclient;
 
 import android.content.IntentFilter;
 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.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;
@@ -28,17 +32,11 @@ import android.net.ConnectivityManager;
 
 //"rtmp://gpussh.suanzi.ai:1935/myapp/suanzi_ac83f34ead90";
 
-public class MainActivity extends AppCompatActivity implements SurfaceHolder.Callback, MyService.MyServiceEventListener{
+public class MainActivity extends AppCompatActivity implements MyService.MyServiceEventListener, CameraView.Callback {
 
     private static final String TAG = "MainActivity";
     private Logger gLogger;
 
-    private SurfaceHolder mHolder;
-    private SurfaceView mSufaceView;
-    private Button mBtnStart;
-    private TextInputEditText mTextServer;
-    private TextInputEditText mTextUser;
-    private TextInputEditText mTextCamera;
     private String mMacAddr = "";
     private NetworkMonitor networkMonitor;
     private UsbMonitor mUsbMonitor;
@@ -49,6 +47,8 @@ public class MainActivity extends AppCompatActivity implements SurfaceHolder.Cal
     MyService mServer;
     Intent mIntent;
 
+    private CameraView mCameraView;
+
     private void configLog(){
         try {
             final LogConfigurator logConfigurator = new LogConfigurator();
@@ -72,13 +72,6 @@ public class MainActivity extends AppCompatActivity implements SurfaceHolder.Cal
         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() {
@@ -134,7 +127,6 @@ public class MainActivity extends AppCompatActivity implements SurfaceHolder.Cal
                 gLogger.error("onNotHealthy, in " + INTERVAL + " seconds, the publishing may stopped or have error ");
                 doUnbindService();
                 doBindService();
-                //restartApplication();
             }
         });
         mServiceHealthMonitor.setInterval(INTERVAL); // 5 minutes
@@ -159,7 +151,8 @@ public class MainActivity extends AppCompatActivity implements SurfaceHolder.Cal
             mServer = mLocalBinder.getServiceInstance();
             mServer.setServiceEventListener(MainActivity.this);
             if(mServer.setRtmpUrl(UserInfo.getConfig().toUrl(mMacAddr))){
-                mServer.startPreview(mHolder);
+                //mServer.startPreview(mHolder);
+                mServer.startPreview(mCameraView.getHolder());
             }
 
 
@@ -183,14 +176,36 @@ public class MainActivity extends AppCompatActivity implements SurfaceHolder.Cal
         }
     }
 
+    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);
+
+
+        DisplayMetrics outMetrics = new DisplayMetrics();
+        this.getWindowManager().getDefaultDisplay().getMetrics(outMetrics);
+
+        ActionBar actionBar = getSupportActionBar();
+        actionBar.hide();
+
+        this.getWindowManager().getDefaultDisplay().getMetrics(outMetrics);
+
+        CameraView.SCREEN_WIDTH = outMetrics.widthPixels;
+        CameraView.SCREEN_HEIGHT = outMetrics.heightPixels;
+        mCameraView = new CameraView(getApplicationContext(), this);
+        setContentView(mCameraView);
+    }
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_main);
+        initCameraView();
+
 
         init();
         loadConfig();
 
+
         if(NetworkMonitor.isNetworkAvailable(this) && mUsbMonitor.hasUsbCamera()){
             gLogger.error("Current network is available");
             doBindService();
@@ -198,17 +213,6 @@ public class MainActivity extends AppCompatActivity implements SurfaceHolder.Cal
             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();
-                doUnbindService();
-                doBindService();
-            }
-        });
-
         if(!mServiceHealthMonitor.isAlive()) {
             gLogger.debug("mServiceHealthMonitor start, interval " + INTERVAL);
             mServiceHealthMonitor.start();
@@ -263,25 +267,6 @@ public class MainActivity extends AppCompatActivity implements SurfaceHolder.Cal
         startActivity(intent);
     }
 
-    // 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");
-    }
-
     private String getMacAddr() {
         WifiManager manager = (WifiManager) getApplicationContext().getSystemService(Context.WIFI_SERVICE);
         WifiInfo info = manager.getConnectionInfo();
@@ -289,18 +274,17 @@ public class MainActivity extends AppCompatActivity implements SurfaceHolder.Cal
     }
 
     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(mMacAddr));
+//        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 {
@@ -334,6 +318,13 @@ public class MainActivity extends AppCompatActivity implements SurfaceHolder.Cal
         mServiceHealthMonitor.record();
     }
 
+    @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);