From d44937d2c72a30ac6ac844027429f5b652e2bdba Mon Sep 17 00:00:00 2001
From: FongMi <b8892778@gmail.com>
Date: Wed, 19 Apr 2023 15:06:57 +0800
Subject: [PATCH] [leanback] clean code

---
 .../android/tv/ui/activity/HomeActivity.java  |  1 -
 .../android/tv/ui/activity/LiveActivity.java  | 44 ++++++++++---------
 2 files changed, 24 insertions(+), 21 deletions(-)

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 6e66b82e3..1ef3f8032 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
@@ -365,7 +365,6 @@ public class HomeActivity extends BaseActivity implements CustomTitleView.Listen
             Notify.show(R.string.app_exit);
             App.post(() -> confirm = false, 2000);
         } else {
-            super.onBackPressed();
             finish();
         }
     }
diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/LiveActivity.java b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/LiveActivity.java
index 037d0d8cf..e7f54ba93 100644
--- a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/LiveActivity.java
+++ b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/LiveActivity.java
@@ -146,13 +146,13 @@ public class LiveActivity extends BaseActivity implements GroupPresenter.OnClick
         mBinding.control.audio.setOnClickListener(this::onTrack);
         mBinding.control.video.setOnClickListener(this::onTrack);
         mBinding.control.home.setOnClickListener(view -> onHome());
+        mBinding.control.line.setOnClickListener(view -> onLine());
         mBinding.control.scale.setOnClickListener(view -> onScale());
         mBinding.control.speed.setOnClickListener(view -> onSpeed());
         mBinding.control.invert.setOnClickListener(view -> onInvert());
         mBinding.control.across.setOnClickListener(view -> onAcross());
         mBinding.control.player.setOnClickListener(view -> onPlayer());
         mBinding.control.decode.setOnClickListener(view -> onDecode());
-        mBinding.control.line.setOnClickListener(view -> nextLine(false));
         mBinding.control.speed.setOnLongClickListener(view -> onSpeedLong());
         mBinding.video.setOnTouchListener((view, event) -> mKeyDown.onTouchEvent(event));
         mBinding.group.addOnChildViewHolderSelectedListener(new OnChildViewHolderSelectedListener() {
@@ -260,16 +260,10 @@ public class LiveActivity extends BaseActivity implements GroupPresenter.OnClick
         getUrl();
     }
 
-    private void setTraffic() {
-        Traffic.setSpeed(mBinding.widget.traffic);
-        App.post(mR4, Constant.INTERVAL_TRAFFIC);
-    }
-
-    private void onToggle() {
-        if (isVisible(mBinding.control.getRoot())) hideControl();
-        if (isVisible(mBinding.recycler)) hideUI();
-        else showUI();
-        hideInfo();
+    private void onTrack(View view) {
+        int type = Integer.parseInt(view.getTag().toString());
+        TrackDialog.create().player(mPlayers).type(type).show(getSupportFragmentManager(), null);
+        hideControl();
     }
 
     private void onHome() {
@@ -277,6 +271,10 @@ public class LiveActivity extends BaseActivity implements GroupPresenter.OnClick
         hideControl();
     }
 
+    private void onLine() {
+        nextLine(false);
+    }
+
     private void onScale() {
         int index = Prefers.getLiveScale();
         String[] array = ResUtil.getStringArray(R.array.select_scale);
@@ -317,12 +315,6 @@ public class LiveActivity extends BaseActivity implements GroupPresenter.OnClick
         getUrl();
     }
 
-    private void onTrack(View view) {
-        int type = Integer.parseInt(view.getTag().toString());
-        TrackDialog.create().player(mPlayers).type(type).show(getSupportFragmentManager(), null);
-        hideControl();
-    }
-
     private void hideUI() {
         App.removeCallbacks(mR0);
         if (isGone(mBinding.recycler)) return;
@@ -373,6 +365,11 @@ public class LiveActivity extends BaseActivity implements GroupPresenter.OnClick
         App.removeCallbacks(mR2);
     }
 
+    private void hideCenter() {
+        mBinding.widget.action.setImageResource(R.drawable.ic_widget_play);
+        mBinding.widget.center.setVisibility(View.GONE);
+    }
+
     private void showInfo() {
         mBinding.widget.info.setVisibility(View.VISIBLE);
         setR1Callback();
@@ -388,9 +385,9 @@ public class LiveActivity extends BaseActivity implements GroupPresenter.OnClick
         mBinding.widget.play.setText(mChannel.getData().getEpg());
     }
 
-    private void hideCenter() {
-        mBinding.widget.action.setImageResource(R.drawable.ic_widget_play);
-        mBinding.widget.center.setVisibility(View.GONE);
+    private void setTraffic() {
+        Traffic.setSpeed(mBinding.widget.traffic);
+        App.post(mR4, Constant.INTERVAL_TRAFFIC);
     }
 
     private void setR1Callback() {
@@ -401,6 +398,13 @@ public class LiveActivity extends BaseActivity implements GroupPresenter.OnClick
         App.post(mR2, Constant.INTERVAL_HIDE);
     }
 
+    private void onToggle() {
+        if (isVisible(mBinding.control.getRoot())) hideControl();
+        if (isVisible(mBinding.recycler)) hideUI();
+        else showUI();
+        hideInfo();
+    }
+
     private void resetPass() {
         this.count = 0;
     }