fix(获取视频出错)

Author: liuchuancong

lib/common/models/live_room.dart

@@ -22,10 +22,8 @@ class LiveRoom {
   /// 状态
   bool? status;
 
-  /// 附加信息
   dynamic data;
 
-  /// 弹幕附加信息
   dynamic danmakuData;
 
   /// 是否录播
@@ -67,11 +65,13 @@ class LiveRoom {
       watching = json['watching'] ?? '',
       followers = json['followers'] ?? '',
       platform = json['platform'] ?? '',
-      liveStatus = LiveStatus.values[json['liveStatus'] ?? 1],
+      liveStatus = LiveStatus.values.firstWhere((e) => e.index == json['liveStatus'], orElse: () => LiveStatus.unknown),
       status = json['status'] ?? false,
       notice = json['notice'] ?? '',
       introduction = json['introduction'] ?? '',
-      isRecord = json['isRecord'] ?? false;
+      isRecord = json['isRecord'] ?? false,
+      data = json['data'],
+      danmakuData = json['danmakuData'];
 
   Map<String, dynamic> toJson() => <String, dynamic>{
     'roomId': roomId,
@@ -84,11 +84,13 @@ class LiveRoom {
     'watching': watching,
     'followers': followers,
     'platform': platform,
-    'liveStatus': liveStatus?.index ?? 1,
+    'liveStatus': liveStatus?.index ?? LiveStatus.offline.index,
     'isRecord': isRecord,
     'status': status,
     'notice': notice,
     'introduction': introduction,
+    'data': data,
+    'danmakuData': danmakuData,
   };
 
   /// 创建一个新的LiveRoom实例，并用提供的值更新指定字段
@@ -139,4 +141,9 @@ class LiveRoom {
 
   @override
   int get hashCode => Object.hash(platform, roomId);
+
+  @override
+  String toString() {
+    return 'LiveRoom{roomId: $roomId, userId: $userId, link: $link, title: $title, nick: $nick, avatar: $avatar, cover: $cover, area: $area, watching: $watching, followers: $followers, platform: $platform, introduction: $introduction, notice: $notice, status: $status, data: $data, danmakuData: $danmakuData, isRecord: $isRecord, liveStatus: $liveStatus}';
+  }
 }

lib/main.dart

@@ -50,7 +50,7 @@ class _MyAppState extends State<MyApp> with DesktopWindowMixin {
       }
     } else {
       Future.delayed(Duration(seconds: 1)).then((value) async {
-        await initGlopalPlayer();
+        initGlopalPlayer();
       });
     }
   }

lib/modules/live_play/live_play_controller.dart

@@ -23,9 +23,9 @@ class LivePlayController extends StateController with GetSingleTickerProviderSta
   final String site;
   final StopWatchTimer _stopWatchTimer = StopWatchTimer(mode: StopWatchMode.countDown);
 
-  late Site currentSite = Sites.of(site);
+  late Site currentSite;
 
-  late LiveDanmaku liveDanmaku = Sites.of(site).liveSite.getDanmaku();
+  late LiveDanmaku liveDanmaku;
 
   PlayerInstanceState playerState = PlayerInstanceState();
 
@@ -51,13 +51,13 @@ class LivePlayController extends StateController with GetSingleTickerProviderSta
   RxList<LivePlayQuality> qualites = RxList<LivePlayQuality>();
 
   /// 当前清晰度
-  final currentQuality = 0.obs;
+  final RxInt currentQuality = 0.obs;
 
   /// 线路数据
   RxList<String> playUrls = RxList<String>();
 
   /// 当前线路
-  final currentLineIndex = 0.obs;
+  final RxInt currentLineIndex = 0.obs;
 
   var closeTimes = 240.obs;
 
@@ -104,6 +104,8 @@ class LivePlayController extends StateController with GetSingleTickerProviderSta
   void onInit() {
     super.onInit();
     detail.value = room;
+    currentSite = Sites.of(site);
+    liveDanmaku = Sites.of(site).liveSite.getDanmaku();
     onInitPlayerState();
     EmojiManager().preload(site);
     debounce(closeTimeFlag, (callback) {
@@ -150,15 +152,16 @@ class LivePlayController extends StateController with GetSingleTickerProviderSta
     int line = 0,
     bool isReCalculate = true,
   }) async {
-    SwitchableGlobalPlayer().dispose();
     var liveRoom = await currentSite.liveSite.getRoomDetail(
       roomId: detail.value!.roomId!,
       platform: detail.value!.platform!,
     );
     if (currentSite.id == Sites.iptvSite) {
       liveRoom = liveRoom.copyWith(title: detail.value!.title!, nick: detail.value!.nick!);
     }
+
     handleCurrentLineAndQuality(reloadDataType: reloadDataType, line: line, isReCalculate: isReCalculate);
+    detail.value = null;
     detail.value = liveRoom;
     if (liveRoom.liveStatus == LiveStatus.unknown) {
       if (Get.currentRoute == '/live_play') {
@@ -286,12 +289,14 @@ class LivePlayController extends StateController with GetSingleTickerProviderSta
         success.value = false;
         return;
       }
+
       qualites.value = playQualites;
       if (!hasUseDefaultResolution) {
         String userPrefer = settings.preferResolution.value;
         List<String> availableQualities = playQualites.map((e) => e.quality).toList();
         int matchedIndex = availableQualities.indexOf(userPrefer);
         // 尝试直接匹配用户偏好的分辨率
+        log(matchedIndex.toString(), name: "get_play_qualities_error");
         if (matchedIndex != -1) {
           currentQuality.value = matchedIndex;
           hasUseDefaultResolution = true;
@@ -311,7 +316,7 @@ class LivePlayController extends StateController with GetSingleTickerProviderSta
 
       getPlayUrl();
     } catch (e) {
-      SmartDialog.showToast("无法读取视频信息,请重新获取");
+      SmartDialog.showToast("读取视频信息失败,请重新获取");
       success.value = false;
     }
   }