From c124295cdf691e4c2a1d85152e20dc5f9d78e379 Mon Sep 17 00:00:00 2001
From: FongMi <b8892778@gmail.com>
Date: Thu, 14 Mar 2024 00:20:47 +0800
Subject: [PATCH] Fix bug

---
 .../android/tv/ui/activity/VideoActivity.java      | 14 ++++++++++----
 .../android/tv/ui/activity/VideoActivity.java      |  4 ++--
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/VideoActivity.java b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/VideoActivity.java
index 8bd9ba649..353156a9e 100644
--- a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/VideoActivity.java
+++ b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/VideoActivity.java
@@ -794,12 +794,15 @@ public class VideoActivity extends BaseActivity implements CustomKeyDownVod.List
     private void onOpening() {
         long current = mPlayers.getPosition();
         long duration = mPlayers.getDuration();
-        if (current < 0 || current > duration / 2) return;
+        if (current < 0 || duration < 0 || current > duration / 2) return;
         setOpening(current);
     }
 
     private void onOpeningAdd() {
-        setOpening(Math.min(mHistory.getOpening() + 1000, mPlayers.getDuration() / 2));
+        long current = mPlayers.getPosition();
+        long duration = mPlayers.getDuration();
+        if (current < 0 || duration < 0) return;
+        setOpening(Math.min(mHistory.getOpening() + 1000, duration / 2));
     }
 
     private void onOpeningSub() {
@@ -819,12 +822,15 @@ public class VideoActivity extends BaseActivity implements CustomKeyDownVod.List
     private void onEnding() {
         long current = mPlayers.getPosition();
         long duration = mPlayers.getDuration();
-        if (current < 0 || current < duration / 2) return;
+        if (current < 0 || duration < 0 || current < duration / 2) return;
         setEnding(duration - current);
     }
 
     private void onEndingAdd() {
-        setEnding(Math.min(mPlayers.getDuration() / 2, mHistory.getEnding() + 1000));
+        long current = mPlayers.getPosition();
+        long duration = mPlayers.getDuration();
+        if (current < 0 || duration < 0) return;
+        setEnding(Math.min(duration / 2, mHistory.getEnding() + 1000));
     }
 
     private void onEndingSub() {
diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/VideoActivity.java b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/VideoActivity.java
index 79dcaf352..fafc4a5c7 100644
--- a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/VideoActivity.java
+++ b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/VideoActivity.java
@@ -802,7 +802,7 @@ public class VideoActivity extends BaseActivity implements Clock.Callback, Custo
     private void onEnding() {
         long current = mPlayers.getPosition();
         long duration = mPlayers.getDuration();
-        if (current < 0 || current < duration / 2) return;
+        if (current < 0 || duration < 0 || current < duration / 2) return;
         mHistory.setEnding(duration - current);
         mBinding.control.action.ending.setText(mPlayers.stringToTime(mHistory.getEnding()));
         setR1Callback();
@@ -818,7 +818,7 @@ public class VideoActivity extends BaseActivity implements Clock.Callback, Custo
     private void onOpening() {
         long current = mPlayers.getPosition();
         long duration = mPlayers.getDuration();
-        if (current < 0 || current > duration / 2) return;
+        if (current < 0 || duration < 0 || current > duration / 2) return;
         mHistory.setOpening(current);
         mBinding.control.action.opening.setText(mPlayers.stringToTime(mHistory.getOpening()));
         setR1Callback();