pull/123/head
FongMi 3 years ago
parent 9ca59e50ec
commit cd8f0ed8fb
  1. 4
      app/src/leanback/java/com/fongmi/android/tv/ui/activity/LiveActivity.java
  2. 6
      app/src/leanback/java/com/fongmi/android/tv/ui/custom/CustomKeyDownLive.java
  3. 4
      catvod/src/main/java/com/github/catvod/crawler/Spider.java

@ -558,6 +558,7 @@ public class LiveActivity extends BaseActivity implements GroupPresenter.OnClick
@Override @Override
public void onKeyUp() { public void onKeyUp() {
if (mGroup == null || mChannel == null) return;
int position = mGroup.getPosition() - 1; int position = mGroup.getPosition() - 1;
boolean limit = position < 0; boolean limit = position < 0;
if (Prefers.isAcross() & limit) prevGroup(true); if (Prefers.isAcross() & limit) prevGroup(true);
@ -567,6 +568,7 @@ public class LiveActivity extends BaseActivity implements GroupPresenter.OnClick
@Override @Override
public void onKeyDown() { public void onKeyDown() {
if (mGroup == null || mChannel == null) return;
int position = mGroup.getPosition() + 1; int position = mGroup.getPosition() + 1;
boolean limit = position > mChannelAdapter.size() - 1; boolean limit = position > mChannelAdapter.size() - 1;
if (Prefers.isAcross() && limit) nextGroup(true); if (Prefers.isAcross() && limit) nextGroup(true);
@ -576,6 +578,7 @@ public class LiveActivity extends BaseActivity implements GroupPresenter.OnClick
@Override @Override
public void onKeyLeft(int time) { public void onKeyLeft(int time) {
if (mGroup == null || mChannel == null) return;
if (isVisible(mBinding.widget.center)) App.post(mR2, 500); if (isVisible(mBinding.widget.center)) App.post(mR2, 500);
if (mChannel.isOnly() && mPlayers.isVod()) mPlayers.seekTo(time); if (mChannel.isOnly() && mPlayers.isVod()) mPlayers.seekTo(time);
else if (!mChannel.isOnly()) prevLine(); else if (!mChannel.isOnly()) prevLine();
@ -584,6 +587,7 @@ public class LiveActivity extends BaseActivity implements GroupPresenter.OnClick
@Override @Override
public void onKeyRight(int time) { public void onKeyRight(int time) {
if (mGroup == null || mChannel == null) return;
if (isVisible(mBinding.widget.center)) App.post(mR2, 500); if (isVisible(mBinding.widget.center)) App.post(mR2, 500);
if (mChannel.isOnly() && mPlayers.isVod()) mPlayers.seekTo(time); if (mChannel.isOnly() && mPlayers.isVod()) mPlayers.seekTo(time);
else if (!mChannel.isOnly()) nextLine(true); else if (!mChannel.isOnly()) nextLine(true);

@ -56,11 +56,9 @@ public class CustomKeyDownLive extends GestureDetector.SimpleOnGestureListener {
} else if (event.getAction() == KeyEvent.ACTION_DOWN && Utils.isRightKey(event)) { } else if (event.getAction() == KeyEvent.ACTION_DOWN && Utils.isRightKey(event)) {
listener.onSeeking(addTime()); listener.onSeeking(addTime());
} else if (event.getAction() == KeyEvent.ACTION_DOWN && Utils.isUpKey(event)) { } else if (event.getAction() == KeyEvent.ACTION_DOWN && Utils.isUpKey(event)) {
if (Prefers.isInvert()) listener.onKeyDown(); if (Prefers.isInvert()) listener.onKeyDown(); else listener.onKeyUp();
else listener.onKeyUp();
} else if (event.getAction() == KeyEvent.ACTION_DOWN && Utils.isDownKey(event)) { } else if (event.getAction() == KeyEvent.ACTION_DOWN && Utils.isDownKey(event)) {
if (Prefers.isInvert()) listener.onKeyUp(); if (Prefers.isInvert()) listener.onKeyUp(); else listener.onKeyDown();
else listener.onKeyDown();
} else if (event.getAction() == KeyEvent.ACTION_UP && Utils.isLeftKey(event)) { } else if (event.getAction() == KeyEvent.ACTION_UP && Utils.isLeftKey(event)) {
listener.onKeyLeft(holdTime); listener.onKeyLeft(holdTime);
} else if (event.getAction() == KeyEvent.ACTION_UP && Utils.isRightKey(event)) { } else if (event.getAction() == KeyEvent.ACTION_UP && Utils.isRightKey(event)) {

@ -38,11 +38,11 @@ public abstract class Spider {
return ""; return "";
} }
public boolean isVideoFormat(String url) { public boolean manualVideoCheck() {
return false; return false;
} }
public boolean manualVideoCheck() { public boolean isVideoFormat(String url) {
return false; return false;
} }
} }

Loading…
Cancel
Save