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 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 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;