From 8cf8bb7195dd6ff522a19f019baf3245378105bc Mon Sep 17 00:00:00 2001 From: ourfor Date: Sat, 7 Dec 2024 16:25:19 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=94=A7=20update=20player=20kernel=20defau?= =?UTF-8?q?lt=20value?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../top/ourfor/app/iplayx/common/type/PlayerKernelType.java | 2 +- .../app/iplayx/page/setting/video/PlayerKernelModel.java | 1 - .../top/ourfor/app/iplayx/page/setting/video/VideoPage.java | 4 ++-- .../top/ourfor/app/iplayx/view/video/PlayerContentView.java | 6 +++--- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/android/app/src/main/java/top/ourfor/app/iplayx/common/type/PlayerKernelType.java b/android/app/src/main/java/top/ourfor/app/iplayx/common/type/PlayerKernelType.java index 128bc59..bf842e6 100644 --- a/android/app/src/main/java/top/ourfor/app/iplayx/common/type/PlayerKernelType.java +++ b/android/app/src/main/java/top/ourfor/app/iplayx/common/type/PlayerKernelType.java @@ -2,6 +2,6 @@ public enum PlayerKernelType { MPV, - VLC, EXO, + VLC, } diff --git a/android/app/src/main/java/top/ourfor/app/iplayx/page/setting/video/PlayerKernelModel.java b/android/app/src/main/java/top/ourfor/app/iplayx/page/setting/video/PlayerKernelModel.java index c9c5322..e73b9b0 100644 --- a/android/app/src/main/java/top/ourfor/app/iplayx/page/setting/video/PlayerKernelModel.java +++ b/android/app/src/main/java/top/ourfor/app/iplayx/page/setting/video/PlayerKernelModel.java @@ -8,7 +8,6 @@ import lombok.NoArgsConstructor; import lombok.With; import top.ourfor.app.iplayx.common.type.PlayerKernelType; -import top.ourfor.app.iplayx.page.setting.theme.ThemeModel; @Builder @With diff --git a/android/app/src/main/java/top/ourfor/app/iplayx/page/setting/video/VideoPage.java b/android/app/src/main/java/top/ourfor/app/iplayx/page/setting/video/VideoPage.java index 50eac04..36c7060 100644 --- a/android/app/src/main/java/top/ourfor/app/iplayx/page/setting/video/VideoPage.java +++ b/android/app/src/main/java/top/ourfor/app/iplayx/page/setting/video/VideoPage.java @@ -53,9 +53,9 @@ public void onCreate(@Nullable Bundle savedInstanceState) { } } var kernelOptions = List.of( - new OptionModel<>(PlayerKernelType.VLC, getContext().getString(R.string.player_vlc)), new OptionModel<>(PlayerKernelType.MPV, getContext().getString(R.string.player_mpv)), - new OptionModel<>(PlayerKernelType.EXO, getContext().getString(R.string.player_exo)) + new OptionModel<>(PlayerKernelType.EXO, getContext().getString(R.string.player_exo)), + new OptionModel<>(PlayerKernelType.VLC, getContext().getString(R.string.player_vlc)) ); var defaultPlayerKernelOption = kernelOptions.get(0); for (val option : kernelOptions) { diff --git a/android/app/src/main/java/top/ourfor/app/iplayx/view/video/PlayerContentView.java b/android/app/src/main/java/top/ourfor/app/iplayx/view/video/PlayerContentView.java index 8abeebd..a36bfef 100644 --- a/android/app/src/main/java/top/ourfor/app/iplayx/view/video/PlayerContentView.java +++ b/android/app/src/main/java/top/ourfor/app/iplayx/view/video/PlayerContentView.java @@ -23,15 +23,15 @@ public PlayerContentView(Context context) { public void initialize(String configDir, String cacheDir, String fontDir) { switch (AppSetting.shared.playerKernel) { - case VLC: - viewModel = new VLCPlayerViewModel(this); - break; case MPV: viewModel = new MPVPlayerViewModel(configDir, cacheDir, fontDir); break; case EXO: viewModel = new ExoPlayerViewModel(this); break; + case VLC: + viewModel = new VLCPlayerViewModel(this); + break; default: log.info("Using default player: MPV"); viewModel = new MPVPlayerViewModel(configDir, cacheDir, fontDir);