#修复OneUI2系统版本前三星s8/note8等设备导航栏可见性判断错误的问题

yummylau · yummylau · commit c664cc558c59 · 2020-08-17T17:32:07.000+08:00
diff --git a/lib/utilcode/src/main/java/com/blankj/utilcode/util/BarUtils.java b/lib/utilcode/src/main/java/com/blankj/utilcode/util/BarUtils.java
@@ -7,11 +7,13 @@
 import android.graphics.Color;
 import android.graphics.Point;
 import android.os.Build;
+import android.provider.Settings;
 import android.support.annotation.ColorInt;
 import android.support.annotation.NonNull;
 import android.support.annotation.RequiresApi;
 import android.support.annotation.RequiresPermission;
 import android.support.v4.widget.DrawerLayout;
+import android.text.TextUtils;
 import android.util.TypedValue;
 import android.view.Display;
 import android.view.KeyCharacterMap;
@@ -565,9 +567,26 @@ public static boolean isNavBarVisible(@NonNull final Window window) {
             }
         }
         if (isVisible) {
+
+            // &#23545;&#20110;&#19977;&#26143;&#25163;&#26426;&#65292;android10&#20197;&#19979;&#38750;OneUI2&#30340;&#29256;&#26412;&#65292;&#27604;&#22914; s8&#65292;note8 &#31561;&#35774;&#22791;&#19978;&#65292;&#23548;&#33322;&#26639;&#26174;&#31034;&#23384;&#22312;bug&#65306;"&#24403;&#29992;&#25143;&#38544;&#34255;&#23548;&#33322;&#26639;&#26102;&#26174;&#31034;&#36755;&#20837;&#27861;&#30340;&#26102;&#20505;&#23548;&#33322;&#26639;&#20250;&#36319;&#38543;&#26174;&#31034;"&#65292;&#20250;&#23548;&#33268;&#38544;&#34255;&#36755;&#20837;&#27861;&#20043;&#21518;&#21028;&#26029;&#38169;&#35823;
+            // &#36825;&#20010;&#38382;&#39064;&#22312; OneUI 2 & android 10 &#29256;&#26412;&#24050;&#20462;&#22797;
+            String manufacturer = "";
+            if (!TextUtils.isEmpty(Build.MANUFACTURER )){
+                manufacturer = Build.MANUFACTURER.trim();
+            }
+            if (manufacturer.toLowerCase().contains("samsung")
+                    && Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1 && Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) {
+                try {
+                    return Settings.Global.getInt(window.getContext().getContentResolver(), "navigationbar_hide_bar_enabled") == 0;
+                } catch (Exception e) {
+                    //nothing to do
+                }
+            }
+
             int visibility = decorView.getSystemUiVisibility();
             isVisible = (visibility & View.SYSTEM_UI_FLAG_HIDE_NAVIGATION) == 0;
         }
+
         return isVisible;
     }
 
