From 8d91e53daba81179ca45f0834de0f90e08afdca6 Mon Sep 17 00:00:00 2001
From: FongMi <b8892778@gmail.com>
Date: Tue, 13 Sep 2022 17:54:11 +0800
Subject: [PATCH] Clean code

---
 .../android/tv/ui/activity/DetailActivity.java      | 13 +++++++------
 .../fongmi/android/tv/ui/activity/HomeActivity.java |  5 +++--
 .../java/com/fongmi/android/tv/bean/History.java    |  3 ++-
 .../java/com/fongmi/android/tv/player/Players.java  |  5 +----
 .../java/com/fongmi/android/tv/utils/Clock.java     |  4 ----
 5 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/DetailActivity.java b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/DetailActivity.java
index 1d61edcf8..85ad8a6c9 100644
--- a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/DetailActivity.java
+++ b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/DetailActivity.java
@@ -487,7 +487,10 @@ public class DetailActivity extends BaseActivity implements CustomKeyDown.Listen
     }
 
     private void updateHistory() {
-        if (mHistory != null) mHistory.update();
+        if (mHistory != null) {
+            mHistory.update(Players.get().getCurrentPosition());
+            RefreshEvent.history();
+        }
     }
 
     private final Runnable mHideCenter = new Runnable() {
@@ -550,7 +553,6 @@ public class DetailActivity extends BaseActivity implements CustomKeyDown.Listen
         mBinding.widget.progress.getRoot().setVisibility(View.GONE);
         mBinding.widget.error.setVisibility(View.VISIBLE);
         mBinding.widget.text.setText(msg);
-        Clock.get().setCallback(null);
         Players.get().stop();
     }
 
@@ -603,17 +605,16 @@ public class DetailActivity extends BaseActivity implements CustomKeyDown.Listen
     @Override
     protected void onResume() {
         super.onResume();
-        onPlay(0);
         Clock.start(mBinding.widget.time);
+        onPlay(0);
     }
 
     @Override
     protected void onPause() {
         super.onPause();
-        onPause(false);
-        updateHistory();
-        RefreshEvent.history();
         Clock.get().release();
+        updateHistory();
+        onPause(false);
     }
 
     @Override
diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/HomeActivity.java b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/HomeActivity.java
index cfde5ba1e..8e303da19 100644
--- a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/HomeActivity.java
+++ b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/HomeActivity.java
@@ -287,12 +287,13 @@ public class HomeActivity extends BaseActivity implements CustomTitleView.Listen
             Notify.show(R.string.app_exit);
             mHandler.postDelayed(() -> mConfirmExit = false, 1000);
         } else {
-            destroy();
             super.onBackPressed();
         }
     }
 
-    private void destroy() {
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
         Server.get().stop();
         Players.get().release();
         EventBus.getDefault().unregister(this);
diff --git a/app/src/main/java/com/fongmi/android/tv/bean/History.java b/app/src/main/java/com/fongmi/android/tv/bean/History.java
index cda0dfb2f..217e952cb 100644
--- a/app/src/main/java/com/fongmi/android/tv/bean/History.java
+++ b/app/src/main/java/com/fongmi/android/tv/bean/History.java
@@ -172,7 +172,8 @@ public class History {
         AppDatabase.get().getHistoryDao().delete(id);
     }
 
-    public History update() {
+    public History update(long duration) {
+        setDuration(duration);
         AppDatabase.get().getHistoryDao().insertOrUpdate(this);
         return this;
     }
diff --git a/app/src/main/java/com/fongmi/android/tv/player/Players.java b/app/src/main/java/com/fongmi/android/tv/player/Players.java
index 1d161e7a0..4b4cd5a50 100644
--- a/app/src/main/java/com/fongmi/android/tv/player/Players.java
+++ b/app/src/main/java/com/fongmi/android/tv/player/Players.java
@@ -70,8 +70,7 @@ public class Players implements Player.Listener, ParseTask.Callback {
 
     public void addSpeed() {
         float speed = exo().getPlaybackParameters().speed;
-        float addon = speed >= 2 ? 1f : 0.25f;
-        speed = speed >= 5 ? 0.5f : speed + addon;
+        speed = speed == 2 ? 0.25f : speed + 0.25f;
         exo().setPlaybackSpeed(speed);
     }
 
@@ -161,11 +160,9 @@ public class Players implements Player.Listener, ParseTask.Callback {
         if (exoPlayer != null) {
             exoPlayer.removeListener(this);
             exoPlayer.release();
-            exoPlayer = null;
         }
         if (webView != null) {
             webView.destroy();
-            webView = null;
         }
     }
 
diff --git a/app/src/main/java/com/fongmi/android/tv/utils/Clock.java b/app/src/main/java/com/fongmi/android/tv/utils/Clock.java
index 57d99893b..d575693c3 100644
--- a/app/src/main/java/com/fongmi/android/tv/utils/Clock.java
+++ b/app/src/main/java/com/fongmi/android/tv/utils/Clock.java
@@ -62,10 +62,6 @@ public class Clock {
 
     public void release() {
         if (timer != null) timer.cancel();
-        formatter = null;
-        handler = null;
-        timer = null;
-        date = null;
     }
 
     public interface Callback {