修复跳页错误，现在点击取消不会出错了，且如果跳转的页面是现在显示的页面，则不会再次跳转。

deretame · deretame · commit 3e2a1650ef1b · 2024-10-10T22:16:12.000+08:00
修复部分漫画因为结果缺少键值而导致的报错。
diff --git a/lib/page/mainPage/search/page/comic_info_page.dart b/lib/page/mainPage/search/page/comic_info_page.dart
@@ -116,6 +116,10 @@ class _ComicInfoPageState extends State<ComicInfoPage>
               if (snapshot.data!['comic']['_creator']['slogan'] == null) {
                 snapshot.data!['comic']['_creator']['slogan'] = "";
               }
+              // title，这里做个判断，防止报错
+              if (snapshot.data!['comic']['_creator']['title'] == null) {
+                snapshot.data!['comic']['_creator']['title'] = '';
+              }
               // 部分上传者没有verified，这里做个判断，防止报错
               if (snapshot.data!['comic']['_creator']['verified'] == null) {
                 snapshot.data!['comic']['_creator']['verified'] = false;
@@ -129,7 +133,15 @@ class _ComicInfoPageState extends State<ComicInfoPage>
                 snapshot.data!['comic']['totalComments'] =
                     snapshot.data!['comic']['commentsCount'] = 0;
               }
-              comicInfo = ComicInfo.fromJson(snapshot.data!);
+              //  部分漫画没有totalComments，这里做个判断，防止报错
+              if (snapshot.data!['comic']['author'] == null) {
+                snapshot.data!['comic']['author'] = '';
+              }
+              try {
+                comicInfo = ComicInfo.fromJson(snapshot.data!);
+              } catch (e) {
+                debugPrint(e.toString());
+              }
               return SingleChildScrollView(
                 // 添加滚动视图
                 physics: const ClampingScrollPhysics(), // 滚动物理，根据需要可以调整
diff --git a/lib/page/mainPage/search/page/comic_search_page.dart b/lib/page/mainPage/search/page/comic_search_page.dart
@@ -46,11 +46,16 @@ class _ComicSearchPageState extends ConsumerState<ComicSearchPage> {
   final ValueNotifier<int> _totalCountNotifier = ValueNotifier<int>(0);
   int totalCount = 0;
 
+  late TextEditingController inputController;
+  late FocusNode focusNode;
+  late FocusScopeNode focusScopeNode;
+
   // 仅作为跳页使用
   int pageSkip = 0;
 
   @override
   void initState() {
+    super.initState();
     _localEnter = enter;
     _keyword = enter.keyword;
     _sort = enter.sort;
@@ -95,14 +100,19 @@ class _ComicSearchPageState extends ConsumerState<ComicSearchPage> {
       debugPrint("Dart Map: $_shieldCategoriesMap");
     }
 
-    super.initState();
+    inputController = TextEditingController();
+    focusNode = FocusNode();
+    focusScopeNode = FocusScopeNode();
   }
 
   @override
   void dispose() {
     _controller.dispose();
-    super.dispose();
     _realm.close();
+    inputController.dispose();
+    focusNode.dispose();
+    focusScopeNode.dispose();
+    super.dispose();
   }
 
   Future<void> _showCategoryDialog(BuildContext context) {
@@ -259,44 +269,63 @@ class _ComicSearchPageState extends ConsumerState<ComicSearchPage> {
   }
 
   Future<void> _showNumberInputDialog() async {
-    TextEditingController inputController = TextEditingController(); // 创建控制器实例
+    bool isDialogOpen = true;
+    // 在显示对话框之前清空输入控制器的内容
+    inputController.clear();
 
-    return showDialog(
+    return showDialog<void>(
       context: context,
-      builder: (BuildContext context) {
+      builder: (BuildContext innerContext) {
+        // 在AlertDialog构建时立即请求焦点
+        FocusScope.of(innerContext).requestFocus(focusNode);
+
         return AlertDialog(
           title: Text('输入页数'),
           content: TextField(
+            focusNode: focusNode,
             keyboardType: TextInputType.number,
             inputFormatters: <TextInputFormatter>[
               FilteringTextInputFormatter.digitsOnly
-            ], // 只允许输入数字
+            ],
             decoration: InputDecoration(hintText: '请输入页数（仅支持数字）'),
-            controller: inputController, // 将控制器与文本字段关联
+            controller: inputController,
+            onSubmitted: (value) {
+              if (value.isNotEmpty) {
+                String number = inputController.text;
+                pageSkip = int.parse(number);
+                debugPrint('输入的数字是: $number');
+              }
+              isDialogOpen = false;
+              Navigator.of(innerContext).pop();
+            },
           ),
           actions: <Widget>[
             TextButton(
               child: Text('取消'),
               onPressed: () {
-                Navigator.of(context).pop();
+                isDialogOpen = false;
+                pageSkip = 0;
+                Navigator.of(innerContext).pop();
               },
             ),
             TextButton(
               child: Text('确定'),
               onPressed: () {
-                // 获取输入框的值
                 String number = inputController.text;
-                pageSkip = int.parse(number);
-                debugPrint('输入的数字是: $number');
-                Navigator.of(context).pop();
+                if (number.isNotEmpty) {
+                  pageSkip = int.parse(number);
+                  debugPrint('输入的数字是: $number');
+                }
+                isDialogOpen = false;
+                Navigator.of(innerContext).pop();
               },
             ),
           ],
         );
       },
-    ).then((value) {
-      if (value != null) {
-        debugPrint('Checkbox values: $value');
+    ).then((_) {
+      if (isDialogOpen) {
+        focusNode.dispose();
       }
     });
   }
@@ -580,16 +609,18 @@ class _ComicSearchPageState extends ConsumerState<ComicSearchPage> {
       floatingActionButton: FloatingActionButton.extended(
         onPressed: () {
           _showNumberInputDialog().then((_) {
-            setState(
-              () {
-                _localEnter = SearchEnter(
-                  keyword: _keyword,
-                  sort: _sort,
-                  pageCount: pageSkip,
-                  categories: _categories,
-                );
-              },
-            );
+            if (_pageCount != pageSkip && pageSkip != 0) {
+              setState(
+                () {
+                  _localEnter = SearchEnter(
+                    keyword: _keyword,
+                    sort: _sort,
+                    pageCount: pageSkip,
+                    categories: _categories,
+                  );
+                },
+              );
+            }
           });
         },
         label: Text('跳页'),
diff --git a/lib/page/mainPage/search/widget/comic_entry_widget.dart b/lib/page/mainPage/search/widget/comic_entry_widget.dart
@@ -27,12 +27,18 @@ class _ComicEntryWidgetState extends ConsumerState<ComicEntryWidget> {
   Doc get doc => widget.doc;
 
   String _getCategories(List<String>? categories) {
+    int count = 0;
+    int mainCount = 8;
     if (categories == null) {
       return "";
     } else {
       String temp = "";
       for (var category in categories) {
         temp += "$category ";
+        count++;
+        if (count == mainCount) {
+          break;
+        }
       }
       return "分类: $temp";
     }
@@ -112,15 +118,17 @@ class _ComicEntryWidgetState extends ConsumerState<ComicEntryWidget> {
                           ],
                         ),
                       ),
-                      const SizedBox(height: 5),
-                      Text(
-                        doc.author.toString(),
-                        style: TextStyle(
-                          color: colorNotifier.themeType
-                              ? Colors.red
-                              : Colors.yellow,
+                      if (doc.author.toString() != '') ...[
+                        const SizedBox(height: 5),
+                        Text(
+                          _getLimitedTitle(doc.author.toString(), 40),
+                          style: TextStyle(
+                            color: colorNotifier.themeType
+                                ? Colors.red
+                                : Colors.yellow,
+                          ),
                         ),
-                      ),
+                      ],
                       const SizedBox(height: 5),
                       Text(
                         _getCategories(doc.categories),
diff --git a/lib/page/mainPage/search/widget/comic_info/comic_particulars_widget.dart b/lib/page/mainPage/search/widget/comic_info/comic_particulars_widget.dart
@@ -68,37 +68,41 @@ class _ComicParticularsWidgetState extends ConsumerState<ComicParticularsWidget>
                     fontSize: 18,
                   ),
                 ),
-                const SizedBox(height: 2),
-                InkWell(
-                  onTap: () {
-                    // 点击时触发的事件
-                    var enter = SearchEnter();
-                    enter.keyword = comicInfo.comic.author;
-                    navigateTo(context, '/search', extra: enter);
-                  },
-                  onLongPress: () {
-                    // 长按时触发的事件
-                    Clipboard.setData(
-                        ClipboardData(text: comicInfo.comic.author));
-                    CherryToast.success(
-                      description: Text(
-                        "已将${comicInfo.comic.author}复制到剪贴板",
-                        style: TextStyle(color: colorNotifier.defaultTextColor),
+                if (comicInfo.comic.author != '') ...[
+                  const SizedBox(height: 2),
+                  InkWell(
+                    onTap: () {
+                      // 点击时触发的事件
+                      var enter = SearchEnter();
+                      enter.keyword = comicInfo.comic.author;
+                      navigateTo(context, '/search', extra: enter);
+                    },
+                    onLongPress: () {
+                      // 长按时触发的事件
+                      Clipboard.setData(
+                          ClipboardData(text: comicInfo.comic.author));
+                      CherryToast.success(
+                        description: Text(
+                          "已将${comicInfo.comic.author}复制到剪贴板",
+                          style:
+                              TextStyle(color: colorNotifier.defaultTextColor),
+                        ),
+                        animationType: AnimationType.fromTop,
+                        toastDuration: const Duration(seconds: 2),
+                        autoDismiss: true,
+                        backgroundColor: colorNotifier.defaultBackgroundColor,
+                      ).show(context);
+                    },
+                    child: Text(
+                      '作者：${comicInfo.comic.author}',
+                      style: TextStyle(
+                        color: colorNotifier.themeType
+                            ? Colors.red
+                            : Colors.yellow,
                       ),
-                      animationType: AnimationType.fromTop,
-                      toastDuration: const Duration(seconds: 2),
-                      autoDismiss: true,
-                      backgroundColor: colorNotifier.defaultBackgroundColor,
-                    ).show(context);
-                  },
-                  child: Text(
-                    '作者：${comicInfo.comic.author}',
-                    style: TextStyle(
-                      color:
-                          colorNotifier.themeType ? Colors.red : Colors.yellow,
                     ),
                   ),
-                ),
+                ],
                 const SizedBox(height: 2),
                 if (comicInfo.comic.chineseTeam != "") ...[
                   InkWell(
diff --git a/lib/page/mainPage/search/widget/comic_info/creator_info_widget.dart b/lib/page/mainPage/search/widget/comic_info/creator_info_widget.dart
@@ -161,7 +161,17 @@ class _ImagerWidgetState extends ConsumerState<ImagerWidget> {
           if (snapshot.connectionState == ConnectionState.done) {
             if (snapshot.hasError) {
               if (snapshot.error.toString().contains('404')) {
-                return Image.asset('asset/image/error_image/404.png');
+                return ClipRRect(
+                  borderRadius: BorderRadius.circular(25),
+                  child: SizedBox(
+                    width: 50,
+                    height: 50,
+                    child: Image.asset(
+                      'asset/image/error_image/404.png',
+                      fit: BoxFit.cover,
+                    ),
+                  ),
+                );
               } else {
                 // 如果有错误，显示错误信息和一个重新加载的按钮
                 return InkWell(
diff --git a/lib/page/mainPage/search/widget/comic_info/tags_categories_widget.dart b/lib/page/mainPage/search/widget/comic_info/tags_categories_widget.dart
@@ -132,5 +132,9 @@ String processText(String text) {
     text = text.replaceAll('\r', '');
   }
 
+  if (text.contains(' ')) {
+    text = text.replaceAll(' ', '');
+  }
+
   return text;
 }
diff --git a/lib/page/mainPage/search/widget/comic_list_widget.dart b/lib/page/mainPage/search/widget/comic_list_widget.dart
@@ -187,6 +187,9 @@ class _ComicListWidgetState extends State<ComicListWidget> {
         if (doc['chineseTeam'] == null) {
           doc['chineseTeam'] = "";
         }
+        if (doc['author'] == null) {
+          doc['author'] = "";
+        }
         if (doc['likesCount'] is String) {
           doc['likesCount'] = int.parse(doc['likesCount']);
         }

Original file line number	Diff line number	Diff line change
`@@ -132,5 +132,9 @@ String processText(String text) {`
`132`	`132`	`text = text.replaceAll('\r', '');`
`133`	`133`	`}`
`134`	`134`
	`135`	`+ if (text.contains(' ')) {`
	`136`	`+ text = text.replaceAll(' ', '');`
	`137`	`+ }`
	`138`	`+`
`135`	`139`	`return text;`
`136`	`140`	`}`
Original file line number	Diff line number	Diff line change
`@@ -187,6 +187,9 @@ class _ComicListWidgetState extends State<ComicListWidget> {`
`187`	`187`	`if (doc['chineseTeam'] == null) {`
`188`	`188`	`doc['chineseTeam'] = "";`
`189`	`189`	`}`
	`190`	`+ if (doc['author'] == null) {`
	`191`	`+ doc['author'] = "";`
	`192`	`+ }`
`190`	`193`	`if (doc['likesCount'] is String) {`
`191`	`194`	`doc['likesCount'] = int.parse(doc['likesCount']);`
`192`	`195`	`}`