From 0fa1c57e0dbd9d39436b13becb87cca1539f1ac0 Mon Sep 17 00:00:00 2001
From: FongMi <b8892778@gmail.com>
Date: Wed, 22 Feb 2023 15:51:49 +0800
Subject: [PATCH] [mobile] fix bug

---
 app/src/mobile/AndroidManifest.xml            |  2 +-
 .../tv/ui/activity/DetailActivity.java        | 27 +++----------------
 2 files changed, 5 insertions(+), 24 deletions(-)

diff --git a/app/src/mobile/AndroidManifest.xml b/app/src/mobile/AndroidManifest.xml
index 39ceb3b27..5bf441745 100644
--- a/app/src/mobile/AndroidManifest.xml
+++ b/app/src/mobile/AndroidManifest.xml
@@ -35,7 +35,7 @@
             android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
             android:launchMode="singleTop"
             android:resizeableActivity="true"
-            android:screenOrientation="fullUser"
+            android:screenOrientation="userPortrait"
             android:supportsPictureInPicture="true"
             android:theme="@style/AppTheme.Detail" />
 
diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/DetailActivity.java b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/DetailActivity.java
index d32b82044..1fa9ca072 100644
--- a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/DetailActivity.java
+++ b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/DetailActivity.java
@@ -4,7 +4,6 @@ import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.content.Intent;
 import android.content.pm.ActivityInfo;
-import android.content.res.Configuration;
 import android.graphics.Rect;
 import android.text.Html;
 import android.text.Layout;
@@ -16,7 +15,6 @@ import android.view.ViewTreeObserver;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
-import androidx.annotation.NonNull;
 import androidx.lifecycle.ViewModelProvider;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
@@ -86,7 +84,6 @@ public class DetailActivity extends BaseActivity implements CustomKeyDownVod.Lis
     private int mCurrent;
     private Runnable mR1;
     private Runnable mR2;
-    private Runnable mR3;
 
     public static void push(Activity activity, String url) {
         start(activity, "push_agent", url, url);
@@ -188,8 +185,6 @@ public class DetailActivity extends BaseActivity implements CustomKeyDownVod.Lis
         mPlayers = new Players().init();
         mR1 = this::hideControl;
         mR2 = this::setTraffic;
-        mR3 = this::setRotate;
-        checkOrientation();
         setRecyclerView();
         setVideoView();
         setViewModel();
@@ -223,10 +218,6 @@ public class DetailActivity extends BaseActivity implements CustomKeyDownVod.Lis
         mBinding.video.setOnTouchListener((view, event) -> mKeyDown.onTouchEvent(event));
     }
 
-    private void checkOrientation() {
-        if (ResUtil.isLand(this)) enterFullscreen();
-    }
-
     private void setRecyclerView() {
         mBinding.flag.setHasFixedSize(true);
         mBinding.flag.setItemAnimator(null);
@@ -544,6 +535,7 @@ public class DetailActivity extends BaseActivity implements CustomKeyDownVod.Lis
     }
 
     private void enterFullscreen() {
+        mBinding.progressLayout.setVisibility(View.GONE);
         mBinding.control.full.setImageResource(R.drawable.ic_full_off);
         setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_USER_LANDSCAPE);
         getIjk().getSubtitleView().setTextSize(TypedValue.COMPLEX_UNIT_SP, 16);
@@ -556,8 +548,9 @@ public class DetailActivity extends BaseActivity implements CustomKeyDownVod.Lis
         mBinding.control.full.setImageResource(R.drawable.ic_full_on);
         setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_USER_PORTRAIT);
         getIjk().getSubtitleView().setTextSize(TypedValue.COMPLEX_UNIT_SP, 14);
+        mBinding.episode.scrollToPosition(mEpisodeAdapter.getPosition());
+        mBinding.progressLayout.setVisibility(View.VISIBLE);
         mBinding.video.setLayoutParams(mFrameParams);
-        App.post(mR3, 2000);
         setFullscreen(false);
         hideAll();
     }
@@ -621,10 +614,6 @@ public class DetailActivity extends BaseActivity implements CustomKeyDownVod.Lis
         App.post(mR2, Constant.INTERVAL_TRAFFIC);
     }
 
-    private void setRotate() {
-        if (!isLock()) setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_FULL_USER);
-    }
-
     private void setR1Callback() {
         App.post(mR1, Constant.INTERVAL_HIDE);
     }
@@ -862,14 +851,6 @@ public class DetailActivity extends BaseActivity implements CustomKeyDownVod.Lis
         else if (isStop()) finish();
     }
 
-    @Override
-    public void onConfigurationChanged(@NonNull Configuration newConfig) {
-        super.onConfigurationChanged(newConfig);
-        if (Utils.hasPIP() && isInPictureInPictureMode() || isLock()) return;
-        else if (ResUtil.isPort(this)) exitFullscreen();
-        else if (ResUtil.isLand(this)) enterFullscreen();
-    }
-
     @Override
     protected void onStart() {
         super.onStart();
@@ -912,6 +893,6 @@ public class DetailActivity extends BaseActivity implements CustomKeyDownVod.Lis
     protected void onDestroy() {
         super.onDestroy();
         mPlayers.release();
-        App.removeCallbacks(mR1, mR2, mR3);
+        App.removeCallbacks(mR1, mR2);
     }
 }