when oratation is landspace ,the code `activity.getResources().getDis…

…playMetrics().heightPixels` return value when oratation is portrait
tcking · Mar 23, 2016 · 7c4aa23 · 7c4aa23 · wangrunxiang · Mar 24, 2016
1 parent 282742b
commit 7c4aa23
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -25,7 +25,7 @@ android {
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.android.support:appcompat-v7:23.1.0'
+    compile 'com.android.support:appcompat-v7:23.2.1'
     compile project(':giraffeplayer')
 
     testCompile 'junit:junit:4.12'

diff --git a/build.gradle b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.0.0-beta6'
+        classpath 'com.android.tools.build:gradle:2.0.0-beta7'
 
 
         // NOTE: Do not place your application dependencies here; they belong

diff --git a/giraffeplayer/src/main/java/tcking/github.com/giraffeplayer/GiraffePlayer.java b/giraffeplayer/src/main/java/tcking/github.com/giraffeplayer/GiraffePlayer.java
@@ -483,7 +483,9 @@ public void run() {
                     if (portrait) {
                         $.id(R.id.app_video_box).height(initHeight, false);
                     } else {
-                        $.id(R.id.app_video_box).height(activity.getResources().getDisplayMetrics().heightPixels, false);
+                        int heightPixels = activity.getResources().getDisplayMetrics().heightPixels;
+                        int widthPixels = activity.getResources().getDisplayMetrics().widthPixels;
+                        $.id(R.id.app_video_box).height(Math.min(heightPixels,widthPixels), false);
                     }
                     updateFullScreenButton();
                 }