From f1ae0f41d925ebd99e92a6eb4f77b51972e8783c Mon Sep 17 00:00:00 2001 From: FongMi Date: Sat, 28 Oct 2023 14:49:08 +0800 Subject: [PATCH] Clean code --- .../android/tv/ui/activity/LiveActivity.java | 10 ++++++ .../android/tv/ui/activity/VideoActivity.java | 9 +++++ .../android/tv/ui/activity/LiveActivity.java | 24 +++++++++----- .../android/tv/ui/activity/VideoActivity.java | 33 +++++++++++-------- 4 files changed, 55 insertions(+), 21 deletions(-) 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 191dc009d..2cbffb80d 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 @@ -4,6 +4,7 @@ import android.annotation.SuppressLint; import android.content.Context; import android.content.Intent; import android.graphics.drawable.Drawable; +import android.net.Uri; import android.support.v4.media.MediaMetadataCompat; import android.view.KeyEvent; import android.view.View; @@ -173,6 +174,7 @@ public class LiveActivity extends BaseActivity implements GroupPresenter.OnClick mBinding.control.change.setOnClickListener(view -> onChange()); mBinding.control.player.setOnClickListener(view -> onPlayer()); mBinding.control.decode.setOnClickListener(view -> onDecode()); + mBinding.control.player.setOnLongClickListener(view -> onChoose()); mBinding.control.text.setOnLongClickListener(view -> onTextLong()); mBinding.control.speed.setOnLongClickListener(view -> onSpeedLong()); mBinding.video.setOnTouchListener((view, event) -> mKeyDown.onTouchEvent(event)); @@ -340,6 +342,14 @@ public class LiveActivity extends BaseActivity implements GroupPresenter.OnClick mBinding.control.change.setActivated(Setting.isChange()); } + private boolean onChoose() { + Intent intent = new Intent(Intent.ACTION_VIEW); + intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); + intent.setDataAndType(Uri.parse(mPlayers.getUrl()), "video/*"); + startActivity(Intent.createChooser(intent, null)); + return true; + } + private void onPlayer() { mPlayers.togglePlayer(); Setting.putLivePlayer(mPlayers.getPlayer()); 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 9e98c2067..8b0ace1d6 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 @@ -326,6 +326,7 @@ public class VideoActivity extends BaseActivity implements CustomKeyDownVod.List mBinding.control.ending.setOnClickListener(view -> onEnding()); mBinding.control.change2.setOnClickListener(view -> onChange()); mBinding.control.opening.setOnClickListener(view -> onOpening()); + mBinding.control.player.setOnLongClickListener(view -> onChoose()); mBinding.control.speed.setOnLongClickListener(view -> onSpeedLong()); mBinding.control.reset.setOnLongClickListener(view -> onResetToggle()); mBinding.control.ending.setOnLongClickListener(view -> onEndingReset()); @@ -856,6 +857,14 @@ public class VideoActivity extends BaseActivity implements CustomKeyDownVod.List mBinding.control.ending.setText(ending == 0 ? getString(R.string.play_ed) : mPlayers.stringToTime(mHistory.getEnding())); } + private boolean onChoose() { + Intent intent = new Intent(Intent.ACTION_VIEW); + intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); + intent.setDataAndType(Uri.parse(mPlayers.getUrl()), "video/*"); + startActivity(Intent.createChooser(intent, null)); + return true; + } + private void onPlayer() { mPlayers.togglePlayer(); setPlayerView(); diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/LiveActivity.java b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/LiveActivity.java index 3cea33537..b44539b81 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/LiveActivity.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/LiveActivity.java @@ -299,7 +299,6 @@ public class LiveActivity extends BaseActivity implements CustomKeyDownLive.List builder.getIntent().putExtra("title", mBinding.control.title.getText()); builder.getIntent().putExtra("name", mBinding.control.title.getText()); builder.startChooser(); - checkPlayImg(false); setRedirect(true); } @@ -308,7 +307,6 @@ public class LiveActivity extends BaseActivity implements CustomKeyDownLive.List intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); intent.setDataAndType(Uri.parse(mPlayers.getUrl()), "video/*"); startActivity(Intent.createChooser(intent, null)); - checkPlayImg(false); setRedirect(true); return true; } @@ -331,9 +329,8 @@ public class LiveActivity extends BaseActivity implements CustomKeyDownLive.List } private void checkPlay() { - checkPlayImg(!mPlayers.isPlaying()); - if (mPlayers.isPlaying()) mPlayers.pause(); - else mPlayers.play(); + if (mPlayers.isPlaying()) onPaused(); + else onPlay(); } private void onTrack(View view) { @@ -836,6 +833,16 @@ public class LiveActivity extends BaseActivity implements CustomKeyDownLive.List showProgress(); } + private void onPaused() { + checkPlayImg(false); + mPlayers.pause(); + } + + private void onPlay() { + checkPlayImg(true); + mPlayers.play(); + } + public boolean isForeground() { return foreground; } @@ -1000,14 +1007,15 @@ public class LiveActivity extends BaseActivity implements CustomKeyDownLive.List protected void onStart() { super.onStart(); mClock.stop().start(); - mPlayers.play(); setStop(false); + onPlay(); } @Override protected void onResume() { super.onResume(); if (isForeground()) return; + if (isRedirect()) onPlay(); App.removeCallbacks(mR0); App.post(mR0, 1000); setForeground(true); @@ -1019,14 +1027,14 @@ public class LiveActivity extends BaseActivity implements CustomKeyDownLive.List super.onPause(); setForeground(false); App.removeCallbacks(mR0); - if (isRedirect()) mPlayers.pause(); + if (isRedirect()) onPaused(); if (Setting.isBackgroundOn() && !isFinishing()) PlaybackService.start(mPlayers); } @Override protected void onStop() { super.onStop(); - if (Setting.isBackgroundOff()) mPlayers.pause(); + if (Setting.isBackgroundOff()) onPaused(); if (Setting.isBackgroundOff()) mClock.stop(); setStop(true); } 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 5206c7429..df47021ff 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 @@ -720,7 +720,6 @@ public class VideoActivity extends BaseActivity implements Clock.Callback, Custo builder.getIntent().putExtra("title", mBinding.control.title.getText()); builder.getIntent().putExtra("name", mBinding.control.title.getText()); builder.startChooser(); - checkPlayImg(false); setRedirect(true); } @@ -729,7 +728,6 @@ public class VideoActivity extends BaseActivity implements Clock.Callback, Custo intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); intent.setDataAndType(Uri.parse(mPlayers.getUrl()), "video/*"); startActivity(Intent.createChooser(intent, null)); - checkPlayImg(false); setRedirect(true); return true; } @@ -747,9 +745,8 @@ public class VideoActivity extends BaseActivity implements Clock.Callback, Custo private void checkPlay() { setR1Callback(); - checkPlayImg(!mPlayers.isPlaying()); - if (mPlayers.isPlaying()) mPlayers.pause(); - else mPlayers.play(); + if (mPlayers.isPlaying()) onPaused(); + else onPlay(); } private void checkNext() { @@ -1384,6 +1381,16 @@ public class VideoActivity extends BaseActivity implements Clock.Callback, Custo getDetail(item); } + private void onPaused() { + checkPlayImg(false); + mPlayers.pause(); + } + + private void onPlay() { + checkPlayImg(true); + mPlayers.play(); + } + public boolean isForeground() { return foreground; } @@ -1491,8 +1498,7 @@ public class VideoActivity extends BaseActivity implements Clock.Callback, Custo @Override public void onCastTo() { - checkPlayImg(false); - mPlayers.pause(); + onPaused(); } @Override @@ -1561,8 +1567,8 @@ public class VideoActivity extends BaseActivity implements Clock.Callback, Custo public void onSeekEnd(int time) { mBinding.widget.seek.setVisibility(View.GONE); mPlayers.seekTo(time); - mPlayers.play(); showProgress(); + onPlay(); } @Override @@ -1576,11 +1582,11 @@ public class VideoActivity extends BaseActivity implements Clock.Callback, Custo if (!isFullscreen()) { App.post(this::enterFullscreen, 250); } else if (mPlayers.isPlaying()) { - mPlayers.pause(); showControl(); + onPaused(); } else { - mPlayers.play(); hideControl(); + onPlay(); } } @@ -1629,14 +1635,15 @@ public class VideoActivity extends BaseActivity implements Clock.Callback, Custo protected void onStart() { super.onStart(); mClock.stop().start(); - mPlayers.play(); setStop(false); + onPlay(); } @Override protected void onResume() { super.onResume(); if (isForeground()) return; + if (isRedirect()) onPlay(); App.removeCallbacks(mR0); App.post(mR0, 1000); setForeground(true); @@ -1648,14 +1655,14 @@ public class VideoActivity extends BaseActivity implements Clock.Callback, Custo super.onPause(); setForeground(false); App.removeCallbacks(mR0); - if (isRedirect()) mPlayers.pause(); + if (isRedirect()) onPaused(); else if (Setting.isBackgroundOn() && !isFinishing()) PlaybackService.start(mPlayers); } @Override protected void onStop() { super.onStop(); - if (Setting.isBackgroundOff()) mPlayers.pause(); + if (Setting.isBackgroundOff()) onPaused(); if (Setting.isBackgroundOff()) mClock.stop(); setStop(true); }