From b63dea456837a16be8bbdf6bdd6766fd618180f8 Mon Sep 17 00:00:00 2001 From: okjack Date: Wed, 31 Jul 2024 13:08:38 +0800 Subject: [PATCH] Clean code --- app/build.gradle | 1 - .../fongmi/android/tv/ui/activity/CastActivity.java | 4 ++-- .../fongmi/android/tv/ui/activity/LiveActivity.java | 4 ++-- .../fongmi/android/tv/ui/activity/VideoActivity.java | 4 ++-- .../java/com/fongmi/android/tv/player/Players.java | 10 +++++----- .../fongmi/android/tv/ui/activity/LiveActivity.java | 4 ++-- .../fongmi/android/tv/ui/activity/VideoActivity.java | 4 ++-- 7 files changed, 15 insertions(+), 16 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 379cf4de0..0624491ca 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -150,7 +150,6 @@ dependencies { implementation(ext: 'aar', name: 'lib-datasource-rtmp-release', group: 'fongmi', version: 'release') implementation(ext: 'aar', name: 'lib-decoder-release', group: 'fongmi', version: 'release') implementation(ext: 'aar', name: 'lib-decoder-av1-release', group: 'fongmi', version: 'release') - implementation(ext: 'aar', name: 'lib-decoder-ffmpeg-release', group: 'fongmi', version: 'release') implementation(ext: 'aar', name: 'lib-exoplayer-release', group: 'fongmi', version: 'release') implementation(ext: 'aar', name: 'lib-exoplayer-dash-release', group: 'fongmi', version: 'release') implementation(ext: 'aar', name: 'lib-exoplayer-hls-release', group: 'fongmi', version: 'release') diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/CastActivity.java b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/CastActivity.java index 2efb40e39..62c32d4f0 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/CastActivity.java +++ b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/CastActivity.java @@ -144,7 +144,7 @@ public class CastActivity extends BaseActivity implements CustomKeyDownCast.List } private void setVideoView() { - mPlayers.set(getExo(), getIjk()); + mPlayers.init(getExo(), getIjk()); mPlayers.setPlayer(Setting.getPlayer()); findViewById(R.id.timeBar).setNextFocusUpId(R.id.reset); mBinding.control.reset.setText(ResUtil.getStringArray(R.array.select_reset)[0]); @@ -220,7 +220,7 @@ public class CastActivity extends BaseActivity implements CustomKeyDownCast.List private void onDecode(boolean save) { mPlayers.toggleDecode(save); - mPlayers.set(getExo(), getIjk()); + mPlayers.init(getExo(), getIjk()); setDecodeView(); onReset(); } 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 c214dbd26..2a837fcef 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 @@ -210,7 +210,7 @@ public class LiveActivity extends BaseActivity implements Clock.Callback, GroupP } private void setVideoView() { - mPlayers.set(getExo(), getIjk()); + mPlayers.init(getExo(), getIjk()); setScale(Setting.getLiveScale()); mBinding.control.invert.setActivated(Setting.isInvert()); mBinding.control.across.setActivated(Setting.isAcross()); @@ -430,7 +430,7 @@ public class LiveActivity extends BaseActivity implements Clock.Callback, GroupP private void onDecode(boolean save) { mPlayers.toggleDecode(save); - mPlayers.set(getExo(), getIjk()); + mPlayers.init(getExo(), getIjk()); setDecodeView(); fetch(); } 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 5a4c66557..520be734a 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 @@ -450,7 +450,7 @@ public class VideoActivity extends BaseActivity implements CustomKeyDownVod.List } private void setVideoView() { - mPlayers.set(getExo(), getIjk()); + mPlayers.init(getExo(), getIjk()); mBinding.control.reset.setText(ResUtil.getStringArray(R.array.select_reset)[Setting.getReset()]); } @@ -1072,7 +1072,7 @@ public class VideoActivity extends BaseActivity implements CustomKeyDownVod.List private void onDecode(boolean save) { mPlayers.toggleDecode(save); - mPlayers.set(getExo(), getIjk()); + mPlayers.init(getExo(), getIjk()); setDecodeView(); onRefresh(); } 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 daec1b17c..fc52150f8 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 @@ -140,14 +140,14 @@ public class Players implements Player.Listener, IMediaPlayer.Listener, ParseCal MediaControllerCompat.setMediaController(activity, session.getController()); } - public void set(PlayerView exo, IjkVideoView ijk) { + public void init(PlayerView exo, IjkVideoView ijk) { releaseExo(); releaseIjk(); - setupExo(exo); - setupIjk(ijk); + initExo(exo); + initIjk(ijk); } - private void setupExo(PlayerView view) { + private void initExo(PlayerView view) { exoPlayer = new ExoPlayer.Builder(App.get()).setLoadControl(ExoUtil.buildLoadControl()).setTrackSelector(ExoUtil.buildTrackSelector()).setRenderersFactory(ExoUtil.buildRenderersFactory(decode)).setMediaSourceFactory(ExoUtil.buildMediaSourceFactory()).build(); exoPlayer.setAudioAttributes(AudioAttributes.DEFAULT, true); exoPlayer.addAnalyticsListener(new EventLogger()); @@ -158,7 +158,7 @@ public class Players implements Player.Listener, IMediaPlayer.Listener, ParseCal view.setPlayer(exoPlayer); } - private void setupIjk(IjkVideoView view) { + private void initIjk(IjkVideoView view) { ijkPlayer = view.render(Setting.getRender()).decode(decode); ijkPlayer.addListener(this); ijkPlayer.setPlayer(player); 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 86574f88e..9df541313 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 @@ -235,7 +235,7 @@ public class LiveActivity extends BaseActivity implements Clock.Callback, Custom } private void setVideoView() { - mPlayers.set(getExo(), getIjk()); + mPlayers.init(getExo(), getIjk()); setScale(Setting.getLiveScale()); mBinding.control.action.invert.setActivated(Setting.isInvert()); mBinding.control.action.across.setActivated(Setting.isAcross()); @@ -468,7 +468,7 @@ public class LiveActivity extends BaseActivity implements Clock.Callback, Custom private void onDecode(boolean save) { mPlayers.toggleDecode(save); - mPlayers.set(getExo(), getIjk()); + mPlayers.init(getExo(), getIjk()); setDecodeView(); setR1Callback(); fetch(); 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 49a07a21d..a912f9f1b 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 @@ -432,7 +432,7 @@ public class VideoActivity extends BaseActivity implements Clock.Callback, Custo } private void setVideoView() { - mPlayers.set(getExo(), getIjk()); + mPlayers.init(getExo(), getIjk()); if (isPort() && ResUtil.isLand(this)) enterFullscreen(); mBinding.control.action.reset.setText(ResUtil.getStringArray(R.array.select_reset)[Setting.getReset()]); mBinding.video.addOnLayoutChangeListener((view, left, top, right, bottom, oldLeft, oldTop, oldRight, oldBottom) -> mPiP.update(getActivity(), view)); @@ -924,7 +924,7 @@ public class VideoActivity extends BaseActivity implements Clock.Callback, Custo private void onDecode(boolean save) { mPlayers.toggleDecode(save); - mPlayers.set(getExo(), getIjk()); + mPlayers.init(getExo(), getIjk()); setDecodeView(); setR1Callback(); onRefresh();