fix(exo)

Author: liuchuancong

android/local.properties

@@ -1,5 +1,5 @@
-sdk.dir=D:\\Android\\sdk
-flutter.sdk=D:\\flutter\\flutter\\flutter
+sdk.dir=C:\\Users\\m1779\\AppData\\Local\\Android\\Sdk
+flutter.sdk=F:\\flutter-sdk\\flutter
 flutter.buildMode=debug
 flutter.versionName=2.0.17
 flutter.versionCode=17

lib/player/adapters/video_player_adapter.dart

@@ -133,7 +133,16 @@ class BetterPlayerAdapter implements UnifiedPlayer {
   Future<void> hardDispose() async {
     if (_disposed) return;
     _disposed = true;
-    _controller?.dispose();
+    _initialized = false;
+    if (_controller != null) {
+      try {
+        await _controller!.setVolume(0.0);
+        await _controller!.pause();
+        _controller!.dispose();
+      } catch (e) {
+        debugPrint("BetterPlayer dispose error: $e");
+      }
+    }
 
     await _stateSubject.close();
     await _playingSubject.close();

lib/player/core/line_fallback_manager.dart

@@ -2,17 +2,11 @@ class LineFallbackManager {
   int _currentIndex = 0;
 
   String next(List<String> lines) {
-    if (lines.isEmpty) {
-      throw Exception('No playable line');
-    }
+    if (lines.isEmpty) throw Exception('No playable line');
 
-    _currentIndex++;
-
-    if (_currentIndex >= lines.length) {
-      _currentIndex = 0;
-    }
-
-    return lines[_currentIndex];
+    final line = lines[_currentIndex]; // 先取当前
+    _currentIndex = (_currentIndex + 1) % lines.length; // 再推进
+    return line;
   }
 
   void reset() {

lib/player/core/player_manager.dart

@@ -145,7 +145,7 @@ class PlayerManager {
       await switchEngine(_defaultEngine!, isManual: false);
     }
     final player = _currentPlayer;
-    _isSwitchingDueToFallback = false;
+
     if (player == null) {
       throw PlayerException(message: 'Current player is null', type: PlayerErrorType.lifecycle);
     }
@@ -168,6 +168,8 @@ class PlayerManager {
       final exception = PlayerException(message: 'Play failed', type: PlayerErrorType.unknown, error: e, stackTrace: s);
 
       await _handleError(exception);
+    } finally {
+      _isSwitchingDueToFallback = false;
     }
   }
 
@@ -383,21 +385,14 @@ class PlayerManager {
   }
 
   Future<void> hardDispose() async {
-    final player = _currentPlayer;
-    if (player != null) {
-      await player.hardDispose();
-    }
-    if (_runtimeEngine != null) {
-      await playerPool.removeFromCache(_runtimeEngine!);
-    }
-
     // 清空 Dart 引用
     _currentPlayer = null;
     _runtimeEngine = null;
 
     // 重置状态
     _stateSubject.add(PlayerState.idle);
     _playingSubject.add(false);
+    await dispose();
   }
 
   // =========================
@@ -490,6 +485,10 @@ class PlayerManager {
 
         if (event) {
           _stateSubject.add(PlayerState.playing);
+          if (_isSwitchingDueToFallback) {
+            _errorCount = 0;
+            _isSwitchingDueToFallback = false;
+          }
         } else {
           _stateSubject.add(PlayerState.paused);
         }