From 2abfd1ebeeafe24bcd545052c836c3499926d3bd Mon Sep 17 00:00:00 2001 From: FongMi Date: Wed, 23 Apr 2025 01:27:42 +0800 Subject: [PATCH] Remove rtsp channel --- .../tv/ui/activity/SettingPlayerActivity.java | 9 ------ .../res/layout/activity_setting_player.xml | 29 ------------------- .../java/com/fongmi/android/tv/Setting.java | 16 ---------- .../fongmi/android/tv/player/exo/ExoUtil.java | 1 - app/src/main/res/values-zh-rCN/strings.xml | 1 - app/src/main/res/values-zh-rTW/strings.xml | 1 - app/src/main/res/values/strings.xml | 6 ---- .../tv/ui/fragment/SettingPlayerFragment.java | 9 ------ .../res/layout/fragment_setting_player.xml | 27 ----------------- 9 files changed, 99 deletions(-) diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/SettingPlayerActivity.java b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/SettingPlayerActivity.java index 6b2633b9a..717a117ad 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/SettingPlayerActivity.java +++ b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/SettingPlayerActivity.java @@ -28,7 +28,6 @@ public class SettingPlayerActivity extends BaseActivity implements UaCallback, B private String[] caption; private String[] render; private String[] scale; - private String[] rtsp; public static void start(Activity activity) { activity.startActivity(new Intent(activity, SettingPlayerActivity.class)); @@ -55,7 +54,6 @@ public class SettingPlayerActivity extends BaseActivity implements UaCallback, B mBinding.backgroundText.setText(getSwitch(Setting.isBackgroundOn())); mBinding.audioDecodeText.setText(getSwitch(Setting.isAudioPrefer())); mBinding.danmakuLoadText.setText(getSwitch(Setting.isDanmakuLoad())); - mBinding.rtspText.setText((rtsp = ResUtil.getStringArray(R.array.select_rtsp))[Setting.getRtsp()]); mBinding.scaleText.setText((scale = ResUtil.getStringArray(R.array.select_scale))[Setting.getScale()]); mBinding.renderText.setText((render = ResUtil.getStringArray(R.array.select_render))[Setting.getRender()]); mBinding.captionText.setText((caption = ResUtil.getStringArray(R.array.select_caption))[Setting.isCaption() ? 1 : 0]); @@ -64,7 +62,6 @@ public class SettingPlayerActivity extends BaseActivity implements UaCallback, B @Override protected void initEvent() { mBinding.ua.setOnClickListener(this::onUa); - mBinding.rtsp.setOnClickListener(this::setRtsp); mBinding.scale.setOnClickListener(this::setScale); mBinding.speed.setOnClickListener(this::onSpeed); mBinding.buffer.setOnClickListener(this::onBuffer); @@ -92,12 +89,6 @@ public class SettingPlayerActivity extends BaseActivity implements UaCallback, B Setting.putUa(ua); } - private void setRtsp(View view) { - int index = Setting.getRtsp(); - Setting.putRtsp(index = index == rtsp.length - 1 ? 0 : ++index); - mBinding.rtspText.setText(rtsp[index]); - } - private void setScale(View view) { int index = Setting.getScale(); Setting.putScale(index = index == scale.length - 1 ? 0 : ++index); diff --git a/app/src/leanback/res/layout/activity_setting_player.xml b/app/src/leanback/res/layout/activity_setting_player.xml index 95cf1de30..e041a2de7 100644 --- a/app/src/leanback/res/layout/activity_setting_player.xml +++ b/app/src/leanback/res/layout/activity_setting_player.xml @@ -292,35 +292,6 @@ - - - - - - - - 隧道模式 缓冲时间 长按倍速 - RTSP 通道 User-Agent diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 1e4d5b510..a1b45336f 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -101,7 +101,6 @@ 隧道模式 緩衝時間 長按倍速 - RTSP 通道 User-Agent diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 11dd89abb..9ea21a90b 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -102,7 +102,6 @@ Tunnel mode Buffer time Press speed - RTSP channel User-Agent @@ -201,9 +200,4 @@ Select subtitle track - - UDP - TCP - - \ No newline at end of file diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/SettingPlayerFragment.java b/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/SettingPlayerFragment.java index 7146b4bd3..4191003ac 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/SettingPlayerFragment.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/SettingPlayerFragment.java @@ -33,7 +33,6 @@ public class SettingPlayerFragment extends BaseFragment implements UaCallback, B private String[] caption; private String[] render; private String[] scale; - private String[] rtsp; public static SettingPlayerFragment newInstance() { return new SettingPlayerFragment(); @@ -58,7 +57,6 @@ public class SettingPlayerFragment extends BaseFragment implements UaCallback, B mBinding.audioDecodeText.setText(getSwitch(Setting.isAudioPrefer())); mBinding.danmakuLoadText.setText(getSwitch(Setting.isDanmakuLoad())); mBinding.caption.setVisibility(Setting.hasCaption() ? View.VISIBLE : View.GONE); - mBinding.rtspText.setText((rtsp = ResUtil.getStringArray(R.array.select_rtsp))[Setting.getRtsp()]); mBinding.scaleText.setText((scale = ResUtil.getStringArray(R.array.select_scale))[Setting.getScale()]); mBinding.renderText.setText((render = ResUtil.getStringArray(R.array.select_render))[Setting.getRender()]); mBinding.captionText.setText((caption = ResUtil.getStringArray(R.array.select_caption))[Setting.isCaption() ? 1 : 0]); @@ -68,7 +66,6 @@ public class SettingPlayerFragment extends BaseFragment implements UaCallback, B @Override protected void initEvent() { mBinding.ua.setOnClickListener(this::onUa); - mBinding.rtsp.setOnClickListener(this::setRtsp); mBinding.scale.setOnClickListener(this::onScale); mBinding.speed.setOnClickListener(this::onSpeed); mBinding.buffer.setOnClickListener(this::onBuffer); @@ -91,12 +88,6 @@ public class SettingPlayerFragment extends BaseFragment implements UaCallback, B Setting.putUa(ua); } - private void setRtsp(View view) { - int index = Setting.getRtsp(); - Setting.putRtsp(index = index == rtsp.length - 1 ? 0 : ++index); - mBinding.rtspText.setText(rtsp[index]); - } - private void onScale(View view) { new MaterialAlertDialogBuilder(getActivity()).setTitle(R.string.player_scale).setNegativeButton(R.string.dialog_negative, null).setSingleChoiceItems(scale, Setting.getScale(), (dialog, which) -> { mBinding.scaleText.setText(scale[which]); diff --git a/app/src/mobile/res/layout/fragment_setting_player.xml b/app/src/mobile/res/layout/fragment_setting_player.xml index e78a558d5..e8d46aaba 100644 --- a/app/src/mobile/res/layout/fragment_setting_player.xml +++ b/app/src/mobile/res/layout/fragment_setting_player.xml @@ -303,33 +303,6 @@ - - - - - - - -