pull/123/head
FongMi 3 years ago
parent fcf8278da2
commit d380d80d3d
  1. 4
      app/build.gradle
  2. 6
      app/src/leanback/java/com/fongmi/android/tv/ui/activity/DetailActivity.java
  3. 2
      app/src/leanback/java/com/fongmi/android/tv/ui/activity/LiveActivity.java
  4. 6
      app/src/main/java/com/fongmi/android/tv/player/Players.java

@ -11,7 +11,7 @@ android {
minSdk 21
targetSdk 29
versionCode 60
versionName "20230128#1"
versionName "20230129#1"
ndk { abiFilters "armeabi-v7a" }
}
@ -75,7 +75,7 @@ dependencies {
implementation 'cat.ereza:customactivityoncrash:2.4.0'
implementation 'com.github.bassaer:materialdesigncolors:1.0.0'
implementation 'com.github.bumptech.glide:glide:4.14.2'
implementation 'com.google.android.material:material:1.7.0'
implementation 'com.google.android.material:material:1.8.0'
implementation 'com.google.code.gson:gson:2.10'
implementation 'com.google.net.cronet:cronet-okhttp:0.1.0'
implementation 'com.google.zxing:core:3.5.1'

@ -797,12 +797,12 @@ public class DetailActivity extends BaseActivity implements CustomKeyDownVod.Lis
private void onError(ErrorEvent event) {
Clock.get().setCallback(null);
showError(event.getMsg());
mPlayers.reset();
mPlayers.stop();
hideProgress();
statFlow(event);
statFlow();
}
private void statFlow(ErrorEvent event) {
private void statFlow() {
if (isVisible(mBinding.control.parseLayout)) checkParse();
else checkFlag();
}

@ -685,7 +685,7 @@ public class LiveActivity extends BaseActivity implements GroupPresenter.OnClick
}
private void onError() {
mPlayers.reset();
mPlayers.stop();
checkNext();
}

@ -113,6 +113,7 @@ public class Players implements Player.Listener, IMediaPlayer.OnInfoListener, IM
}
public void reset() {
removeTimeoutCheck();
this.errorCode = 0;
this.retry = 0;
stopParse();
@ -384,7 +385,6 @@ public class Players implements Player.Listener, IMediaPlayer.OnInfoListener, IM
@Override
public void onPlayerError(@NonNull PlaybackException error) {
this.errorCode = error.errorCode;
removeTimeoutCheck();
ErrorEvent.format();
}
@ -392,7 +392,6 @@ public class Players implements Player.Listener, IMediaPlayer.OnInfoListener, IM
public void onPlaybackStateChanged(int state) {
switch (state) {
case Player.STATE_READY:
removeTimeoutCheck();
PlayerEvent.ready();
break;
case Player.STATE_BUFFERING:
@ -412,7 +411,6 @@ public class Players implements Player.Listener, IMediaPlayer.OnInfoListener, IM
case IMediaPlayer.MEDIA_INFO_BUFFERING_END:
case IMediaPlayer.MEDIA_INFO_VIDEO_SEEK_RENDERING_START:
case IMediaPlayer.MEDIA_INFO_AUDIO_SEEK_RENDERING_START:
removeTimeoutCheck();
PlayerEvent.ready();
return true;
default:
@ -422,14 +420,12 @@ public class Players implements Player.Listener, IMediaPlayer.OnInfoListener, IM
@Override
public boolean onError(IMediaPlayer mp, int what, int extra) {
removeTimeoutCheck();
ErrorEvent.format();
return true;
}
@Override
public void onPrepared(IMediaPlayer mp) {
removeTimeoutCheck();
PlayerEvent.ready();
}

Loading…
Cancel
Save