pull/497/head
FongMi 2 years ago
parent ba92a9709f
commit d5344c22db
  1. 8
      app/src/leanback/java/com/fongmi/android/tv/ui/activity/CastActivity.java
  2. 8
      app/src/leanback/java/com/fongmi/android/tv/ui/activity/LiveActivity.java
  3. 8
      app/src/leanback/java/com/fongmi/android/tv/ui/activity/VideoActivity.java
  4. 8
      app/src/main/java/com/fongmi/android/tv/player/Players.java
  5. 8
      app/src/mobile/java/com/fongmi/android/tv/ui/activity/LiveActivity.java
  6. 8
      app/src/mobile/java/com/fongmi/android/tv/ui/activity/VideoActivity.java

@ -189,11 +189,7 @@ public class CastActivity extends BaseActivity implements CustomKeyDownCast.List
}
private void onDecode() {
onDecode(true);
}
private void onDecode(boolean save) {
mPlayers.toggleDecode(save);
mPlayers.toggleDecode();
mPlayers.set(mBinding.exo);
setDecode();
onReset();
@ -338,7 +334,7 @@ public class CastActivity extends BaseActivity implements CustomKeyDownCast.List
@Subscribe(threadMode = ThreadMode.MAIN)
public void onErrorEvent(ErrorEvent event) {
if (event.getCode() / 1000 == 4 && Players.isHard()) onDecode(false);
if (event.getCode() / 1000 == 4 && Players.isHard()) onDecode();
else if (mPlayers.addRetry() > 1) onError(event);
else onReset();
}

@ -378,11 +378,7 @@ public class LiveActivity extends BaseActivity implements GroupPresenter.OnClick
}
private void onDecode() {
onDecode(true);
}
private void onDecode(boolean save) {
mPlayers.toggleDecode(save);
mPlayers.toggleDecode();
mPlayers.set(mBinding.exo);
setDecode();
fetch();
@ -714,7 +710,7 @@ public class LiveActivity extends BaseActivity implements GroupPresenter.OnClick
@Subscribe(threadMode = ThreadMode.MAIN)
public void onErrorEvent(ErrorEvent event) {
if (event.getCode() / 1000 == 4 && Players.isHard()) onDecode(false);
if (event.getCode() / 1000 == 4 && Players.isHard()) onDecode();
else if (mPlayers.addRetry() > 1) onError(event);
else fetch();
}

@ -835,11 +835,7 @@ public class VideoActivity extends BaseActivity implements CustomKeyDownVod.List
}
private void onDecode() {
onDecode(true);
}
private void onDecode(boolean save) {
mPlayers.toggleDecode(save);
mPlayers.toggleDecode();
mPlayers.set(mBinding.exo);
setDecode();
onRefresh();
@ -1134,7 +1130,7 @@ public class VideoActivity extends BaseActivity implements CustomKeyDownVod.List
@Subscribe(threadMode = ThreadMode.MAIN)
public void onErrorEvent(ErrorEvent event) {
if (isBackground()) return;
if (event.getCode() / 1000 == 4 && Players.isHard()) onDecode(false);
if (event.getCode() / 1000 == 4 && Players.isHard()) onDecode();
else if (mPlayers.addRetry() > 1) onError(event);
else onRefresh();
}

@ -228,7 +228,7 @@ public class Players implements Player.Listener, AnalyticsListener, ParseCallbac
}
public String getDecodeText() {
return ResUtil.getStringArray(R.array.select_decode)[decode];
return ResUtil.getStringArray(R.array.select_decode)[getDecode()];
}
public String setSpeed(float speed) {
@ -261,9 +261,9 @@ public class Players implements Player.Listener, AnalyticsListener, ParseCallbac
return setSpeed(speed);
}
public void toggleDecode(boolean save) {
setDecode(decode == HARD ? SOFT : HARD);
if (save) Setting.putDecode(decode);
public void toggleDecode() {
setDecode(getDecode() == HARD ? SOFT : HARD);
Setting.putDecode(getDecode());
}
public String getPositionTime(long time) {

@ -409,11 +409,7 @@ public class LiveActivity extends BaseActivity implements CustomKeyDownLive.List
}
private void onDecode() {
onDecode(true);
}
private void onDecode(boolean save) {
mPlayers.toggleDecode(save);
mPlayers.toggleDecode();
mPlayers.set(mBinding.exo);
setR1Callback();
setDecode();
@ -773,7 +769,7 @@ public class LiveActivity extends BaseActivity implements CustomKeyDownLive.List
@Subscribe(threadMode = ThreadMode.MAIN)
public void onErrorEvent(ErrorEvent event) {
if (event.getCode() / 1000 == 4 && Players.isHard()) onDecode(false);
if (event.getCode() / 1000 == 4 && Players.isHard()) onDecode();
else if (mPlayers.addRetry() > 1) onError(event);
else fetch();
}

@ -759,11 +759,7 @@ public class VideoActivity extends BaseActivity implements Clock.Callback, Custo
}
private void onDecode() {
onDecode(true);
}
private void onDecode(boolean save) {
mPlayers.toggleDecode(save);
mPlayers.toggleDecode();
mPlayers.set(mBinding.exo);
setR1Callback();
setDecode();
@ -1144,7 +1140,7 @@ public class VideoActivity extends BaseActivity implements Clock.Callback, Custo
@Subscribe(threadMode = ThreadMode.MAIN)
public void onErrorEvent(ErrorEvent event) {
if (isRedirect()) return;
if (event.getCode() / 1000 == 4 && Players.isHard()) onDecode(false);
if (event.getCode() / 1000 == 4 && Players.isHard()) onDecode();
else if (mPlayers.addRetry() > 1) onError(event);
else onRefresh();
}

Loading…
Cancel
Save