X-Git-Url: http://47.100.26.94:8080/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fai%2Fsuanzi%2Frtmpclient%2FMainActivity.java;fp=app%2Fsrc%2Fmain%2Fjava%2Fai%2Fsuanzi%2Frtmpclient%2FMainActivity.java;h=34132f195657a5efd88575aaebda3d9723290bb5;hb=3c832ad69b0475ee433b27eaf12f0ae7d7033d65;hp=fbe69c334073c90ec50caf7286e4ad807f358c0c;hpb=e0f23aa956f751fca704c8ccae084641a3e36eda;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 fbe69c3..34132f1 100644
--- a/app/src/main/java/ai/suanzi/rtmpclient/MainActivity.java
+++ b/app/src/main/java/ai/suanzi/rtmpclient/MainActivity.java
@@ -181,13 +181,16 @@ public class MainActivity extends AppCompatActivity implements MyService.MyServi
         } else {
             display.getSize(outPoint); // exclude navigation bar
         }
-        if(outPoint.y > outPoint.x) {
+        size.width = outPoint.x;
+        size.height = outPoint.y;
+
+        /*if(outPoint.y > outPoint.x) {
             size.height = outPoint.y;
             size.width = outPoint.x;
         } else {
             size.height = outPoint.x;
             size.width = outPoint.y;
-        }
+        }*/
         return size;
     }
 
@@ -214,12 +217,12 @@ public class MainActivity extends AppCompatActivity implements MyService.MyServi
 
 
 
-        //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);
+//        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);
 
         ScreenSize size = getScreenSize();