pull/586/head
FongMi 2 years ago
parent 0b5282767f
commit cb043cc40d
  1. 10
      app/src/leanback/java/com/fongmi/android/tv/ui/activity/CastActivity.java
  2. 10
      app/src/leanback/java/com/fongmi/android/tv/ui/activity/LiveActivity.java
  3. 10
      app/src/leanback/java/com/fongmi/android/tv/ui/activity/VideoActivity.java
  4. 4
      app/src/main/java/com/fongmi/android/tv/player/Players.java
  5. 10
      app/src/mobile/java/com/fongmi/android/tv/ui/activity/LiveActivity.java
  6. 10
      app/src/mobile/java/com/fongmi/android/tv/ui/activity/VideoActivity.java

@ -338,10 +338,18 @@ public class CastActivity extends BaseActivity implements CustomKeyDownCast.List
@Subscribe(threadMode = ThreadMode.MAIN)
public void onErrorEvent(ErrorEvent event) {
if (mPlayers.error()) onError(event);
if (mPlayers.error()) checkError(event);
else onReset();
}
private void checkError(ErrorEvent event) {
if (mPlayers.isHard() && event.getCode() / 1000 == 4) {
onDecode();
} else {
onError(event);
}
}
private void onError(ErrorEvent event) {
showError(event.getMsg());
onStopped();

@ -727,10 +727,18 @@ public class LiveActivity extends BaseActivity implements GroupPresenter.OnClick
@Subscribe(threadMode = ThreadMode.MAIN)
public void onErrorEvent(ErrorEvent event) {
if (mPlayers.error()) onError(event);
if (mPlayers.error()) checkError(event);
else fetch();
}
private void checkError(ErrorEvent event) {
if (mPlayers.isHard() && event.getCode() / 1000 == 4) {
onDecode();
} else {
onError(event);
}
}
private void onError(ErrorEvent event) {
showError(event.getMsg());
mPlayers.reset();

@ -1132,10 +1132,18 @@ public class VideoActivity extends BaseActivity implements CustomKeyDownVod.List
@Subscribe(threadMode = ThreadMode.MAIN)
public void onErrorEvent(ErrorEvent event) {
if (isBackground()) return;
if (mPlayers.error()) onError(event);
if (mPlayers.error()) checkError(event);
else onRefresh();
}
private void checkError(ErrorEvent event) {
if (mPlayers.isHard() && event.getCode() / 1000 == 4) {
onDecode();
} else {
onError(event);
}
}
private void onError(ErrorEvent event) {
Track.delete(getHistoryKey());
showError(event.getMsg());

@ -216,6 +216,10 @@ public class Players implements Player.Listener, ParseCallback {
return getDuration() > 5 * 60 * 1000 && !exoPlayer.isCurrentMediaItemLive();
}
public boolean isHard() {
return decode == HARD;
}
public boolean isPortrait() {
return getVideoHeight() > getVideoWidth();
}

@ -786,10 +786,18 @@ public class LiveActivity extends BaseActivity implements CustomKeyDownLive.List
@Subscribe(threadMode = ThreadMode.MAIN)
public void onErrorEvent(ErrorEvent event) {
if (mPlayers.error()) onError(event);
if (mPlayers.error()) checkError(event);
else fetch();
}
private void checkError(ErrorEvent event) {
if (mPlayers.isHard() && event.getCode() / 1000 == 4) {
onDecode();
} else {
onError(event);
}
}
private void onError(ErrorEvent event) {
showError(event.getMsg());
mPlayers.reset();

@ -1142,10 +1142,18 @@ public class VideoActivity extends BaseActivity implements Clock.Callback, Custo
@Subscribe(threadMode = ThreadMode.MAIN)
public void onErrorEvent(ErrorEvent event) {
if (isRedirect()) return;
if (mPlayers.error()) onError(event);
if (mPlayers.error()) checkError(event);
else onRefresh();
}
private void checkError(ErrorEvent event) {
if (mPlayers.isHard() && event.getCode() / 1000 == 4) {
onDecode();
} else {
onError(event);
}
}
private void onError(ErrorEvent event) {
mBinding.swipeLayout.setEnabled(true);
Track.delete(getHistoryKey());

Loading…
Cancel
Save