修复弹幕获取的ID匹配逻辑

Author: chivehao

CHANGELOG.MD

@@ -2,6 +2,10 @@
 
 更新日志文档，版本顺序从新到旧，最新版本在最前(上)面。
 
+# 1.5.1
+
+- 修复弹幕获取的ID匹配逻辑
+
 # 1.5.0
 
 - 更新查询弹幕时的剧集ID的查询方式，根据番组计划ID查询剧集ID

lib/player/player_video_desktop.dart

@@ -13,6 +13,7 @@ import 'package:ikaros/api/collection/EpisodeCollectionApi.dart';
 import 'package:ikaros/api/dandanplay/DandanplayBangumiApi.dart';
 import 'package:ikaros/api/dandanplay/DandanplayCommentApi.dart';
 import 'package:ikaros/api/dandanplay/DandanplaySearchApi.dart';
+import 'package:ikaros/api/dandanplay/model/BangumiEpisode.dart';
 import 'package:ikaros/api/dandanplay/model/CommentEpisode.dart';
 import 'package:ikaros/api/dandanplay/model/CommentEpisodeIdResponse.dart';
 import 'package:ikaros/api/dandanplay/model/IkarosDanmukuBangumiResponse.dart';
@@ -214,31 +215,32 @@ class DesktopVideoPlayerState extends State<DesktopVideoPlayer>
       return; // 自己新建的无三方同步平台ID关联的条目是不会请求弹幕的
     }
     var targetEpisodeId = -1;
-    if (_syncs.isNotEmpty && _syncs.first.platform == SubjectSyncPlatform.BGM_TV) {
+    if (_syncs.isNotEmpty &&
+        _syncs.first.platform == SubjectSyncPlatform.BGM_TV) {
       var bgmtvSubjectId = _syncs.first.platformId;
 
       IkarosDanmukuBangumiResponse? bangumiRsp = await DandanplayBangumiApi()
           .getBangumiDetailsByBgmtvSubjectId(bgmtvSubjectId);
-      if (bangumiRsp != null) {
-        targetEpisodeId =
-            bangumiRsp.data.episodes.where((ep)=> ep.episodeNumber == _episode.sequence.toString())
-            .first.episodeId;
+      if (bangumiRsp != null && bangumiRsp.data.episodes.isNotEmpty) {
+        BangumiEpisode? targetEpisode = bangumiRsp.data.episodes
+            .where((ep) => ep.episodeNumber == _episode.sequence.toInt().toString())
+            .firstOrNull;
+        targetEpisodeId = targetEpisode?.episodeId ?? -1;
       }
     }
     if (targetEpisodeId == -1) {
       IkarosDanmukuEpisodesResponse? searchEpsResp = await DandanplaySearchApi()
           .searchEpisodes(_subject!.name, _episode.sequence.toInt().toString());
-      if (searchEpsResp == null ||
-          searchEpsResp.animes.isEmpty) return;
+      if (searchEpsResp == null || searchEpsResp.animes.isEmpty) return;
       SearchEpisodesAnime searchEpisodesAnime = searchEpsResp.animes.first;
       if (searchEpisodesAnime.episodes.isEmpty) return;
       SearchEpisodeDetails searchEpisodeDetails =
           searchEpisodesAnime.episodes.first;
       targetEpisodeId = searchEpisodeDetails.episodeId;
     }
 
-    CommentEpisodeIdResponse? commentEpIdResp = await DandanplayCommentApi()
-        .commentEpisodeId(targetEpisodeId, 1);
+    CommentEpisodeIdResponse? commentEpIdResp =
+        await DandanplayCommentApi().commentEpisodeId(targetEpisodeId, 1);
     if (commentEpIdResp == null || commentEpIdResp.count == 0) return;
     _commentEpisodes.addAll(commentEpIdResp.comments);
 
@@ -367,12 +369,16 @@ class DesktopVideoPlayerState extends State<DesktopVideoPlayer>
     final exStyle = GetWindowLongPtr(hWnd, WINDOW_LONG_PTR_INDEX.GWL_EXSTYLE);
 
     // 隐藏标题栏和任务栏
-    SetWindowLongPtr(hWnd, WINDOW_LONG_PTR_INDEX.GWL_STYLE, style & ~WINDOW_STYLE.WS_OVERLAPPEDWINDOW);
-    SetWindowLongPtr(hWnd, WINDOW_LONG_PTR_INDEX.GWL_EXSTYLE, exStyle | WINDOW_EX_STYLE.WS_EX_TOPMOST);
+    SetWindowLongPtr(hWnd, WINDOW_LONG_PTR_INDEX.GWL_STYLE,
+        style & ~WINDOW_STYLE.WS_OVERLAPPEDWINDOW);
+    SetWindowLongPtr(hWnd, WINDOW_LONG_PTR_INDEX.GWL_EXSTYLE,
+        exStyle | WINDOW_EX_STYLE.WS_EX_TOPMOST);
 
     // 获取屏幕尺寸
-    final screenWidth = GetSystemMetrics(SYSTEM_METRICS_INDEX.SM_CXSCREEN); // 屏幕宽度
-    final screenHeight = GetSystemMetrics(SYSTEM_METRICS_INDEX.SM_CYSCREEN); // 屏幕高度
+    final screenWidth =
+        GetSystemMetrics(SYSTEM_METRICS_INDEX.SM_CXSCREEN); // 屏幕宽度
+    final screenHeight =
+        GetSystemMetrics(SYSTEM_METRICS_INDEX.SM_CYSCREEN); // 屏幕高度
 
     // 计算窗口右下角的位置
     final x = screenWidth - smallWindowDevicePixelWidth;
@@ -392,7 +398,8 @@ class DesktopVideoPlayerState extends State<DesktopVideoPlayer>
       // 指定的窗口宽度
       smallWindowDevicePixelHeight,
       // 指定的窗口高度
-      SET_WINDOW_POS_FLAGS.SWP_NOACTIVATE | SET_WINDOW_POS_FLAGS.SWP_SHOWWINDOW, // 不激活窗口，显示窗口
+      SET_WINDOW_POS_FLAGS.SWP_NOACTIVATE |
+          SET_WINDOW_POS_FLAGS.SWP_SHOWWINDOW, // 不激活窗口，显示窗口
     );
   }
 
@@ -420,8 +427,10 @@ class DesktopVideoPlayerState extends State<DesktopVideoPlayer>
     final exStyle = GetWindowLongPtr(hWnd, WINDOW_LONG_PTR_INDEX.GWL_EXSTYLE);
 
     // 隐藏标题栏和任务栏
-    SetWindowLongPtr(hWnd, WINDOW_LONG_PTR_INDEX.GWL_STYLE, style & ~WINDOW_STYLE.WS_OVERLAPPEDWINDOW);
-    SetWindowLongPtr(hWnd, WINDOW_LONG_PTR_INDEX.GWL_EXSTYLE, exStyle | WINDOW_EX_STYLE.WS_EX_TOPMOST);
+    SetWindowLongPtr(hWnd, WINDOW_LONG_PTR_INDEX.GWL_STYLE,
+        style & ~WINDOW_STYLE.WS_OVERLAPPEDWINDOW);
+    SetWindowLongPtr(hWnd, WINDOW_LONG_PTR_INDEX.GWL_EXSTYLE,
+        exStyle | WINDOW_EX_STYLE.WS_EX_TOPMOST);
 
     // 设置窗口位置和大小，覆盖整个屏幕
     SetWindowPos(
@@ -443,8 +452,10 @@ class DesktopVideoPlayerState extends State<DesktopVideoPlayer>
     final exStyle = GetWindowLongPtr(hWnd, WINDOW_LONG_PTR_INDEX.GWL_EXSTYLE);
 
     // 还原标题栏和任务栏
-    SetWindowLongPtr(hWnd, WINDOW_LONG_PTR_INDEX.GWL_STYLE, style | WINDOW_STYLE.WS_OVERLAPPEDWINDOW);
-    SetWindowLongPtr(hWnd, WINDOW_LONG_PTR_INDEX.GWL_EXSTYLE, exStyle & ~WINDOW_EX_STYLE.WS_EX_TOPMOST);
+    SetWindowLongPtr(hWnd, WINDOW_LONG_PTR_INDEX.GWL_STYLE,
+        style | WINDOW_STYLE.WS_OVERLAPPEDWINDOW);
+    SetWindowLongPtr(hWnd, WINDOW_LONG_PTR_INDEX.GWL_EXSTYLE,
+        exStyle & ~WINDOW_EX_STYLE.WS_EX_TOPMOST);
 
     // 还原窗口位置和大小
     SetWindowPos(
@@ -566,7 +577,8 @@ class DesktopVideoPlayerState extends State<DesktopVideoPlayer>
     if (!Platform.isWindows) return;
     final ptr = calloc<Pointer<Utf16>>();
     final guid = calloc<GUID>()..ref.setGUID(FOLDERID_Pictures);
-    final hr = SHGetKnownFolderPath(guid, KNOWN_FOLDER_FLAG.KF_FLAG_DEFAULT, NULL, ptr);
+    final hr = SHGetKnownFolderPath(
+        guid, KNOWN_FOLDER_FLAG.KF_FLAG_DEFAULT, NULL, ptr);
 
     String path;
     if (hr == S_OK) {
@@ -777,7 +789,9 @@ class DesktopVideoPlayerState extends State<DesktopVideoPlayer>
             offsetY.toInt() + smallWindowDevicePixelHeight,
             smallWindowDevicePixelWidth,
             smallWindowDevicePixelHeight,
-            SET_WINDOW_POS_FLAGS.SWP_NOZORDER | SET_WINDOW_POS_FLAGS.SWP_NOSIZE | SET_WINDOW_POS_FLAGS.SWP_NOREDRAW);
+            SET_WINDOW_POS_FLAGS.SWP_NOZORDER |
+                SET_WINDOW_POS_FLAGS.SWP_NOSIZE |
+                SET_WINDOW_POS_FLAGS.SWP_NOREDRAW);
       },
       onTap: () {
         if (_player.playback.isPlaying) {

lib/player/player_video_mobile.dart

@@ -9,6 +9,7 @@ import 'package:ikaros/api/collection/EpisodeCollectionApi.dart';
 import 'package:ikaros/api/dandanplay/DandanplayBangumiApi.dart';
 import 'package:ikaros/api/dandanplay/DandanplayCommentApi.dart';
 import 'package:ikaros/api/dandanplay/DandanplaySearchApi.dart';
+import 'package:ikaros/api/dandanplay/model/BangumiEpisode.dart';
 import 'package:ikaros/api/dandanplay/model/CommentEpisode.dart';
 import 'package:ikaros/api/dandanplay/model/CommentEpisodeIdResponse.dart';
 import 'package:ikaros/api/dandanplay/model/IkarosDanmukuBangumiResponse.dart';
@@ -301,31 +302,33 @@ class MobileVideoPlayerState extends State<MobileVideoPlayer>
       return; // 自己新建的无三方同步平台ID关联的条目是不会请求弹幕的
     }
     var targetEpisodeId = -1;
-    if (_syncs.isNotEmpty && _syncs.first.platform == SubjectSyncPlatform.BGM_TV) {
+    if (_syncs.isNotEmpty &&
+        _syncs.first.platform == SubjectSyncPlatform.BGM_TV) {
       var bgmtvSubjectId = _syncs.first.platformId;
 
       IkarosDanmukuBangumiResponse? bangumiRsp = await DandanplayBangumiApi()
           .getBangumiDetailsByBgmtvSubjectId(bgmtvSubjectId);
-      if (bangumiRsp != null) {
-        targetEpisodeId =
-            bangumiRsp.data.episodes.where((ep)=> ep.episodeNumber == _episode.sequence.toString())
-                .first.episodeId;
+      if (bangumiRsp != null && bangumiRsp.data.episodes.isNotEmpty) {
+        BangumiEpisode? targetEpisode = bangumiRsp.data.episodes
+            .where((ep) =>
+                ep.episodeNumber == _episode.sequence.toInt().toString())
+            .firstOrNull;
+        targetEpisodeId = targetEpisode?.episodeId ?? -1;
       }
     }
     if (targetEpisodeId == -1) {
       IkarosDanmukuEpisodesResponse? searchEpsResp = await DandanplaySearchApi()
           .searchEpisodes(_subject!.name, _episode.sequence.toInt().toString());
-      if (searchEpsResp == null ||
-          searchEpsResp.animes.isEmpty) return;
+      if (searchEpsResp == null || searchEpsResp.animes.isEmpty) return;
       SearchEpisodesAnime searchEpisodesAnime = searchEpsResp.animes.first;
       if (searchEpisodesAnime.episodes.isEmpty) return;
       SearchEpisodeDetails searchEpisodeDetails =
           searchEpisodesAnime.episodes.first;
       targetEpisodeId = searchEpisodeDetails.episodeId;
     }
 
-    CommentEpisodeIdResponse? commentEpIdResp = await DandanplayCommentApi()
-        .commentEpisodeId(targetEpisodeId, 1);
+    CommentEpisodeIdResponse? commentEpIdResp =
+        await DandanplayCommentApi().commentEpisodeId(targetEpisodeId, 1);
     if (commentEpIdResp == null || commentEpIdResp.count == 0) return;
     _commentEpisodes.addAll(commentEpIdResp.comments);
     widget.onDanmukuPoolInitialed?.call(_commentEpisodes.length);

pubspec.yaml

@@ -1,6 +1,6 @@
 name: ikaros
 description: ikaros app by flutter
-version: 1.5.0
+version: 1.5.1
 
 environment:
   sdk: '>=2.18.4 <=3.10.5'