Optimize history save

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

@@ -1075,9 +1075,9 @@ public class VideoActivity extends BaseActivity implements CustomKeyDownVod.List
                 break;
             case PlayerEvent.TRACK:
                 setMetadata();
+                mergeHistory();
                 setTrackVisible();
                 mClock.setCallback(this);
-                App.execute(() -> mHistory.merge());
                 break;
             case PlayerEvent.SIZE:
                 mBinding.widget.size.setText(mPlayers.getSizeText());
@@ -1098,6 +1098,11 @@ public class VideoActivity extends BaseActivity implements CustomKeyDownVod.List
         }
     }
 
+    private void mergeHistory() {
+        mHistory.setDuration(mPlayers.getDuration());
+        App.execute(() -> mHistory.merge());
+    }
+
     private void setTrackVisible() {
         mBinding.control.text.setVisibility(mPlayers.haveTrack(C.TRACK_TYPE_TEXT) || mPlayers.isVod() ? View.VISIBLE : View.GONE);
         mBinding.control.audio.setVisibility(mPlayers.haveTrack(C.TRACK_TYPE_AUDIO) ? View.VISIBLE : View.GONE);

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

@@ -1184,9 +1184,9 @@ public class VideoActivity extends BaseActivity implements Clock.Callback, Custo
                 break;
             case PlayerEvent.TRACK:
                 setMetadata();
+                mergeHistory();
                 setTrackVisible();
                 mClock.setCallback(this);
-                App.execute(() -> mHistory.merge());
                 break;
             case PlayerEvent.SIZE:
                 mBinding.video.post(this::changeHeight);
@@ -1235,6 +1235,11 @@ public class VideoActivity extends BaseActivity implements Clock.Callback, Custo
         }
     }
 
+    private void mergeHistory() {
+        mHistory.setDuration(mPlayers.getDuration());
+        App.execute(() -> mHistory.merge());
+    }
+
     private void setTrackVisible() {
         mBinding.control.action.text.setVisibility(mPlayers.haveTrack(C.TRACK_TYPE_TEXT) || mPlayers.isVod() ? View.VISIBLE : View.GONE);
         mBinding.control.action.audio.setVisibility(mPlayers.haveTrack(C.TRACK_TYPE_AUDIO) ? View.VISIBLE : View.GONE);