diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/SettingActivity.java b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/SettingActivity.java index 0b94c13e3..cd6447daf 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/SettingActivity.java +++ b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/SettingActivity.java @@ -49,10 +49,6 @@ public class SettingActivity extends BaseActivity implements ConfigCallback, Sit private ActivitySettingBinding mBinding; private String[] quality; - private String[] render; - private String[] decode; - private String[] player; - private String[] scale; private String[] size; private int type; @@ -86,10 +82,6 @@ public class SettingActivity extends BaseActivity implements ConfigCallback, Sit mBinding.versionText.setText(BuildConfig.VERSION_NAME); mBinding.proxyText.setText(UrlUtil.scheme(Setting.getProxy())); mBinding.sizeText.setText((size = ResUtil.getStringArray(R.array.select_size))[Setting.getSize()]); - mBinding.scaleText.setText((scale = ResUtil.getStringArray(R.array.select_scale))[Setting.getScale()]); - mBinding.playerText.setText((player = ResUtil.getStringArray(R.array.select_player))[Setting.getPlayer()]); - mBinding.decodeText.setText((decode = ResUtil.getStringArray(R.array.select_decode))[Setting.getDecode()]); - mBinding.renderText.setText((render = ResUtil.getStringArray(R.array.select_render))[Setting.getRender()]); mBinding.qualityText.setText((quality = ResUtil.getStringArray(R.array.select_quality))[Setting.getQuality()]); setCacheText(); } @@ -111,6 +103,7 @@ public class SettingActivity extends BaseActivity implements ConfigCallback, Sit mBinding.proxy.setOnClickListener(this::onProxy); mBinding.cache.setOnClickListener(this::onCache); mBinding.backup.setOnClickListener(this::onBackup); + mBinding.player.setOnClickListener(this::onPlayer); mBinding.version.setOnClickListener(this::onVersion); mBinding.vod.setOnLongClickListener(this::onVodEdit); mBinding.vodHome.setOnClickListener(this::onVodHome); @@ -121,14 +114,9 @@ public class SettingActivity extends BaseActivity implements ConfigCallback, Sit mBinding.vodHistory.setOnClickListener(this::onVodHistory); mBinding.version.setOnLongClickListener(this::onVersionDev); mBinding.liveHistory.setOnClickListener(this::onLiveHistory); - mBinding.player.setOnLongClickListener(this::onPlayerSetting); mBinding.wallDefault.setOnClickListener(this::setWallDefault); mBinding.wallRefresh.setOnClickListener(this::setWallRefresh); mBinding.quality.setOnClickListener(this::setQuality); - mBinding.player.setOnClickListener(this::onPlayerSetting); - mBinding.decode.setOnClickListener(this::setDecode); - mBinding.render.setOnClickListener(this::setRender); - mBinding.scale.setOnClickListener(this::setScale); mBinding.size.setOnClickListener(this::setSize); mBinding.doh.setOnClickListener(this::setDoh); } @@ -259,9 +247,8 @@ public class SettingActivity extends BaseActivity implements ConfigCallback, Sit HistoryDialog.create(this).type(type = 1).show(); } - private boolean onPlayerSetting(View view) { + private void onPlayer(View view) { SettingPlayerActivity.start(this); - return true; } private void onVersion(View view) { @@ -295,24 +282,6 @@ public class SettingActivity extends BaseActivity implements ConfigCallback, Sit RefreshEvent.image(); } - private void setDecode(View view) { - int index = Setting.getDecode(); - Setting.putDecode(index = index == decode.length - 1 ? 0 : ++index); - mBinding.decodeText.setText(decode[index]); - } - - private void setRender(View view) { - int index = Setting.getRender(); - Setting.putRender(index = index == render.length - 1 ? 0 : ++index); - mBinding.renderText.setText(render[index]); - } - - private void setScale(View view) { - int index = Setting.getScale(); - Setting.putScale(index = index == scale.length - 1 ? 0 : ++index); - mBinding.scaleText.setText(scale[index]); - } - private void setSize(View view) { int index = Setting.getSize(); Setting.putSize(index = index == size.length - 1 ? 0 : ++index); 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 203ffc5c6..76e8d3d3a 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[] danmuSpeed; private String[] caption; private String[] player; + private String[] render; private String[] http; private String[] flag; @@ -60,6 +61,7 @@ public class SettingPlayerActivity extends BaseActivity implements UaCallback, B 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.playerText.setText((player = ResUtil.getStringArray(R.array.select_player))[Setting.getPlayer()]); + 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]); mBinding.danmuSpeedText.setText((danmuSpeed = ResUtil.getStringArray(R.array.select_danmu_speed))[Setting.getDanmuSpeed()]); } @@ -71,6 +73,7 @@ public class SettingPlayerActivity extends BaseActivity implements UaCallback, B mBinding.flag.setOnClickListener(this::setFlag); mBinding.buffer.setOnClickListener(this::onBuffer); mBinding.player.setOnClickListener(this::setPlayer); + mBinding.render.setOnClickListener(this::setRender); mBinding.tunnel.setOnClickListener(this::setTunnel); mBinding.caption.setOnClickListener(this::setCaption); mBinding.subtitle.setOnClickListener(this::onSubtitle); @@ -127,6 +130,12 @@ public class SettingPlayerActivity extends BaseActivity implements UaCallback, B setVisible(); } + private void setRender(View view) { + int index = Setting.getRender(); + Setting.putRender(index = index == render.length - 1 ? 0 : ++index); + mBinding.renderText.setText(render[index]); + } + private void setTunnel(View view) { Setting.putTunnel(!Setting.isTunnel()); mBinding.tunnelText.setText(getSwitch(Setting.isTunnel())); diff --git a/app/src/leanback/res/layout/activity_setting.xml b/app/src/leanback/res/layout/activity_setting.xml index fcbffcb1a..f4a628721 100644 --- a/app/src/leanback/res/layout/activity_setting.xml +++ b/app/src/leanback/res/layout/activity_setting.xml @@ -148,7 +148,6 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="16dp" - android:nextFocusDown="@id/render" android:orientation="horizontal"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + android:text="@string/setting_player" + android:textColor="@color/white" + android:textSize="18sp" /> - @@ -42,7 +42,7 @@ + tools:text="Surface" /> @@ -88,7 +84,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginEnd="16dp" - android:text="@string/setting_player_caption" + android:text="@string/player_caption" android:textColor="@color/white" android:textSize="18sp" /> @@ -117,7 +113,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginEnd="16dp" - android:text="@string/setting_player_subtitle" + android:text="@string/player_subtitle" android:textColor="@color/white" android:textSize="18sp" /> @@ -133,7 +129,7 @@ + tools:text="慢" /> + tools:text="1" /> + + - - + tools:text="自動" /> @@ -280,7 +276,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginEnd="16dp" - android:text="@string/setting_player_tunnel" + android:text="@string/player_exo_tunnel" android:textColor="@color/white" android:textSize="18sp" /> @@ -309,7 +305,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginEnd="16dp" - android:text="@string/setting_player_http" + android:text="@string/player_exo_http" android:textColor="@color/white" android:textSize="18sp" /> @@ -338,7 +334,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginEnd="16dp" - android:text="@string/setting_player_buffer" + android:text="@string/player_exo_buffer" android:textColor="@color/white" android:textSize="18sp" /> @@ -361,5 +357,38 @@ android:textSize="18sp" /> + + + + + + + + \ No newline at end of file diff --git a/app/src/leanback/res/layout/dialog_ua.xml b/app/src/leanback/res/layout/dialog_ua.xml index c6a14ec9d..f91265032 100644 --- a/app/src/leanback/res/layout/dialog_ua.xml +++ b/app/src/leanback/res/layout/dialog_ua.xml @@ -34,7 +34,7 @@ android:layout_above="@+id/bottom" android:layout_alignStart="@+id/info" android:layout_marginBottom="10dp" - android:hint="@string/setting_player_ua" + android:hint="@string/player_ua" android:imeOptions="actionDone" android:importantForAutofill="no" android:inputType="text" diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 1b8ffe7b3..7c6f0ab99 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -65,21 +65,7 @@ 点播 直播 壁纸 - 播放器 - User-Agent - 线路播放 - 连线方式 - 缓冲时间 - 隧道模式 - 字幕样式 - 字幕大小 - 后台播放 - 弹幕大小 - 弹幕速度 - 弹幕行数 - 解码方式 - 渲染方式 - 缩放比例 + 播放设置 图片品质 图片尺寸 DoH @@ -92,6 +78,21 @@ 关闭 开启 + + 播放器 + 渲染方式 + 字幕样式 + 字幕大小 + 弹幕速度 + 弹幕大小 + 弹幕行数 + 后台播放 + 线路播放 + 隧道模式 + 连线方式 + 缓冲时间 + 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 5b4360b5d..c11186485 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -65,21 +65,7 @@ 點播 直播 壁紙 - 播放器 - User-Agent - 線路播放 - 連線方式 - 緩衝時間 - 隧道模式 - 字幕樣式 - 字幕大小 - 背景播放 - 彈幕大小 - 彈幕速度 - 彈幕行數 - 解碼方式 - 渲染方式 - 縮放比例 + 播放設定 圖片品質 圖片尺寸 DoH @@ -92,6 +78,21 @@ 關閉 開啟 + + 播放器 + 渲染方式 + 字幕樣式 + 字幕大小 + 彈幕速度 + 彈幕大小 + 彈幕行數 + 背景播放 + 線路播放 + 隧道模式 + 連線方式 + 緩衝時間 + User-Agent + 關鍵字… 歷史 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 1462617cf..65c921ea9 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -65,21 +65,7 @@ Vod Live Wallpaper - Player - User-Agent - Flag play - HTTP method - Buffer time - Tunnel mode - Caption style - Subtitle size - Background play - Danmu size - Danmu speed - Danmu line - Decode - Render - Scale + Player setting Image quality Image size DoH @@ -92,6 +78,21 @@ Off On + + Player + Render + Caption style + Subtitle size + Danmu speed + Danmu size + Danmu line + Background play + Flag play + Tunnel mode + HTTP method + Buffer time + User-Agent + Keywords… History @@ -147,11 +148,11 @@ - Super Slow + Super slow Slow Moderate Fast - Super Fast + Super fast