Fix bug

app/src/leanback/java/com/fongmi/android/tv/ui/activity/VideoActivity.java

@@ -780,11 +780,9 @@ public class VideoActivity extends BaseActivity implements CustomKeyDownVod.List
     }
 
     private void onOpening() {
-        long current = mPlayers.getPosition();
+        long position = mPlayers.getPosition();
         long duration = mPlayers.getDuration();
-        if (current < 0 || duration < 0) return;
-        if (current > Constant.OPED_LIMIT) return;
-        setOpening(current);
+        if (mPlayers.canSetOpening(position, duration)) setOpening(position);
     }
 
     private void onOpeningAdd() {
@@ -806,11 +804,9 @@ public class VideoActivity extends BaseActivity implements CustomKeyDownVod.List
     }
 
     private void onEnding() {
-        long current = mPlayers.getPosition();
+        long position = mPlayers.getPosition();
         long duration = mPlayers.getDuration();
-        if (current < 0 || duration < 0) return;
-        if (duration - current > Constant.OPED_LIMIT) return;
-        setEnding(duration - current);
+        if (mPlayers.canSetEnding(position, duration)) setEnding(duration - position);
     }
 
     private void onEndingAdd() {
@@ -1339,12 +1335,12 @@ public class VideoActivity extends BaseActivity implements CustomKeyDownVod.List
 
     @Override
     public void onKeyUp() {
-        long current = mPlayers.getPosition();
+        long position = mPlayers.getPosition();
         long duration = mPlayers.getDuration();
-        if (duration - current < Constant.OPED_LIMIT) {
-            showControl(mBinding.control.ending);
-        } else if (current < Constant.OPED_LIMIT) {
+        if (mPlayers.canSetOpening(position, duration)) {
             showControl(mBinding.control.opening);
+        } else if (mPlayers.canSetEnding(position, duration)) {
+            showControl(mBinding.control.ending);
         } else {
             showControl(getFocus2());
         }

app/src/main/java/com/fongmi/android/tv/Constant.java

@@ -18,6 +18,11 @@ public class Constant {
     public static final long TIMEOUT_PARSE_WEB = TimeUnit.SECONDS.toMillis(15);
     public static final long TIMEOUT_PARSE_LIVE = TimeUnit.SECONDS.toMillis(10);
     public static final long HISTORY_TIME = TimeUnit.DAYS.toMillis(60);
-    public static final long OPED_LIMIT = TimeUnit.MINUTES.toMillis(5);
     public static final int THREAD_POOL = 10;
+
+    public static long getOpEdLimit(long duration) {
+        if (duration < TimeUnit.MINUTES.toMillis(15)) return TimeUnit.MINUTES.toMillis(3);
+        if (duration < TimeUnit.MINUTES.toMillis(30)) return TimeUnit.MINUTES.toMillis(6);
+        return TimeUnit.MINUTES.toMillis(10);
+    }
 }

app/src/main/java/com/fongmi/android/tv/player/Players.java

@@ -248,6 +248,14 @@ public class Players implements Player.Listener, ParseCallback {
         return false;
     }
 
+    public boolean canSetOpening(long position, long duration) {
+        return position > 0 && duration > 0 && position <= Constant.getOpEdLimit(duration);
+    }
+
+    public boolean canSetEnding(long position, long duration) {
+        return position > 0 && duration > 0 && duration - position <= Constant.getOpEdLimit(duration);
+    }
+
     public boolean isPlaying() {
         return exoPlayer != null && exoPlayer.isPlaying();
     }

app/src/mobile/java/com/fongmi/android/tv/ui/activity/VideoActivity.java

@@ -801,11 +801,9 @@ public class VideoActivity extends BaseActivity implements Clock.Callback, Custo
     }
 
     private void onEnding() {
-        long current = mPlayers.getPosition();
+        long position = mPlayers.getPosition();
         long duration = mPlayers.getDuration();
-        if (current < 0 || duration < 0) return;
-        if (duration - current > Constant.OPED_LIMIT) return;
-        setEnding(duration - current);
+        if (mPlayers.canSetEnding(position, duration)) setEnding(duration - position);
         setR1Callback();
     }
 
@@ -821,11 +819,9 @@ public class VideoActivity extends BaseActivity implements Clock.Callback, Custo
     }
 
     private void onOpening() {
-        long current = mPlayers.getPosition();
+        long position = mPlayers.getPosition();
         long duration = mPlayers.getDuration();
-        if (current < 0 || duration < 0) return;
-        if (current > Constant.OPED_LIMIT) return;
-        setOpening(current);
+        if (mPlayers.canSetOpening(position, duration)) setOpening(position);
         setR1Callback();
     }
 

quickjs/build.gradle

@@ -24,7 +24,7 @@ android {
 
 dependencies {
     implementation project(':catvod')
-    implementation 'wang.harlon.quickjs:wrapper-java:3.2.0'
-    implementation 'wang.harlon.quickjs:wrapper-android:3.2.0'
+    implementation 'wang.harlon.quickjs:wrapper-java:3.2.3'
+    implementation 'wang.harlon.quickjs:wrapper-android:3.2.3'
     implementation 'net.sourceforge.streamsupport:android-retrofuture:1.7.4'
 }