From dbb1d39b398a3c6613ec5ff87b1bc21600e59111 Mon Sep 17 00:00:00 2001 From: FongMi Date: Mon, 24 Feb 2025 23:15:23 +0800 Subject: [PATCH] Clean code --- .../java/com/fongmi/android/tv/player/Players.java | 3 +-- .../com/fongmi/android/tv/player/danmaku/Sync.java | 12 ++++++------ 2 files changed, 7 insertions(+), 8 deletions(-) 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 3ea272289..14bcd6a7a 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 @@ -168,7 +168,6 @@ public class Players implements Player.Listener, ParseCallback, DrawHandler.Call public String getUrl() { return url; - } public Map getHeaders() { @@ -425,7 +424,6 @@ public class Players implements Player.Listener, ParseCallback, DrawHandler.Call ErrorEvent.drm(); } else { setMediaItem(result, timeout); - setDanmaku(danmakus = result.getDanmaku()); } } @@ -469,6 +467,7 @@ public class Players implements Player.Listener, ParseCallback, DrawHandler.Call private void setMediaItem(Result result, int timeout) { setMediaItem(result.getHeaders(), result.getRealUrl(), result.getFormat(), result.getDrm(), result.getSubs(), timeout); + setDanmaku(danmakus = result.getDanmaku()); } private void setMediaItem(Map headers, String url, String format, Drm drm, List subs, int timeout) { diff --git a/app/src/main/java/com/fongmi/android/tv/player/danmaku/Sync.java b/app/src/main/java/com/fongmi/android/tv/player/danmaku/Sync.java index 96a9ab374..368792f94 100644 --- a/app/src/main/java/com/fongmi/android/tv/player/danmaku/Sync.java +++ b/app/src/main/java/com/fongmi/android/tv/player/danmaku/Sync.java @@ -6,26 +6,26 @@ import master.flame.danmaku.danmaku.model.AbsDanmakuSync; public class Sync extends AbsDanmakuSync { - private final Players players; + private final Players player; private long time; - public Sync(Players players) { - this.players = players; + public Sync(Players player) { + this.player = player; this.time = System.currentTimeMillis(); } @Override public long getUptimeMillis() { - return players == null ? 0 : players.getPosition(); + return player == null ? 0 : player.getPosition(); } @Override public int getSyncState() { - if (players == null) return SYNC_STATE_HALT; + if (player == null) return SYNC_STATE_HALT; long current = System.currentTimeMillis(); if (current - time < 1000) return SYNC_STATE_HALT; time = current; - return players.isPlaying() ? SYNC_STATE_PLAYING : SYNC_STATE_HALT; + return player.isPlaying() ? SYNC_STATE_PLAYING : SYNC_STATE_HALT; } @Override