From d380d80d3dee184ea731519741f0e3a3d5b0bc4d Mon Sep 17 00:00:00 2001
From: FongMi <b8892778@gmail.com>
Date: Sun, 29 Jan 2023 00:20:59 +0800
Subject: [PATCH] Update dev

---
 app/build.gradle                                            | 4 ++--
 .../com/fongmi/android/tv/ui/activity/DetailActivity.java   | 6 +++---
 .../com/fongmi/android/tv/ui/activity/LiveActivity.java     | 2 +-
 app/src/main/java/com/fongmi/android/tv/player/Players.java | 6 +-----
 4 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 3bea5e974..9f97fc282 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -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'
diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/DetailActivity.java b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/DetailActivity.java
index b3c2428b5..4a420cf20 100644
--- a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/DetailActivity.java
+++ b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/DetailActivity.java
@@ -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();
     }
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 79321fe07..ad4064678 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
@@ -685,7 +685,7 @@ public class LiveActivity extends BaseActivity implements GroupPresenter.OnClick
     }
 
     private void onError() {
-        mPlayers.reset();
+        mPlayers.stop();
         checkNext();
     }
 
diff --git a/app/src/main/java/com/fongmi/android/tv/player/Players.java b/app/src/main/java/com/fongmi/android/tv/player/Players.java
index 5fd65dcbb..fb4d4eea1 100644
--- a/app/src/main/java/com/fongmi/android/tv/player/Players.java
+++ b/app/src/main/java/com/fongmi/android/tv/player/Players.java
@@ -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();
     }