From 0bd54e833e34e5f0020bf6c7ac97a47c7b295618 Mon Sep 17 00:00:00 2001
From: FongMi <b8892778@gmail.com>
Date: Mon, 24 Feb 2025 11:56:33 +0800
Subject: [PATCH] Clean code

---
 .../com/fongmi/android/tv/ui/activity/VideoActivity.java    | 6 +-----
 .../com/fongmi/android/tv/ui/activity/VideoActivity.java    | 2 +-
 2 files changed, 2 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 6481feb1a..8409db3e0 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
@@ -290,7 +290,6 @@ public class VideoActivity extends BaseActivity implements CustomKeyDownVod.List
         mR4 = this::showEmpty;
         setRecyclerView();
         setDanmakuView();
-        checkDanmaku();
         setVideoView();
         setViewModel();
         checkCast();
@@ -927,6 +926,7 @@ public class VideoActivity extends BaseActivity implements CustomKeyDownVod.List
 
     private void showControl(View view) {
         mBinding.control.danmaku.setVisibility(mBinding.danmaku.isPrepared() ? View.VISIBLE : View.GONE);
+        mBinding.control.danmaku.setActivated(Setting.isDanmakuShow());
         mBinding.control.getRoot().setVisibility(View.VISIBLE);
         view.requestFocus();
         setR1Callback();
@@ -1029,10 +1029,6 @@ public class VideoActivity extends BaseActivity implements CustomKeyDownVod.List
         mBinding.keep.setCompoundDrawablesWithIntrinsicBounds(Keep.find(getHistoryKey()) == null ? R.drawable.ic_detail_keep_off : R.drawable.ic_detail_keep_on, 0, 0, 0);
     }
 
-    private void checkDanmaku() {
-        mBinding.control.danmaku.setActivated(Setting.isDanmakuShow());
-    }
-
     private void createKeep() {
         Keep keep = new Keep();
         keep.setKey(getHistoryKey());
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 c515be124..54b6af268 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
@@ -297,7 +297,6 @@ public class VideoActivity extends BaseActivity implements Clock.Callback, Custo
         mR4 = this::showEmpty;
         mPiP = new PiP();
         setRecyclerView();
-        checkDanmakuImg();
         setDanmakuView();
         setVideoView();
         setViewModel();
@@ -957,6 +956,7 @@ public class VideoActivity extends BaseActivity implements Clock.Callback, Custo
         mBinding.control.bottom.setVisibility(isLock() ? View.GONE : View.VISIBLE);
         mBinding.control.top.setVisibility(isLock() ? View.GONE : View.VISIBLE);
         mBinding.control.getRoot().setVisibility(View.VISIBLE);
+        checkDanmakuImg();
         setR1Callback();
         checkPlayImg();
     }