Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 25 additions & 0 deletions app/src/main/java/com/whyun/witv/ui/PlayerActivity.java
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import android.os.Handler;
import android.os.Looper;
import android.view.KeyEvent;
import android.view.MotionEvent;
import android.view.View;
import android.widget.ImageView;
import android.widget.LinearLayout;
Expand Down Expand Up @@ -213,6 +214,30 @@ private void initViews() {
private void initPlayer() {
playerView = findViewById(R.id.player_view);
playerView.setUseController(false);
playerView.setOnTouchListener((v, event) -> {
int action = event.getActionMasked();
// PlayerView does not claim touches when its controller is disabled, so claim the sequence here.
if (action == MotionEvent.ACTION_DOWN) {
return true;
}
if (action != MotionEvent.ACTION_UP) {
return false;
}
if (emptyState != null && emptyState.getVisibility() == View.VISIBLE) {
return false;
}
if (isSettingsPanelVisible() || isChannelListPanelVisible()) {
return false;
}
float touchX = event.getX();
if (touchX < v.getWidth() / 2f) {
showChannelList();
} else {
showSettingsPanel();
}
v.performClick();
return true;
});
Comment thread
cursor[bot] marked this conversation as resolved.

playerManager = new PlayerManager(this);
playerManager.initialize(playerView);
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<string name="about_app_title">关于 WiTV</string>
<string name="about_app_body_format">版本:%1$s\n构建时间:%2$s\n\n应用 ID:%3$s</string>
<string name="media_info_no_playback">当前无正在播放的频道</string>
<string name="settings_help_body">• 使用浏览器访问管理地址添加/管理 M3U 地址\n• 上/下键:切换频道(可在设置中反转)\n• 确认键:显示频道列表\n• 信息键 / 空格:显示/隐藏 EPG 与信号信息面板\n• 菜单键 / F6:打开设置;首页左侧选中「设置」分类即打开设置层\n• 「帮助与说明」内可查看媒体信息(仅播放页)、本说明与关于 APP\n• 收藏键 / F 键:收藏/取消收藏当前频道;频道列表中长按确认键可收藏/取消当前焦点行\n• 启动时自动播放上次观看的频道\n• 可在设置中开启「播放页显示视频加载速度」\n• 「切换源」用于在同一频道多条播放地址间手动切换</string>
<string name="settings_help_body">• 使用浏览器访问管理地址添加/管理 M3U 地址\n• 上/下键:切换频道(可在设置中反转)\n• 点击屏幕左侧:显示频道菜单;点击屏幕右侧:显示设置菜单;确认键:显示频道列表\n• 信息键 / 空格:显示/隐藏 EPG 与信号信息面板\n• 菜单键 / F6:打开设置;首页左侧选中「设置」分类即打开设置层\n• 「帮助与说明」内可查看媒体信息(仅播放页)、本说明与关于 APP\n• 收藏键 / F 键:收藏/取消收藏当前频道;频道列表中长按确认键可收藏/取消当前焦点行\n• 启动时自动播放上次观看的频道\n• 可在设置中开启「播放页显示视频加载速度」\n• 「切换源」用于在同一频道多条播放地址间手动切换</string>
<string name="save_epg_settings">保存 EPG 设置</string>
<string name="reload_epg_data">刷新 EPG 数据</string>
<string name="switch_stream_empty">当前频道仅有一个播放地址</string>
Expand Down
Loading