From 1991531b205c1f4f4810f7500ca8103e07bc6156 Mon Sep 17 00:00:00 2001 From: okjack Date: Fri, 7 Jun 2024 10:45:30 +0800 Subject: [PATCH] Add rtsp setting --- .../tv/ui/activity/SettingPlayerActivity.java | 9 ++++++ .../res/layout/activity_setting_player.xml | 29 +++++++++++++++++++ .../java/com/fongmi/android/tv/Setting.java | 8 +++++ .../com/fongmi/android/tv/player/ExoUtil.java | 1 + app/src/main/res/values-zh-rCN/strings.xml | 8 ++++- app/src/main/res/values-zh-rTW/strings.xml | 8 ++++- app/src/main/res/values/strings.xml | 8 ++++- .../tv/ui/fragment/SettingPlayerFragment.java | 9 ++++++ .../res/layout/fragment_setting_player.xml | 27 +++++++++++++++++ 9 files changed, 104 insertions(+), 3 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 09bd544f7..a6ded15bf 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 @@ -31,6 +31,7 @@ public class SettingPlayerActivity extends BaseActivity implements UaCallback, B private String[] scale; private String[] http; private String[] flag; + private String[] rtsp; public static void start(Activity activity) { activity.startActivity(new Intent(activity, SettingPlayerActivity.class)); @@ -53,6 +54,7 @@ public class SettingPlayerActivity extends BaseActivity implements UaCallback, B mBinding.tunnelText.setText(getSwitch(Setting.isTunnel())); mBinding.bufferText.setText(String.valueOf(Setting.getBuffer())); mBinding.subtitleText.setText(String.valueOf(Setting.getSubtitle())); + mBinding.rtspText.setText((rtsp = ResUtil.getStringArray(R.array.select_rtsp))[Setting.getRtsp()]); mBinding.flagText.setText((flag = ResUtil.getStringArray(R.array.select_flag))[Setting.getFlag()]); mBinding.httpText.setText((http = ResUtil.getStringArray(R.array.select_exo_http))[Setting.getHttp()]); mBinding.scaleText.setText((scale = ResUtil.getStringArray(R.array.select_scale))[Setting.getScale()]); @@ -65,6 +67,7 @@ public class SettingPlayerActivity extends BaseActivity implements UaCallback, B @Override protected void initEvent() { mBinding.ua.setOnClickListener(this::onUa); + mBinding.rtsp.setOnClickListener(this::setRtsp); mBinding.http.setOnClickListener(this::setHttp); mBinding.flag.setOnClickListener(this::setFlag); mBinding.scale.setOnClickListener(this::setScale); @@ -95,6 +98,12 @@ 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 setHttp(View view) { int index = Setting.getHttp(); Setting.putHttp(index = index == http.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 d3d53336e..5704b6cfc 100644 --- a/app/src/leanback/res/layout/activity_setting_player.xml +++ b/app/src/leanback/res/layout/activity_setting_player.xml @@ -311,6 +311,35 @@ + + + + + + + + - 影视 + OK影视 再按一次返回键退出 @@ -122,6 +122,7 @@ 隧道模式 连线方式 缓冲时间 + RTSP 通道 User-Agent @@ -309,4 +310,9 @@ 选择字幕 + + UDP + TCP + + \ No newline at end of file diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index af89bb2f5..e6ff78d0a 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -1,7 +1,7 @@ - 影視 + OK影視 再按一次返回鍵退出 @@ -122,6 +122,7 @@ 隧道模式 連線方式 緩衝時間 + RTSP 通道 User-Agent @@ -310,4 +311,9 @@ 選擇字幕 + + UDP + TCP + + \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index c4ab9337e..5ada77697 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,7 +1,7 @@ - TV + OKTV Press back again to exit @@ -122,6 +122,7 @@ Tunnel mode HTTP method Buffer time + RTSP channel User-Agent @@ -314,4 +315,9 @@ 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 cdae5eeee..328d927f4 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 @@ -36,6 +36,7 @@ public class SettingPlayerFragment extends BaseFragment implements UaCallback, B private String[] scale; private String[] http; private String[] flag; + private String[] rtsp; public static SettingPlayerFragment newInstance() { return new SettingPlayerFragment(); @@ -59,6 +60,7 @@ public class SettingPlayerFragment extends BaseFragment implements UaCallback, B mBinding.bufferText.setText(String.valueOf(Setting.getBuffer())); mBinding.subtitleText.setText(String.valueOf(Setting.getSubtitle())); mBinding.danmuLoadText.setText(getSwitch(Setting.isDanmuLoad())); + mBinding.rtspText.setText((rtsp = ResUtil.getStringArray(R.array.select_rtsp))[Setting.getRtsp()]); mBinding.flagText.setText((flag = ResUtil.getStringArray(R.array.select_flag))[Setting.getFlag()]); mBinding.httpText.setText((http = ResUtil.getStringArray(R.array.select_exo_http))[Setting.getHttp()]); mBinding.scaleText.setText((scale = ResUtil.getStringArray(R.array.select_scale))[Setting.getScale()]); @@ -72,6 +74,7 @@ public class SettingPlayerFragment extends BaseFragment implements UaCallback, B @Override protected void initEvent() { mBinding.ua.setOnClickListener(this::onUa); + mBinding.rtsp.setOnClickListener(this::setRtsp); mBinding.http.setOnClickListener(this::setHttp); mBinding.flag.setOnClickListener(this::setFlag); mBinding.scale.setOnClickListener(this::onScale); @@ -104,6 +107,12 @@ 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 setHttp(View view) { int index = Setting.getHttp(); Setting.putHttp(index = index == http.length - 1 ? 0 : ++index); diff --git a/app/src/mobile/res/layout/fragment_setting_player.xml b/app/src/mobile/res/layout/fragment_setting_player.xml index 257a4febb..2aa330629 100644 --- a/app/src/mobile/res/layout/fragment_setting_player.xml +++ b/app/src/mobile/res/layout/fragment_setting_player.xml @@ -266,6 +266,33 @@ + + + + + + + +