From b5ed2bb715442d8eab4d91ed369adf6e14b55937 Mon Sep 17 00:00:00 2001
From: okjackcaptain <378702538@qq.com>
Date: Fri, 30 Sep 2022 22:23:42 +0800
Subject: [PATCH] =?UTF-8?q?-=20=E9=A2=84=E8=A7=88=E7=AA=97=E5=8F=A3?=
 =?UTF-8?q?=E6=92=AD=E6=94=BE=E7=AB=96=E5=B1=8F=E8=BF=94=E5=9B=9E=E7=9A=84?=
 =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tvbox/osc/player/controller/VodController.java   |  2 +-
 .../github/tvbox/osc/ui/activity/PlayActivity.java   |  4 ++--
 .../github/tvbox/osc/ui/fragment/PlayFragment.java   | 12 +++++++++---
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/com/github/tvbox/osc/player/controller/VodController.java b/app/src/main/java/com/github/tvbox/osc/player/controller/VodController.java
index d2ead17d..80d331d3 100644
--- a/app/src/main/java/com/github/tvbox/osc/player/controller/VodController.java
+++ b/app/src/main/java/com/github/tvbox/osc/player/controller/VodController.java
@@ -127,7 +127,7 @@ public class VodController extends BaseController {
     public SimpleSubtitleView mSubtitleView;
     TextView mZimuBtn;
     TextView mAudioTrackBtn;
-    TextView mLandscapePortraitBtn;
+    public TextView mLandscapePortraitBtn;
 
     Handler myHandle;
     Runnable myRunnable;
diff --git a/app/src/main/java/com/github/tvbox/osc/ui/activity/PlayActivity.java b/app/src/main/java/com/github/tvbox/osc/ui/activity/PlayActivity.java
index 7c0dd5a0..a25c93b1 100644
--- a/app/src/main/java/com/github/tvbox/osc/ui/activity/PlayActivity.java
+++ b/app/src/main/java/com/github/tvbox/osc/ui/activity/PlayActivity.java
@@ -1347,7 +1347,7 @@ public class PlayActivity extends BaseActivity {
 
         WebResourceResponse checkIsVideo(String url, HashMap<String, String> headers) {
             if (url.endsWith("/favicon.ico")) {
-                return new WebResourceResponse("image/png", null, null);
+                return null;
             }
             LOG.i("shouldInterceptRequest url:" + url);
             boolean ad;
@@ -1519,7 +1519,7 @@ public class PlayActivity extends BaseActivity {
             String url = request.getUrl().toString();
             // suppress favicon requests as we don't display them anywhere
             if (url.endsWith("/favicon.ico")) {
-                return createXWalkWebResourceResponse("image/png", null, null);
+                return super.shouldInterceptLoadRequest(view, request);
             }
             LOG.i("shouldInterceptLoadRequest url:" + url);
             boolean ad;
diff --git a/app/src/main/java/com/github/tvbox/osc/ui/fragment/PlayFragment.java b/app/src/main/java/com/github/tvbox/osc/ui/fragment/PlayFragment.java
index ab71698b..8c74a9a7 100644
--- a/app/src/main/java/com/github/tvbox/osc/ui/fragment/PlayFragment.java
+++ b/app/src/main/java/com/github/tvbox/osc/ui/fragment/PlayFragment.java
@@ -3,6 +3,7 @@ package com.github.tvbox.osc.ui.fragment;
 import android.annotation.TargetApi;
 import android.app.Activity;
 import android.content.Context;
+import android.content.pm.ActivityInfo;
 import android.graphics.Color;
 import android.net.http.SslError;
 import android.os.Build;
@@ -668,6 +669,11 @@ public class PlayFragment extends BaseLazyFragment {
     }
 
     public boolean onBackPressed() {
+        int requestedOrientation = getActivity().getRequestedOrientation();
+        if (requestedOrientation == ActivityInfo.SCREEN_ORIENTATION_PORTRAIT || requestedOrientation == ActivityInfo.SCREEN_ORIENTATION_SENSOR_PORTRAIT || requestedOrientation == ActivityInfo.SCREEN_ORIENTATION_REVERSE_PORTRAIT) {
+            getActivity().setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE);
+            mController.mLandscapePortraitBtn.setText("竖屏");
+        }
         if (mController.onBackPressed()) {
             return true;
         }
@@ -1365,10 +1371,10 @@ public class PlayFragment extends BaseLazyFragment {
         }
 
         WebResourceResponse checkIsVideo(String url, HashMap<String, String> headers) {
+            LOG.i("shouldInterceptRequest url:" + url);
             if (url.endsWith("/favicon.ico")) {
-                return new WebResourceResponse("image/png", null, null);
+                return null;
             }
-            LOG.i("shouldInterceptRequest url:" + url);
             boolean ad;
             if (!loadedUrls.containsKey(url)) {
                 ad = AdBlocker.isAd(url);
@@ -1538,7 +1544,7 @@ public class PlayFragment extends BaseLazyFragment {
             String url = request.getUrl().toString();
             // suppress favicon requests as we don't display them anywhere
             if (url.endsWith("/favicon.ico")) {
-                return createXWalkWebResourceResponse("image/png", null, null);
+                return super.shouldInterceptLoadRequest(view, request);
             }
             LOG.i("shouldInterceptLoadRequest url:" + url);
             boolean ad;