[GitHub] YorkShen closed pull request #1981: * [Android] adapter screen height for full screen

[GitBox <gi...@apache.org>]

YorkShen closed pull request #1981: * [Android] adapter screen height for full screen
URL: https://github.com/apache/incubator-weex/pull/1981
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/android/sdk/src/main/java/com/taobao/weex/WXSDKEngine.java b/android/sdk/src/main/java/com/taobao/weex/WXSDKEngine.java
index f528654eb9..10bda0b141 100644
--- a/android/sdk/src/main/java/com/taobao/weex/WXSDKEngine.java
+++ b/android/sdk/src/main/java/com/taobao/weex/WXSDKEngine.java
@@ -22,6 +22,10 @@
 import android.content.Context;
 import android.content.Intent;
 import android.content.res.Resources;
+import android.os.Build;
+import android.os.Build.VERSION;
+import android.os.Build.VERSION_CODES;
+import android.provider.Settings;
 import android.support.v4.content.LocalBroadcastManager;
 import android.text.TextUtils;
 
@@ -96,6 +100,7 @@
 import com.taobao.weex.utils.WXExceptionUtils;
 import com.taobao.weex.utils.WXLogUtils;
 import com.taobao.weex.utils.WXSoInstallMgrSdk;
+import com.taobao.weex.utils.WXViewUtils;
 import com.taobao.weex.utils.batch.BatchOperationHelper;
 
 import java.io.Serializable;
@@ -242,6 +247,11 @@ public void run() {
       }
     });
     register();
+
+    //2ms,onepluse2 ,full screen adapter for mix2 ,v2ex link :https://www.v2ex.com/t/470543
+    if (null!=application && Build.VERSION.SDK_INT > VERSION_CODES.JELLY_BEAN && "xiaomi".equalsIgnoreCase(Build.MANUFACTURER)){
+     WXViewUtils.isMiUiForceFsgNavBar = Settings.Global.getInt(application.getContentResolver(), "force_fsg_nav_bar", 0) != 0;
+    }
   }
 
   @Deprecated
diff --git a/android/sdk/src/main/java/com/taobao/weex/utils/WXViewUtils.java b/android/sdk/src/main/java/com/taobao/weex/utils/WXViewUtils.java
index 0441163059..511ebf5fcf 100644
--- a/android/sdk/src/main/java/com/taobao/weex/utils/WXViewUtils.java
+++ b/android/sdk/src/main/java/com/taobao/weex/utils/WXViewUtils.java
@@ -19,6 +19,8 @@
 package com.taobao.weex.utils;
 
 import android.annotation.SuppressLint;
+import android.app.Activity;
+import android.app.Application;
 import android.content.Context;
 import android.content.res.Resources;
 import android.graphics.Canvas;
@@ -28,13 +30,17 @@
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.LayerDrawable;
 import android.os.Build;
+import android.os.Build.VERSION;
 import android.os.Build.VERSION_CODES;
+import android.provider.Settings;
 import android.support.annotation.IntDef;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
+import android.util.DisplayMetrics;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.ViewGroup.LayoutParams;
+import android.view.WindowManager;
 import com.taobao.weex.WXEnvironment;
 import com.taobao.weex.WXSDKInstance;
 import com.taobao.weex.WXSDKManager;
@@ -101,7 +107,7 @@ public static int generateViewId() {
   }
 
   private static int mScreenWidth;
-  private static int mScreenHeight;
+  private static int mScreenHeight = -1;
 
 
   public static int getWeexHeight(String instanceId){
@@ -178,12 +184,35 @@ public static int getScreenHeight() {
     return getScreenHeight(WXEnvironment.sApplication);
   }
 
+  public static boolean isMiUiForceFsgNavBar = false;
+
   public static int getScreenHeight(Context cxt) {
     if(cxt!=null){
-      Resources res = cxt.getResources();
-      mScreenHeight =cxt.getResources().getDisplayMetrics().heightPixels;
+      boolean useNewApiForAdapterFullScreen = false;
+
+      if (Build.VERSION.SDK_INT > VERSION_CODES.JELLY_BEAN){
+        if ("xiaomi".equalsIgnoreCase(Build.MANUFACTURER)){
+          useNewApiForAdapterFullScreen = isMiUiForceFsgNavBar;
+        }else {
+          useNewApiForAdapterFullScreen = true;
+        }
+      }
+
+      if (useNewApiForAdapterFullScreen){
+        WindowManager wm = (WindowManager)cxt.getSystemService(Context.WINDOW_SERVICE);
+        if (null == wm){
+          mScreenHeight =cxt.getResources().getDisplayMetrics().heightPixels;
+        }else {
+          DisplayMetrics size = new DisplayMetrics();
+          wm.getDefaultDisplay().getRealMetrics(size);
+          mScreenHeight = size.heightPixels;
+        }
+      }else {
+        mScreenHeight =cxt.getResources().getDisplayMetrics().heightPixels;
+      }
+
       if(WXEnvironment.SETTING_FORCE_VERTICAL_SCREEN){
-        mScreenWidth = res
+        mScreenWidth = cxt.getResources()
                 .getDisplayMetrics()
                 .widthPixels;
         mScreenHeight = mScreenHeight > mScreenWidth ? mScreenHeight : mScreenWidth;


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services