fix 修复h5页面无故竖屏或横屏的情况

youlookwhat · Sep 24, 2021 · d300f1c · d300f1c
1 parent ad84afa
commit d300f1c
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 3 deletions.
diff --git a/ByWebView/src/main/java/me/jingbin/web/ByWebChromeClient.java b/ByWebView/src/main/java/me/jingbin/web/ByWebChromeClient.java
@@ -11,7 +11,6 @@
 import android.support.annotation.Nullable;
 import android.support.annotation.RequiresApi;
 import android.text.TextUtils;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.webkit.PermissionRequest;
@@ -42,6 +41,10 @@ public class ByWebChromeClient extends WebChromeClient {
     private CustomViewCallback mCustomViewCallback;
     private ByFullscreenHolder videoFullView;
     private OnTitleProgressCallback onByWebChromeCallback;
+    // 修复可能部分h5无故横屏问题
+    private boolean isFixScreenLandscape = false;
+    // 修复可能部分h5无故竖屏问题
+    private boolean isFixScreenPortrait = false;
 
     ByWebChromeClient(Activity activity, ByWebView byWebView) {
         mActivityWeakReference = new WeakReference<Activity>(activity);
@@ -52,6 +55,14 @@ void setOnByWebChromeCallback(OnTitleProgressCallback onByWebChromeCallback) {
         this.onByWebChromeCallback = onByWebChromeCallback;
     }
 
+    public void setFixScreenLandscape(boolean fixScreenLandscape) {
+        isFixScreenLandscape = fixScreenLandscape;
+    }
+
+    public void setFixScreenPortrait(boolean fixScreenPortrait) {
+        isFixScreenPortrait = fixScreenPortrait;
+    }
+
     /**
      * 播放网络视频时全屏会被调用的方法
      */
@@ -60,7 +71,9 @@ void setOnByWebChromeCallback(OnTitleProgressCallback onByWebChromeCallback) {
     public void onShowCustomView(View view, CustomViewCallback callback) {
         Activity mActivity = this.mActivityWeakReference.get();
         if (mActivity != null && !mActivity.isFinishing()) {
-            mActivity.setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
+            if (!isFixScreenLandscape) {
+                mActivity.setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
+            }
             mByWebView.getWebView().setVisibility(View.INVISIBLE);
 
             // 如果一个视图已经存在，那么立刻终止并新建一个
@@ -93,7 +106,9 @@ public void onHideCustomView() {
                 return;
             }
             // 还原到之前的屏幕状态
-            mActivity.setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
+            if (!isFixScreenPortrait) {
+                mActivity.setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
+            }
 
             mCustomView.setVisibility(View.GONE);
             if (videoFullView != null) {

diff --git a/ByWebView/src/main/java/me/jingbin/web/ByWebView.java b/ByWebView/src/main/java/me/jingbin/web/ByWebView.java
@@ -305,6 +305,23 @@ public static Builder with(@NonNull Activity activity) {
         return new Builder(activity);
     }
 
+    /**
+     * 修复可能部分h5无故竖屏问题，如果h5里有视频全屏播放请禁用
+     */
+    public void setFixScreenPortrait(boolean fixScreenPortrait) {
+        if (mWebChromeClient != null) {
+            mWebChromeClient.setFixScreenPortrait(fixScreenPortrait);
+        }
+    }
+
+    /**
+     * 修复可能部分h5无故横屏问题，如果h5里有视频全屏播放请禁用
+     */
+    public void setFixScreenLandscape(boolean fixScreenLandscape) {
+        if (mWebChromeClient != null) {
+            mWebChromeClient.setFixScreenLandscape(fixScreenLandscape);
+        }
+    }
 
     public static class Builder {
         private Activity mActivity;