resize the preview size as the ratio of picture size

[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 685d85d..16c39d9 100644 (file)
--- a/app/src/main/java/ai/suanzi/rtmpclient/MainActivity.java
+++ b/app/src/main/java/ai/suanzi/rtmpclient/MainActivity.java
@@ -1,6 +1,7 @@
 package ai.suanzi.rtmpclient;
 
 import android.content.IntentFilter;
+import android.hardware.Camera;
 import android.support.design.widget.TextInputEditText;
 import android.support.v7.app.ActionBar;
 import android.support.v7.app.AppCompatActivity;
@@ -29,12 +30,13 @@ 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";
 
 public class MainActivity extends AppCompatActivity implements MyService.MyServiceEventListener, CameraView.Callback {
 
-    private static final String TAG = "MainActivity";
+    //private static final String TAG = "MainActivity";
     private Logger gLogger;
 
     private String mMacAddr = "";
@@ -54,20 +56,20 @@ public class MainActivity extends AppCompatActivity implements MyService.MyServi
             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());
+            gLogger.error("#######################################");
+            gLogger.debug("Log file is located at: " + fname);
+
         } catch (Exception e){
             e.printStackTrace();
         }
     }
 
     private void init(){
-        configLog();
-        gLogger.debug("#######################################");
         // set config file
         UserInfo.setConfigPath(getExternalFilesDir(null) + File.separator + "config");
 
@@ -153,6 +155,8 @@ public class MainActivity extends AppCompatActivity implements MyService.MyServi
             if(mServer.setRtmpUrl(UserInfo.getConfig().toUrl(mMacAddr))){
                 //mServer.startPreview(mHolder);
                 mServer.startPreview(mCameraView.getHolder());
+                Camera.Size cs = mServer.getBestPictureSize();
+                mCameraView.setLayout(cs.width, cs.height);
             }
 
 
@@ -182,26 +186,31 @@ public class MainActivity extends AppCompatActivity implements MyService.MyServi
         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();
 
+        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(mCameraView);
+        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);
+        configLog();
+        //gLogger.debug("#######################################");
         initCameraView();
-
-
         init();
         loadConfig();
 
@@ -301,9 +310,9 @@ public class MainActivity extends AppCompatActivity implements MyService.MyServi
     @Override
     public void onCameraError(String msg){
         gLogger.error("onCameraEvent " + msg);
-        if(mUsbMonitor.hasUsbCamera()){
+        //if(mUsbMonitor.hasUsbCamera()){
             //mServer.reopenCamera();
-        }
+        //}
     }
 
     @Override