hg
/
JY-TVBoxOS
mirror of https://github.com/q215613905/TVBoxOS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

开始播放界面相关UI调整

Browse Source
pull/1/head
DreamDSTR 3 years ago
parent 5dd9798ccd
commit b8018ab663
3 changed files with 53 additions and 20 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 4
      app/src/main/java/com/github/tvbox/osc/player/controller/BaseController.java
  2. 60
      app/src/main/java/com/github/tvbox/osc/player/controller/VodController.java
  3. 9
      app/src/main/res/layout/player_vod_control_view.xml

4
app/src/main/java/com/github/tvbox/osc/player/controller/BaseController.java
Unescape View File

@ -428,10 +428,6 @@ public abstract class BaseController extends BaseVideoController implements Gest
}
public boolean onKeyEvent(KeyEvent event) {
if (!isInPlaybackState() //不处于播放状态
|| isLocked() //锁住了屏幕
)
return false;
return false;
}
}

60
app/src/main/java/com/github/tvbox/osc/player/controller/VodController.java
Unescape View File

@ -191,35 +191,63 @@ public class VodController extends BaseController {
if (super.onKeyEvent(event)) {
return true;
}
if (isInPlaybackState()) {
int keyCode = event.getKeyCode();
int action = event.getAction();
if (action == KeyEvent.ACTION_DOWN) {
if (keyCode == KeyEvent.KEYCODE_DPAD_RIGHT || keyCode == KeyEvent.KEYCODE_DPAD_LEFT) {
if (mBottomRoot.getVisibility() == VISIBLE) {
return super.dispatchKeyEvent(event);
}
boolean isInPlayback = isInPlaybackState();
int keyCode = event.getKeyCode();
int action = event.getAction();
if (action == KeyEvent.ACTION_DOWN) {
if (keyCode == KeyEvent.KEYCODE_DPAD_RIGHT || keyCode == KeyEvent.KEYCODE_DPAD_LEFT) {
if (isInPlayback) {
tvSlideStart(keyCode == KeyEvent.KEYCODE_DPAD_RIGHT ? 1 : -1);
} else if (keyCode == KeyEvent.KEYCODE_DPAD_CENTER || keyCode == KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE) {
return true;
}
} else if (keyCode == KeyEvent.KEYCODE_DPAD_CENTER || keyCode == KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE) {
if (isInPlayback) {
togglePlay();
} else if (keyCode == KeyEvent.KEYCODE_DPAD_UP) {
} else if (keyCode == KeyEvent.KEYCODE_DPAD_DOWN) {
return true;
}
} else if (keyCode == KeyEvent.KEYCODE_DPAD_UP) {
} else if (keyCode == KeyEvent.KEYCODE_DPAD_DOWN) {
if (mBottomRoot.getVisibility() == GONE) {
mHandler.removeMessages(1003);
mHandler.sendEmptyMessage(1002);
}
} else if (action == KeyEvent.ACTION_UP) {
if (keyCode == KeyEvent.KEYCODE_DPAD_RIGHT || keyCode == KeyEvent.KEYCODE_DPAD_LEFT) {
}
} else if (action == KeyEvent.ACTION_UP) {
if (keyCode == KeyEvent.KEYCODE_DPAD_RIGHT || keyCode == KeyEvent.KEYCODE_DPAD_LEFT) {
if (isInPlayback) {
tvSlideStop();
return true;
}
}
return super.dispatchKeyEvent(event);
}
return false;
return super.dispatchKeyEvent(event);
}
@Override
public boolean onSingleTapConfirmed(MotionEvent e) {
if (isInPlaybackState()) {
if (mBottomRoot.getVisibility() == GONE) {
mHandler.removeMessages(1003);
mHandler.sendEmptyMessage(1002);
} else {
mHandler.removeMessages(1002);
mHandler.sendEmptyMessage(1003);
mHandler.removeMessages(1004);
mHandler.sendEmptyMessageDelayed(1004, 3000);
}
return true;
}
@Override
public boolean onBackPressed() {
if (super.onBackPressed()) {
return true;
}
return super.onSingleTapConfirmed(e);
if (mBottomRoot.getVisibility() == VISIBLE) {
mHandler.removeMessages(1002);
mHandler.sendEmptyMessage(1003);
return true;
}
return false;
}
}

9
app/src/main/res/layout/player_vod_control_view.xml
Unescape View File

@ -32,6 +32,7 @@
android:layout_marginEnd="@dimen/vs_10"
android:layout_marginRight="@dimen/vs_10"
android:background="@drawable/button_dialog_main"
android:focusable="true"
android:padding="@dimen/vs_10"
android:text="上一集"
android:textColor="@android:color/white"
@ -44,6 +45,7 @@
android:layout_marginEnd="@dimen/vs_10"
android:layout_marginRight="@dimen/vs_10"
android:background="@drawable/button_dialog_main"
android:focusable="true"
android:padding="@dimen/vs_10"
android:text="下一集"
android:textColor="@android:color/white"
@ -56,6 +58,7 @@
android:layout_marginEnd="@dimen/vs_10"
android:layout_marginRight="@dimen/vs_10"
android:background="@drawable/button_dialog_main"
android:focusable="true"
android:padding="@dimen/vs_10"
android:text="系统播放器"
android:textColor="@android:color/white"
@ -68,6 +71,7 @@
android:layout_marginEnd="@dimen/vs_10"
android:layout_marginRight="@dimen/vs_10"
android:background="@drawable/button_dialog_main"
android:focusable="true"
android:padding="@dimen/vs_10"
android:text="硬解码"
android:textColor="@android:color/white"
@ -80,6 +84,7 @@
android:layout_marginEnd="@dimen/vs_10"
android:layout_marginRight="@dimen/vs_10"
android:background="@drawable/button_dialog_main"
android:focusable="true"
android:padding="@dimen/vs_10"
android:text="16:9"
android:textColor="@android:color/white"
@ -92,6 +97,7 @@
android:layout_marginEnd="@dimen/vs_10"
android:layout_marginRight="@dimen/vs_10"
android:background="@drawable/button_dialog_main"
android:focusable="true"
android:padding="@dimen/vs_10"
android:text="x1.0"
android:textColor="@android:color/white"
@ -115,6 +121,7 @@
android:layout_marginEnd="@dimen/vs_10"
android:layout_marginRight="@dimen/vs_10"
android:background="@drawable/button_dialog_main"
android:focusable="true"
android:padding="@dimen/vs_10"
android:text="01:00"
android:textColor="@android:color/white"
@ -127,6 +134,7 @@
android:layout_marginEnd="@dimen/vs_10"
android:layout_marginRight="@dimen/vs_10"
android:background="@drawable/button_dialog_main"
android:focusable="true"
android:padding="@dimen/vs_10"
android:text="01:00"
android:textColor="@android:color/white"
@ -139,6 +147,7 @@
android:layout_marginEnd="@dimen/vs_10"
android:layout_marginRight="@dimen/vs_10"
android:background="@drawable/button_dialog_main"
android:focusable="true"
android:padding="@dimen/vs_10"
android:text="1S"
android:textColor="@android:color/white"

Write Preview
Loading…
Cancel
Save