update: 优化Android P兼容性

Author: zhangzhun

.idea/modules.xml

@@ -121,6 +121,17 @@ public int getStatusHeight(Window window) {
         return NotchStatusBarUtils.getStatusBarHeight(window.getContext());
     }
 
+    /**
+     * 是否显示底部导航栏
+     * @return
+     */
+    public NotchTools showNavigation(boolean showNavigation) {
+        NotchStatusBarUtils.sShowNavigation = showNavigation;
+        return this;
+    }
+
+
+
     /**
      * 全屏显示，但是不占用刘海屏区域（在刘海的下方显示内容）
      */
@@ -133,17 +144,12 @@ public void fullScreenDontUseStatus(Activity activity) {
      */
     @Override
     public void fullScreenDontUseStatus(final Activity activity, final OnNotchCallBack notchCallBack) {
-        ThreadUtils.post2UI(new Runnable() {
-            @Override
-            public void run() {
-                if (notchScreenSupport == null) {
-                    checkScreenSupportInit(activity.getWindow());
-                }
-                if (notchScreenSupport != null) {
-                    notchScreenSupport.fullScreenDontUseStatus(activity, notchCallBack);
-                }
-            }
-        });
+        if (notchScreenSupport == null) {
+            checkScreenSupportInit(activity.getWindow());
+        }
+        if (notchScreenSupport != null) {
+            notchScreenSupport.fullScreenDontUseStatus(activity, notchCallBack);
+        }
     }
 
     public void fullScreenDontUseStatusForPortrait(Activity activity) {
@@ -183,17 +189,12 @@ public void fullScreenUseStatus(Activity activity) {
 
     @Override
     public void fullScreenUseStatus(final Activity activity, final OnNotchCallBack notchCallBack) {
-        ThreadUtils.post2UI(new Runnable() {
-            @Override
-            public void run() {
-                if (notchScreenSupport == null) {
-                    checkScreenSupportInit(activity.getWindow());
-                }
-                if (notchScreenSupport != null) {
-                    notchScreenSupport.fullScreenUseStatus(activity, notchCallBack);
-                }
-            }
-        });
+        if (notchScreenSupport == null) {
+            checkScreenSupportInit(activity.getWindow());
+        }
+        if (notchScreenSupport != null) {
+            notchScreenSupport.fullScreenUseStatus(activity, notchCallBack);
+        }
 
     }
 

notchtools/src/main/java/notchtools/geek/com/notchtools/NotchTools.java

@@ -26,8 +26,8 @@ public int getStatusHeight(Window window) {
 
     @Override
     public void fullScreenDontUseStatus(Activity activity, OnNotchCallBack notchCallBack) {
+        NotchStatusBarUtils.setFullScreenWithSystemUi(activity.getWindow(), false);
         onBindCallBackWithNotchProperty(activity, notchCallBack);
-        NotchStatusBarUtils.setFullScreenWithSystemUi(activity.getWindow(), true);
     }
 
     @Override
@@ -42,8 +42,8 @@ public void fullScreenDontUseStatusForLandscape(Activity activity, OnNotchCallBa
 
     @Override
     public void fullScreenUseStatus(Activity activity, OnNotchCallBack notchCallBack) {
+        NotchStatusBarUtils.setFullScreenWithSystemUi(activity.getWindow(), false);
         onBindCallBackWithNotchProperty(activity, getNotchHeight(activity.getWindow()), notchCallBack);
-        NotchStatusBarUtils.setFullScreenWithSystemUi(activity.getWindow(), true);
     }
 
     protected void onBindCallBackWithNotchProperty(Activity activity, OnNotchCallBack notchCallBack) {

notchtools/src/main/java/notchtools/geek/com/notchtools/core/AbsNotchScreenSupport.java

@@ -18,6 +18,7 @@
 public class NotchStatusBarUtils {
 
     private static int statusBarHeight = -1;
+    public static boolean sShowNavigation;
 
     /**
      * 获取状态栏高度
@@ -51,10 +52,11 @@ public static void setFullScreenWithSystemUi(final Window window, boolean setLis
 
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
             systemUiVisibility = View.SYSTEM_UI_FLAG_FULLSCREEN
-                    | View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
-
-                    | View.SYSTEM_UI_FLAG_HIDE_NAVIGATION
-                    | View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION;
+                    | View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN;
+            if (!sShowNavigation) {
+                systemUiVisibility |=View.SYSTEM_UI_FLAG_HIDE_NAVIGATION
+                        | View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION;
+            }
         }
 
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {

notchtools/src/main/java/notchtools/geek/com/notchtools/helper/NotchStatusBarUtils.java

@@ -59,21 +59,18 @@ public int getNotchHeight(Window window) {
     @Override
     public void fullScreenDontUseStatus(Activity activity, OnNotchCallBack notchCallBack) {
         super.fullScreenDontUseStatus(activity, notchCallBack);
-        if (isNotchScreen(activity.getWindow())) {
-            WindowManager.LayoutParams attributes = activity.getWindow().getAttributes();
-            attributes.layoutInDisplayCutoutMode = WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_NEVER;
-            activity.getWindow().setAttributes(attributes);
-        }
+        WindowManager.LayoutParams attributes = activity.getWindow().getAttributes();
+        attributes.layoutInDisplayCutoutMode = WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES;
+        activity.getWindow().setAttributes(attributes);
+        NotchStatusBarUtils.setFakeNotchView(activity.getWindow());
     }
 
     @RequiresApi(api = 28)
     @Override
     public void fullScreenUseStatus(Activity activity, OnNotchCallBack notchCallBack) {
         super.fullScreenUseStatus(activity, notchCallBack);
-        if (isNotchScreen(activity.getWindow())) {
-            WindowManager.LayoutParams attributes = activity.getWindow().getAttributes();
-            attributes.layoutInDisplayCutoutMode = WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES;
-            activity.getWindow().setAttributes(attributes);
-        }
+        WindowManager.LayoutParams attributes = activity.getWindow().getAttributes();
+        attributes.layoutInDisplayCutoutMode = WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES;
+        activity.getWindow().setAttributes(attributes);
     }
 }