修复选集状态显示不对 #30

Author: chivehao

CHANGELOG.MD

@@ -2,6 +2,11 @@
 
 更新日志文档，版本顺序从新到旧，最新版本在最前(上)面。
 
+# 17.1.4
+
+- 修复选集状态显示不对 #30
+
+
 # 17.1.3
 
 - 修复重复跳转的问题

lib/subject/subject.dart

@@ -38,7 +38,6 @@ class _SubjectState extends State<SubjectPage> {
   late String _apiBaseUrl;
   late Subject _subject;
   late List<Episode> _episodes = [];
-  late final Map<int, List<EpisodeResource>> _episodeResourcesMap = {};
   late SubjectCollection? _subjectCollection;
   late CollectionType _collectionType;
 
@@ -268,24 +267,16 @@ class _SubjectState extends State<SubjectPage> {
       mainAxisAlignment: MainAxisAlignment.end,
       children: [
         ElevatedButton(
-          onPressed: _episodeResourcesMap.isNotEmpty
-              ? () async {
-                  bool? cancel = await showEpisodesDialog();
-                  // ignore: unnecessary_null_comparison
-                  if (cancel == null) {
-                    print("返回");
-                  } else {
-                    print("确认");
-                  }
-                }
-              : null,
-          child: _episodeResourcesMap.isEmpty
-              ? const SizedBox(
-                  width: 20, // 控制宽度
-                  height: 20, // 控制高度
-                  child: CircularProgressIndicator(),
-                )
-              : const Text("选集"),
+          onPressed: () async {
+            bool? cancel = await showEpisodesDialog();
+            // ignore: unnecessary_null_comparison
+            if (cancel == null) {
+              print("返回");
+            } else {
+              print("确认");
+            }
+          },
+          child: const Text("选集"),
         ),
         const SizedBox(width: 2),
         _buildCollectOperateWidget(),
@@ -416,51 +407,73 @@ class _SubjectState extends State<SubjectPage> {
     return episodes;
   }
 
+  Widget _buildEpisodeButtonWidget(Episode ep) {
+    return FutureBuilder(
+        future: EpisodeApi().getEpisodeResourcesRefs(ep.id),
+        builder: (BuildContext context,
+            AsyncSnapshot<List<EpisodeResource>> snapshot) {
+          if (snapshot.connectionState == ConnectionState.done) {
+            if (snapshot.hasError) {
+              return Text(
+                  "Load EpisodeApi getEpisodeResourcesRefs error: ${snapshot.error}");
+            } else {
+              List<EpisodeResource> epResList = snapshot.data ?? List.empty();
+              return GestureDetector(
+                onLongPress: () async {
+                  bool isFinish = _episodeIsFinish(ep.id);
+                  await EpisodeCollectionApi()
+                      .updateCollectionFinish(ep.id, !isFinish);
+                  Toast.show(context, "更新剧集收藏状态为: ${isFinish ? "未看" : "看完"}");
+                  Navigator.pop(context);
+                  Navigator.pushReplacement(
+                    context,
+                    MaterialPageRoute(
+                        builder: (context) =>
+                            SubjectPage(id: widget.id.toString())),
+                  );
+                },
+                child: ElevatedButton(
+                  style: ElevatedButton.styleFrom(
+                    backgroundColor: _episodeIsFinish(ep.id)
+                        ? Colors.green
+                        : Colors.lightBlueAccent,
+                    disabledBackgroundColor: Colors.grey[400],
+                    disabledForegroundColor: Colors.grey[600],
+                  ),
+                  onPressed: epResList.isEmpty
+                      ? null
+                      : () {
+                          Toast.show(context, "已自动加载第一个附件，剧集加载比较耗时，请耐心等待");
+                          Navigator.of(context).push(MaterialPageRoute(
+                              builder: (context) => SubjectEpisodePage(
+                                    episode: ep,
+                                    subject: _subject,
+                                  )));
+                        },
+                  child: Text(
+                    "${ep.sequence} : ${ep.name}",
+                    overflow: TextOverflow.ellipsis,
+                  ),
+                ),
+              );
+            }
+          } else {
+            return const Center(
+              child: SizedBox(
+                width: 20, // 控制宽度
+                height: 20, // 控制高度
+                child: CircularProgressIndicator(),
+              ),
+            );
+          }
+        });
+  }
+
   Widget _getEpisodesTabViewByGroup(String group) {
     var buttons = _getEpisodesByGroup(group)
         ?.map((ep) => Container(
               margin: const EdgeInsets.fromLTRB(0, 2, 0, 2),
-              child: SizedBox(
-                  height: 40,
-                  child: GestureDetector(
-                    onLongPress: () async {
-                      bool isFinish = _episodeIsFinish(ep.id);
-                      await EpisodeCollectionApi()
-                          .updateCollectionFinish(ep.id, !isFinish);
-                      Toast.show(
-                          context, "更新剧集收藏状态为: ${isFinish ? "未看" : "看完"}");
-                      Navigator.pop(context);
-                      Navigator.pushReplacement(
-                        context,
-                        MaterialPageRoute(
-                            builder: (context) =>
-                                SubjectPage(id: widget.id.toString())),
-                      );
-                    },
-                    child: ElevatedButton(
-                      style: ElevatedButton.styleFrom(
-                        backgroundColor: _episodeIsFinish(ep.id)
-                            ? Colors.green
-                            : Colors.lightBlueAccent,
-                        disabledBackgroundColor: Colors.grey[400],
-                        disabledForegroundColor: Colors.grey[600],
-                      ),
-                      onPressed: _episodeHasResource(ep)
-                          ? null
-                          : () {
-                              Toast.show(context, "已自动加载第一个附件，剧集加载比较耗时，请耐心等待");
-                              Navigator.of(context).push(MaterialPageRoute(
-                                  builder: (context) => SubjectEpisodePage(
-                                        episode: ep,
-                                        subject: _subject,
-                                      )));
-                            },
-                      child: Text(
-                        "${ep.sequence} : ${ep.name}",
-                        overflow: TextOverflow.ellipsis,
-                      ),
-                    ),
-                  )),
+              child: SizedBox(height: 40, child: _buildEpisodeButtonWidget(ep)),
             ))
         .toList();
 
@@ -471,13 +484,6 @@ class _SubjectState extends State<SubjectPage> {
     );
   }
 
-  bool _episodeHasResource(Episode e) {
-    if (_episodeResourcesMap.isEmpty) return false;
-    if (!_episodeResourcesMap.containsKey(e.id)) return false;
-    List<EpisodeResource> resList = _episodeResourcesMap[e.id] ?? List.empty();
-    return resList.isEmpty;
-  }
-
   TabBarView _buildEpisodeSelectTabView() {
     var groups = _getEpisodeGroupEnums();
     var tabViews =
@@ -499,19 +505,9 @@ class _SubjectState extends State<SubjectPage> {
       print("获取条目剧集失败");
     }
 
-    await _fetchEpisodeResourcesMap();
-
     setState(() {});
   }
 
-  Future<void> _fetchEpisodeResourcesMap() async {
-    for (Episode e in _episodes) {
-      var id = e.id;
-      List<EpisodeResource> epResList =
-          await EpisodeApi().getEpisodeResourcesRefs(id);
-      _episodeResourcesMap.putIfAbsent(e.id, () => epResList);
-    }
-  }
 
   Future<void> _fetchSubjectCollection() async {
     _subjectCollection = await SubjectCollectionApi()

pubspec.yaml

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