diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/CastActivity.java b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/CastActivity.java index e4dcce326..7497a7b3a 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/CastActivity.java +++ b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/CastActivity.java @@ -286,8 +286,10 @@ public class CastActivity extends BaseActivity implements CustomKeyDownVod.Liste @Subscribe(threadMode = ThreadMode.MAIN) public void onActionEvent(ActionEvent event) { - if (ActionEvent.PLAY.equals(event.getAction()) || ActionEvent.PAUSE.equals(event.getAction())) { - onKeyCenter(); + if (ActionEvent.PLAY.equals(event.getAction())) { + onPlay(); + } else if (ActionEvent.PAUSE.equals(event.getAction())) { + onPaused(); } else if (ActionEvent.STOP.equals(event.getAction())) { finish(); } diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/LiveActivity.java b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/LiveActivity.java index c2f93ef8c..b679165fd 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/LiveActivity.java +++ b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/LiveActivity.java @@ -746,8 +746,10 @@ public class LiveActivity extends BaseActivity implements GroupPresenter.OnClick @Subscribe(threadMode = ThreadMode.MAIN) public void onActionEvent(ActionEvent event) { - if (ActionEvent.PLAY.equals(event.getAction()) || ActionEvent.PAUSE.equals(event.getAction())) { - checkPlay(); + if (ActionEvent.PLAY.equals(event.getAction())) { + onPlay(); + } else if (ActionEvent.PAUSE.equals(event.getAction())) { + onPaused(); } else if (ActionEvent.NEXT.equals(event.getAction())) { nextChannel(); } else if (ActionEvent.PREV.equals(event.getAction())) { diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/VideoActivity.java b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/VideoActivity.java index 4a4b7d3fc..eb9dc3b64 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/VideoActivity.java +++ b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/VideoActivity.java @@ -1042,14 +1042,16 @@ public class VideoActivity extends BaseActivity implements CustomKeyDownVod.List @Subscribe(threadMode = ThreadMode.MAIN) public void onActionEvent(ActionEvent event) { if (isRedirect()) return; - if (ActionEvent.PLAY.equals(event.getAction()) || ActionEvent.PAUSE.equals(event.getAction())) { - onKeyCenter(); + if (ActionEvent.PLAY.equals(event.getAction())) { + onPlay(); + } else if (ActionEvent.PAUSE.equals(event.getAction())) { + onPaused(); } else if (ActionEvent.NEXT.equals(event.getAction())) { - mBinding.control.next.performClick(); + checkNext(); } else if (ActionEvent.PREV.equals(event.getAction())) { - mBinding.control.prev.performClick(); + checkPrev(); } else if (ActionEvent.LOOP.equals(event.getAction())) { - mBinding.control.loop.performClick(); + onLoop(); } else if (ActionEvent.REPLAY.equals(event.getAction())) { onReset(true); } else if (ActionEvent.STOP.equals(event.getAction())) { diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/LiveActivity.java b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/LiveActivity.java index 9c563d6b5..4986d3dfd 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/LiveActivity.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/LiveActivity.java @@ -783,8 +783,10 @@ public class LiveActivity extends BaseActivity implements CustomKeyDown.Listener @Subscribe(threadMode = ThreadMode.MAIN) public void onActionEvent(ActionEvent event) { - if (ActionEvent.PLAY.equals(event.getAction()) || ActionEvent.PAUSE.equals(event.getAction())) { - checkPlay(); + if (ActionEvent.PLAY.equals(event.getAction())) { + onPlay(); + } else if (ActionEvent.PAUSE.equals(event.getAction())) { + onPaused(); } else if (ActionEvent.NEXT.equals(event.getAction())) { nextChannel(); } else if (ActionEvent.PREV.equals(event.getAction())) { diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/VideoActivity.java b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/VideoActivity.java index 345b5e0b9..13a716c1c 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/VideoActivity.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/VideoActivity.java @@ -1143,14 +1143,16 @@ public class VideoActivity extends BaseActivity implements Clock.Callback, Custo @Subscribe(threadMode = ThreadMode.MAIN) public void onActionEvent(ActionEvent event) { if (isRedirect()) return; - if (ActionEvent.PLAY.equals(event.getAction()) || ActionEvent.PAUSE.equals(event.getAction())) { - mBinding.control.play.performClick(); + if (ActionEvent.PLAY.equals(event.getAction())) { + onPlay(); + } else if (ActionEvent.PAUSE.equals(event.getAction())) { + onPaused(); } else if (ActionEvent.NEXT.equals(event.getAction())) { - mBinding.control.next.performClick(); + checkNext(); } else if (ActionEvent.PREV.equals(event.getAction())) { - mBinding.control.prev.performClick(); + checkPrev(); } else if (ActionEvent.LOOP.equals(event.getAction())) { - mBinding.control.action.loop.performClick(); + onLoop(); } else if (ActionEvent.REPLAY.equals(event.getAction())) { onReset(true); } else if (ActionEvent.AUDIO.equals(event.getAction())) {