Merge branch 'main' into design

lib/common/pages_bottom_sheet.dart

@@ -430,7 +430,7 @@ class EpisodeGridItem extends StatelessWidget {
           decoration: BoxDecoration(
             color: isCurrentIndex
                 ? colorScheme.primaryContainer.withOpacity(0.6)
-                : colorScheme.secondaryContainer.withOpacity(0.4),
+                : colorScheme.onInverseSurface.withOpacity(0.6),
             borderRadius: BorderRadius.circular(8),
             border: Border.all(
               color: isCurrentIndex

lib/http/api.dart

@@ -175,7 +175,7 @@ class Api {
   static const String delHistory = '/x/v2/history/delete';
 
   // 搜索历史记录
-  static const String searchHistory = '/x/web-goblin/history/search';
+  static const String searchHistory = '/x/web-interface/history/search';
 
   // 热搜
   static const String hotSearchList =
@@ -301,10 +301,6 @@ class Api {
   static const String bangumiList =
       '/pgc/season/index/result?st=1&order=3&season_version=-1&spoken_language_type=-1&area=-1&is_finish=-1&copyright=-1&season_status=-1&season_month=-1&year=-1&style_id=-1&sort=0&season_type=1&pagesize=20&type=1';
 
-  // 我的订阅
-  static const String bangumiFollow =
-      '/x/space/bangumi/follow/list?type=1&follow_status=0&pn=1&ps=15&ts=1691544359969';
-
   // 黑名单
   static const String blackLst = '/x/relation/blacks';
 
@@ -604,4 +600,10 @@ class Api {
 
   /// 图片上传
   static const String uploadImage = '/x/dynamic/feed/draw/upload_bfs';
+
+  /// 更新追番状态
+  static const String updateBangumiStatus = '/pgc/web/follow/status/update';
+
+  /// 番剧点赞投币收藏状态
+  static const String bangumiActionStatus = '/pgc/season/episode/community';
 }

lib/http/bangumi.dart

@@ -1,5 +1,8 @@
+import 'dart:convert';
 import '../models/bangumi/list.dart';
 import 'index.dart';
+import 'package:html/parser.dart' as html_parser;
+import 'package:html/dom.dart' as html_dom;
 
 class BangumiHttp {
   static Future bangumiList({int? page}) async {
@@ -18,8 +21,19 @@ class BangumiHttp {
     }
   }
 
-  static Future bangumiFollow({int? mid}) async {
+  static Future getRecentBangumi({
-    var res = await Request().get(Api.bangumiFollow, data: {'vmid': mid});
+    int? mid,
+    int type = 1,
+    int pn = 1,
+    int ps = 20,
+  }) async {
+    var res = await Request().get(Api.getRecentBangumiApi, data: {
+      'vmid': mid,
+      'type': type,
+      'follow_status': 0,
+      'pn': pn,
+      'ps': ps,
+    });
     if (res.data['code'] == 0) {
       return {
         'status': true,
@@ -33,4 +47,62 @@ class BangumiHttp {
       };
     }
   }
+
+  // 获取追番状态
+  static Future bangumiStatus({required int seasonId}) async {
+    var res = await Request()
+        .get('https://www.bilibili.com/bangumi/play/ss$seasonId');
+    html_dom.Document document = html_parser.parse(res.data);
+    // 查找 id 为 __NEXT_DATA__ 的 script 元素
+    html_dom.Element? scriptElement =
+        document.querySelector('script#\\__NEXT_DATA__');
+    if (scriptElement != null) {
+      // 提取 script 元素的内容
+      String scriptContent = scriptElement.text;
+      final dynamic scriptContentJson = jsonDecode(scriptContent);
+      Map followState = scriptContentJson['props']['pageProps']['followState'];
+      return {
+        'status': true,
+        'data': {
+          'isFollowed': followState['isFollowed'],
+          'followStatus': followState['followStatus']
+        }
+      };
+    } else {
+      print('Script element with id "__NEXT_DATA__" not found.');
+    }
+  }
+
+  // 更新追番状态
+  static Future updateBangumiStatus({
+    required int seasonId,
+    required int status,
+  }) async {
+    var res = await Request().post(Api.updateBangumiStatus, data: {
+      'season_id': seasonId,
+      'status': status,
+    });
+    if (res.data['code'] == 0) {
+      return {'status': true, 'data': res.data['data']};
+    } else {
+      return {
+        'status': false,
+        'data': [],
+        'msg': res.data['message'],
+      };
+    }
+  }
+
+  // 获取番剧点赞投币收藏状态
+  static Future bangumiActionStatus({required int epId}) async {
+    var res = await Request().get(
+      Api.bangumiActionStatus,
+      data: {'ep_id': epId},
+    );
+    if (res.data['code'] == 0) {
+      return {'status': true, 'data': res.data['data']};
+    } else {
+      return {'status': false, 'data': [], 'msg': res.data['message']};
+    }
+  }
 }

lib/http/msg.dart

@@ -1,5 +1,6 @@
 import 'dart:convert';
 import 'dart:math';
+import 'package:flutter/material.dart';
 import 'package:pilipala/models/msg/like.dart';
 import 'package:pilipala/models/msg/reply.dart';
 import 'package:pilipala/models/msg/system.dart';
@@ -63,7 +64,7 @@ class MsgHttp {
               .toList(),
         };
       } catch (err) {
-        print('err🔟: $err');
+        debugPrint('err: $err');
       }
     } else {
       return {

lib/models/bangumi/list.dart

@@ -47,6 +47,7 @@ class BangumiListItemModel {
     this.title,
     this.titleIcon,
     this.progress,
+    this.progressIndex,
   });
 
   String? badge;
@@ -66,8 +67,8 @@ class BangumiListItemModel {
   String? subTitle;
   String? title;
   String? titleIcon;
-
   String? progress;
+  int? progressIndex;
 
   BangumiListItemModel.fromJson(Map<String, dynamic> json) {
     badge = json['badge'] == '' ? null : json['badge'];
@@ -87,7 +88,9 @@ class BangumiListItemModel {
     subTitle = json['sub_title'];
     title = json['title'];
     titleIcon = json['title_icon'];
-
     progress = json['progress'];
+    progressIndex = int.parse(
+        RegExp(r'第(\d+)话').firstMatch(json['progress'] ?? '第1话')?.group(1) ??
+            '0');
   }
 }

lib/models/msg/like.dart

@@ -39,7 +39,7 @@ class Total {
   List<MessageLikeItem>? items;
 
   factory Total.fromJson(Map<String, dynamic> json) => Total(
-        cursor: Cursor.fromJson(json['cursor']),
+        cursor: json['cursor'] != null ? Cursor.fromJson(json['cursor']) : null,
         items: json["items"] == null
             ? []
             : json["items"].map<MessageLikeItem>((e) {

lib/models/msg/session.dart

@@ -13,8 +13,9 @@ class SessionDataModel {
 
   SessionDataModel.fromJson(Map<String, dynamic> json) {
     sessionList = json['session_list']
-        ?.map<SessionList>((e) => SessionList.fromJson(e))
+            ?.map<SessionList>((e) => SessionList.fromJson(e))
-        .toList();
+            .toList() ??
+        [];
     hasMore = json['has_more'];
   }
 }

lib/models/video/reply/data.dart

@@ -73,7 +73,7 @@ class ReplyCursor {
     isEnd = json['is_end'];
     mode = json['mode'];
     modeText = json['mode_text'];
-    allCount = json['all_count'];
+    allCount = json['all_count'] ?? 0;
     supportMode = json['support_mode'].cast<int>();
     name = json['name'];
     paginationReply = json['pagination_reply'] != null

lib/models/video/reply/item.dart

@@ -11,6 +11,7 @@ class ReplyItemModel {
     this.parent,
     this.dialog,
     this.count,
+    this.rcount,
     this.floor,
     this.state,
     this.fansgrade,
@@ -41,6 +42,7 @@ class ReplyItemModel {
   int? parent;
   int? dialog;
   int? count;
+  int? rcount;
   int? floor;
   int? state;
   int? fansgrade;
@@ -72,6 +74,7 @@ class ReplyItemModel {
     parent = json['parent'];
     dialog = json['dialog'];
     count = json['count'];
+    rcount = json['rcount'] ?? 0;
     floor = json['floor'];
     state = json['state'];
     fansgrade = json['fansgrade'];

lib/pages/bangumi/controller.dart

@@ -9,6 +9,7 @@ class BangumiController extends GetxController {
   final ScrollController scrollController = ScrollController();
   RxList<BangumiListItemModel> bangumiList = <BangumiListItemModel>[].obs;
   RxList<BangumiListItemModel> bangumiFollowList = <BangumiListItemModel>[].obs;
+  RxInt total = 0.obs;
   int _currentPage = 1;
   bool isLoadingMore = true;
   Box userInfoCache = GStrorage.userInfo;
@@ -54,9 +55,10 @@ class BangumiController extends GetxController {
     if (userInfo == null) {
       return;
     }
-    var result = await BangumiHttp.bangumiFollow(mid: userInfo.mid);
+    var result = await BangumiHttp.getRecentBangumi(mid: userInfo.mid);
     if (result['status']) {
       bangumiFollowList.value = result['data'].list;
+      total.value = result['data'].total;
     } else {}
     return result;
   }

lib/pages/bangumi/introduction/controller.dart

@@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:get/get.dart';
 import 'package:hive/hive.dart';
+import 'package:pilipala/http/bangumi.dart';
 import 'package:pilipala/http/constants.dart';
 import 'package:pilipala/http/search.dart';
 import 'package:pilipala/http/video.dart';
@@ -52,28 +53,34 @@ class BangumiIntroController extends GetxController {
   Rx<FavFolderData> favFolderData = FavFolderData().obs;
   List addMediaIdsNew = [];
   List delMediaIdsNew = [];
-  // 关注状态 默认未关注
+  // 追番状态  1想看 2在看 3已看
-  RxMap followStatus = {}.obs;
+  RxBool isFollowed = false.obs;
+  RxInt followStatus = 1.obs;
   int _tempThemeValue = -1;
   var userInfo;
   PersistentBottomSheetController? bottomSheetController;
+  List<Map<String, dynamic>> followStatusList = [
+    {'title': '标记为 「想看」', 'status': 1},
+    {'title': '标记为 「在看」', 'status': 2},
+    {'title': '标记为 「已看」', 'status': 3},
+    {'title': '取消追番', 'status': -1},
+  ];
 
   @override
   void onInit() {
     super.onInit();
     userInfo = userInfoCache.get('userInfoCache');
     userLogin = userInfo != null;
+    if (userLogin && seasonId != null) {
+      bangumiStatus();
+    }
   }
 
   // 获取番剧简介&选集
   Future queryBangumiIntro() async {
     if (userLogin) {
-      // 获取点赞状态
+      // 获取点赞投币收藏状态
-      queryHasLikeVideo();
+      bangumiActionStatus();
-      // 获取投币状态
-      queryHasCoinVideo();
-      // 获取收藏状态
-      queryHasFavVideo();
     }
     var result = await SearchHttp.bangumiInfo(seasonId: seasonId, epId: epId);
     if (result['status']) {
@@ -83,26 +90,15 @@ class BangumiIntroController extends GetxController {
     return result;
   }
 
-  // 获取点赞状态
+  // 获取番剧点赞投币收藏状态
-  Future queryHasLikeVideo() async {
+  Future bangumiActionStatus() async {
-    var result = await VideoHttp.hasLikeVideo(bvid: bvid);
+    var result = await BangumiHttp.bangumiActionStatus(epId: epId!);
-    // data	num	被点赞标志	0：未点赞  1：已点赞
-    hasLike.value = result["data"] == 1 ? true : false;
-  }
-
-  // 获取投币状态
-  Future queryHasCoinVideo() async {
-    var result = await VideoHttp.hasCoinVideo(bvid: bvid);
-    hasCoin.value = result["data"]['multiply'] == 0 ? false : true;
-  }
-
-  // 获取收藏状态
-  Future queryHasFavVideo() async {
-    var result = await VideoHttp.hasFavVideo(aid: IdUtils.bv2av(bvid));
     if (result['status']) {
-      hasFav.value = result["data"]['favoured'];
+      hasLike.value = result['data']['like'] == 1;
+      hasCoin.value = result['data']['coin_number'] != 0;
+      hasFav.value = result['data']['favorite'] == 1;
     } else {
-      hasFav.value = false;
+      SmartDialog.showToast(result['msg']);
     }
   }
 
@@ -110,7 +106,7 @@ class BangumiIntroController extends GetxController {
   Future actionLikeVideo() async {
     var result = await VideoHttp.likeVideo(bvid: bvid, type: !hasLike.value);
     if (result['status']) {
-      SmartDialog.showToast(!hasLike.value ? '点赞成功 👍' : '取消赞');
+      SmartDialog.showToast(!hasLike.value ? '点赞成功' : '取消赞');
       hasLike.value = !hasLike.value;
       bangumiDetail.value.stat!['likes'] =
           bangumiDetail.value.stat!['likes'] + (!hasLike.value ? 1 : -1);
@@ -147,7 +143,7 @@ class BangumiIntroController extends GetxController {
                           var res = await VideoHttp.coinVideo(
                               bvid: bvid, multiply: _tempThemeValue);
                           if (res['status']) {
-                            SmartDialog.showToast('投币成功 👏');
+                            SmartDialog.showToast('投币成功');
                             hasCoin.value = true;
                             bangumiDetail.value.stat!['coins'] =
                                 bangumiDetail.value.stat!['coins'] +
@@ -185,9 +181,11 @@ class BangumiIntroController extends GetxController {
       addMediaIdsNew = [];
       delMediaIdsNew = [];
       // 重新获取收藏状态
-      queryHasFavVideo();
+      bangumiActionStatus();
-      SmartDialog.showToast('✅ 操作成功');
+      SmartDialog.showToast('操作成功');
       Get.back();
+    } else {
+      SmartDialog.showToast(result['msg']);
     }
   }
 
@@ -239,15 +237,22 @@ class BangumiIntroController extends GetxController {
 
   // 追番
   Future bangumiAdd() async {
-    var result =
+    var result = await VideoHttp.bangumiAdd(
-        await VideoHttp.bangumiAdd(seasonId: bangumiDetail.value.seasonId);
+        seasonId: seasonId ?? bangumiDetail.value.seasonId);
+    if (result['status']) {
+      followStatus.value = 2;
+      isFollowed.value = true;
+    }
     SmartDialog.showToast(result['msg']);
   }
 
   // 取消追番
   Future bangumiDel() async {
-    var result =
+    var result = await VideoHttp.bangumiDel(
-        await VideoHttp.bangumiDel(seasonId: bangumiDetail.value.seasonId);
+        seasonId: seasonId ?? bangumiDetail.value.seasonId);
+    if (result['status']) {
+      isFollowed.value = false;
+    }
     SmartDialog.showToast(result['msg']);
   }
 
@@ -315,4 +320,35 @@ class BangumiIntroController extends GetxController {
   hiddenEpisodeBottomSheet() {
     bottomSheetController?.close();
   }
+
+  // 获取追番状态
+  Future bangumiStatus() async {
+    var result = await BangumiHttp.bangumiStatus(seasonId: seasonId!);
+    if (result['status']) {
+      followStatus.value = result['data']['followStatus'];
+      isFollowed.value = result['data']['isFollowed'];
+    }
+    return result;
+  }
+
+  // 更新追番状态
+  Future updateBangumiStatus(int status) async {
+    Get.back();
+    if (status == -1) {
+      bangumiDel();
+    } else {
+      var result = await BangumiHttp.bangumiStatus(seasonId: seasonId!);
+      if (result['status']) {
+        followStatus.value = status;
+        final title = followStatusList.firstWhere(
+          (e) => e['status'] == status,
+          orElse: () => {'title': '未知状态'},
+        )['title'];
+        SmartDialog.showToast('追番状态$title');
+      } else {
+        SmartDialog.showToast(result['msg']);
+      }
+      return result;
+    }
+  }
 }

lib/pages/bangumi/introduction/view.dart

@@ -239,104 +239,65 @@ class _BangumiInfoState extends State<BangumiInfo> {
               Expanded(
                 child: InkWell(
                   onTap: () => showIntroDetail(),
+                  borderRadius: BorderRadius.circular(8),
                   child: SizedBox(
                     height: 115 / 0.75,
-                    child: Column(
+                    child: Padding(
-                      crossAxisAlignment: CrossAxisAlignment.start,
+                      padding: const EdgeInsets.fromLTRB(6, 4, 6, 6),
-                      mainAxisSize: MainAxisSize.min,
+                      child: Column(
-                      children: [
+                        crossAxisAlignment: CrossAxisAlignment.start,
-                        Row(
+                        mainAxisSize: MainAxisSize.min,
-                          children: [
+                        children: [
-                            Expanded(
+                          Row(
-                              child: Text(
+                            crossAxisAlignment: CrossAxisAlignment.center,
-                                widget.bangumiDetail!.title!,
+                            children: [
-                                style: const TextStyle(
+                              Expanded(
-                                  fontSize: 16,
+                                child: Text(
-                                  fontWeight: FontWeight.w500,
+                                  widget.bangumiDetail!.title!,
-                                ),
+                                  style: const TextStyle(
-                                maxLines: 1,
+                                    fontSize: 18,
-                                overflow: TextOverflow.ellipsis,
+                                    fontWeight: FontWeight.bold,
-                              ),
+                                  ),
-                            ),
+                                  maxLines: 2,
-                            const SizedBox(width: 20),
+                                  overflow: TextOverflow.ellipsis,
-                            SizedBox(
-                              width: 34,
-                              height: 34,
-                              child: IconButton(
-                                style: ButtonStyle(
-                                  padding: MaterialStateProperty.all(
-                                      EdgeInsets.zero),
-                                  backgroundColor:
-                                      MaterialStateProperty.resolveWith(
-                                          (Set<MaterialState> states) {
-                                    return t.colorScheme.primaryContainer
-                                        .withOpacity(0.7);
-                                  }),
-                                ),
-                                onPressed: () =>
-                                    bangumiIntroController.bangumiAdd(),
-                                icon: Icon(
-                                  Icons.favorite_border_rounded,
-                                  color: t.colorScheme.primary,
-                                  size: 22,
                                 ),
                               ),
-                            ),
+                              const SizedBox(width: 20),
-                          ],
+                              Obx(
-                        ),
+                                () => BangumiStatusWidget(
-                        Row(
+                                  ctr: bangumiIntroController,
-                          children: [
+                                  isFollowed:
-                            StatView(
+                                      bangumiIntroController.isFollowed.value,
-                              view: widget.bangumiDetail!.stat!['views'],
+                                ),
-                              size: 'medium',
-                            ),
-                            const SizedBox(width: 6),
-                            StatDanMu(
-                              danmu: widget.bangumiDetail!.stat!['danmakus'],
-                              size: 'medium',
-                            ),
-                          ],
-                        ),
-                        const SizedBox(height: 6),
-                        Row(
-                          children: [
-                            Text(
-                              (widget.bangumiDetail!.areas!.isNotEmpty
-                                  ? widget.bangumiDetail!.areas!.first['name']
-                                  : ''),
-                              style: TextStyle(
-                                fontSize: 12,
-                                color: t.colorScheme.outline,
                               ),
-                            ),
+                            ],
-                            const SizedBox(width: 6),
-                            Text(
-                              widget.bangumiDetail!.publish!['pub_time_show'],
-                              style: TextStyle(
-                                fontSize: 12,
-                                color: t.colorScheme.outline,
-                              ),
-                            ),
-                          ],
-                        ),
-                        Text(
-                          widget.bangumiDetail!.newEp!['desc'],
-                          style: TextStyle(
-                            fontSize: 12,
-                            color: t.colorScheme.outline,
                           ),
-                        ),
+                          const SizedBox(height: 4),
-                        const Spacer(),
+                          Row(
-                        Text(
+                            children: [
-                          '简介：${widget.bangumiDetail!.evaluate!}',
+                              StatView(
-                          maxLines: 3,
+                                view: widget.bangumiDetail!.stat!['views'],
-                          overflow: TextOverflow.ellipsis,
+                                size: 'medium',
-                          style: TextStyle(
+                              ),
-                            fontSize: 13,
+                              const SizedBox(width: 6),
-                            color: t.colorScheme.outline,
+                              StatDanMu(
+                                danmu: widget.bangumiDetail!.stat!['danmakus'],
+                                size: 'medium',
+                              ),
+                            ],
                           ),
-                        ),
+                          const SizedBox(height: 10),
-                      ],
+                          Text(
+                            '简介：${widget.bangumiDetail!.evaluate!}',
+                            maxLines: 3,
+                            overflow: TextOverflow.ellipsis,
+                            style: TextStyle(
+                              fontSize: 14,
+                              color: t.colorScheme.outline,
+                            ),
+                          ),
+                        ],
+                      ),
                     ),
                   ),
                 ),
@@ -426,3 +387,97 @@ class _BangumiInfoState extends State<BangumiInfo> {
     });
   }
 }
+
+// 追番状态
+class BangumiStatusWidget extends StatelessWidget {
+  final BangumiIntroController ctr;
+  final bool isFollowed;
+
+  const BangumiStatusWidget({
+    Key? key,
+    required this.ctr,
+    required this.isFollowed,
+  }) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    ColorScheme colorScheme = Theme.of(context).colorScheme;
+
+    void updateFollowStatus() {
+      showModalBottomSheet(
+        context: context,
+        useRootNavigator: true,
+        isScrollControlled: true,
+        builder: (context) {
+          return morePanel(context, ctr);
+        },
+      );
+    }
+
+    return Obx(
+      () => SizedBox(
+        width: 34,
+        height: 34,
+        child: IconButton(
+          style: ButtonStyle(
+            padding: MaterialStateProperty.all(EdgeInsets.zero),
+            backgroundColor:
+                MaterialStateProperty.resolveWith((Set<MaterialState> states) {
+              return ctr.isFollowed.value
+                  ? colorScheme.primaryContainer.withOpacity(0.7)
+                  : colorScheme.outlineVariant.withOpacity(0.7);
+            }),
+          ),
+          onPressed:
+              isFollowed ? () => updateFollowStatus() : () => ctr.bangumiAdd(),
+          icon: Icon(
+            ctr.isFollowed.value
+                ? Icons.favorite
+                : Icons.favorite_border_rounded,
+            color: ctr.isFollowed.value
+                ? colorScheme.primary
+                : colorScheme.outline,
+            size: 22,
+          ),
+        ),
+      ),
+    );
+  }
+
+  Widget morePanel(BuildContext context, BangumiIntroController ctr) {
+    return Container(
+      padding: EdgeInsets.only(bottom: MediaQuery.of(context).padding.bottom),
+      child: Column(
+        mainAxisSize: MainAxisSize.min,
+        children: [
+          InkWell(
+            onTap: () => Get.back(),
+            child: Container(
+              height: 35,
+              padding: const EdgeInsets.only(bottom: 2),
+              child: Center(
+                child: Container(
+                  width: 32,
+                  height: 3,
+                  decoration: BoxDecoration(
+                      color: Theme.of(context).colorScheme.outline,
+                      borderRadius: const BorderRadius.all(Radius.circular(3))),
+                ),
+              ),
+            ),
+          ),
+          ...ctr.followStatusList
+              .map(
+                (e) => ListTile(
+                  onTap: () => ctr.updateBangumiStatus(e['status']),
+                  selected: ctr.followStatus == e['status'],
+                  title: Text(e['title']),
+                ),
+              )
+              .toList(),
+          const SizedBox(height: 20),
+        ],
+      ),
+    );
+  }
+}

lib/pages/bangumi/view.dart

@@ -76,9 +76,14 @@ class _BangumiPageState extends State<BangumiPage>
                       child: Row(
                         mainAxisAlignment: MainAxisAlignment.spaceBetween,
                         children: [
-                          Text(
+                          Obx(
-                            '最近追番',
+                            () => 0 != _bangumidController.total.value
-                            style: Theme.of(context).textTheme.titleMedium,
+                                ? Text(
+                                    '我的追番(${_bangumidController.total.value})',
+                                    style:
+                                        Theme.of(context).textTheme.titleMedium,
+                                  )
+                                : const SizedBox(),
                           ),
                           IconButton(
                             onPressed: () {

lib/pages/bangumi/widgets/bangumi_panel.dart

@@ -175,59 +175,60 @@ class _BangumiPanelState extends State<BangumiPanel> {
               return Container(
                 width: 150,
                 margin: const EdgeInsets.only(right: 10),
-                child: Material(
+                clipBehavior: Clip.antiAlias,
+                decoration: BoxDecoration(
                   color: Theme.of(context).colorScheme.onInverseSurface,
-                  borderRadius: BorderRadius.circular(6),
+                  borderRadius: BorderRadius.circular(8),
-                  clipBehavior: Clip.hardEdge,
+                ),
-                  child: InkWell(
+                child: InkWell(
-                    onTap: () => changeFucCall(page, i),
+                  borderRadius: BorderRadius.circular(8),
-                    child: Padding(
+                  onTap: () => changeFucCall(page, i),
-                      padding: const EdgeInsets.symmetric(
+                  child: Padding(
-                        vertical: 8,
+                    padding: const EdgeInsets.symmetric(
-                        horizontal: 10,
+                      vertical: 8,
-                      ),
+                      horizontal: 10,
-                      child: Column(
+                    ),
-                        crossAxisAlignment: CrossAxisAlignment.start,
+                    child: Column(
-                        children: <Widget>[
+                      crossAxisAlignment: CrossAxisAlignment.start,
-                          Row(
+                      children: <Widget>[
-                            children: [
+                        Row(
-                              if (isSelected) ...<Widget>[
+                          children: [
-                                Image.asset('assets/images/live.png',
+                            if (isSelected) ...<Widget>[
-                                    color: primary, height: 12),
+                              Image.asset('assets/images/live.png',
-                                const SizedBox(width: 6)
+                                  color: primary, height: 12),
-                              ],
+                              const SizedBox(width: 6)
+                            ],
+                            Text(
+                              '第${i + 1}话',
+                              style: TextStyle(
+                                fontSize: 13,
+                                color: isSelected ? primary : onSurface,
+                              ),
+                            ),
+                            const SizedBox(width: 2),
+                            if (page.badge != null) ...[
+                              const Spacer(),
                               Text(
-                                '第${i + 1}话',
+                                page.badge!,
                                 style: TextStyle(
-                                  fontSize: 13,
+                                  fontSize: 12,
-                                  color: isSelected ? primary : onSurface,
+                                  color: primary,
                                 ),
                               ),
-                              const SizedBox(width: 2),
+                            ]
-                              if (page.badge != null) ...[
+                          ],
-                                const Spacer(),
+                        ),
-                                Text(
+                        const SizedBox(height: 3),
-                                  page.badge!,
+                        Text(
-                                  style: TextStyle(
+                          page.longTitle!,
-                                    fontSize: 12,
+                          maxLines: 1,
-                                    color: primary,
+                          style: TextStyle(
-                                  ),
+                            fontSize: 13,
-                                ),
+                            color: isSelected ? primary : onSurface,
-                              ]
-                            ],
                           ),
-                          const SizedBox(height: 3),
+                          overflow: TextOverflow.ellipsis,
-                          Text(
+                        )
-                            page.longTitle!,
+                      ],
-                            maxLines: 1,
-                            style: TextStyle(
-                              fontSize: 13,
-                              color: isSelected ? primary : onSurface,
-                            ),
-                            overflow: TextOverflow.ellipsis,
-                          )
-                        ],
-                      ),
                     ),
                   ),
                 ),

lib/pages/bangumi/widgets/bangumu_card_v.dart

@@ -25,6 +25,7 @@ class BangumiCardV extends StatelessWidget {
         RoutePush.bangumiPush(
           bangumiItem.seasonId,
           null,
+          progressIndex: bangumiItem.progressIndex,
           heroTag: heroTag,
         );
       },

lib/pages/dynamics/detail/controller.dart

@@ -48,8 +48,17 @@ class DynamicDetailController extends GetxController {
   }
 
   Future queryReplyList({reqType = 'init'}) async {
+    if (isLoadingMore) {
+      return;
+    }
+    isLoadingMore = true;
     if (reqType == 'init') {
-      nextOffset = "";
+      nextOffset = '';
+      noMore.value = '';
+    }
+    if (noMore.value == '没有更多了') {
+      isLoadingMore = false;
+      return;
     }
     var res = await ReplyHttp.replyList(
       oid: oid!,

lib/pages/dynamics/detail/view.dart

@@ -31,7 +31,7 @@ class _DynamicDetailPageState extends State<DynamicDetailPage>
     with TickerProviderStateMixin {
   late DynamicDetailController _dynamicDetailController;
   late AnimationController fabAnimationCtr;
-  Future? _futureBuilderFuture;
+  late Future _futureBuilderFuture;
   late StreamController<bool> titleStreamC =
       StreamController<bool>.broadcast(); // appBar title
   late ScrollController scrollController;
@@ -278,8 +278,8 @@ class _DynamicDetailPageState extends State<DynamicDetailPage>
               future: _futureBuilderFuture,
               builder: (context, snapshot) {
                 if (snapshot.connectionState == ConnectionState.done) {
-                  Map data = snapshot.data as Map;
+                  Map? data = snapshot.data;
-                  if (snapshot.data['status']) {
+                  if (data != null && snapshot.data['status']) {
                     RxList<ReplyItemModel> replyList =
                         _dynamicDetailController.replyList;
                     // 请求成功
@@ -345,8 +345,11 @@ class _DynamicDetailPageState extends State<DynamicDetailPage>
                   } else {
                     // 请求错误
                     return HttpError(
-                      errMsg: data['msg'],
+                      errMsg: data?['msg'] ?? '请求异常',
-                      fn: () => setState(() {}),
+                      fn: () => setState(() {
+                        _futureBuilderFuture =
+                            _dynamicDetailController.queryReplyList();
+                      }),
                     );
                   }
                 } else {

lib/pages/home/view.dart

@@ -395,14 +395,17 @@ class SearchBar extends StatelessWidget {
                     color: colorScheme.onSecondaryContainer,
                   ),
                   const SizedBox(width: 10),
-                  Obx(
+                  Expanded(
-                    () => Text(
+                    child: Obx(
-                      ctr!.defaultSearch.value,
+                      () => Text(
-                      maxLines: 1,
+                        ctr!.defaultSearch.value,
-                      overflow: TextOverflow.ellipsis,
+                        maxLines: 1,
-                      style: TextStyle(color: colorScheme.outline),
+                        overflow: TextOverflow.ellipsis,
+                        style: TextStyle(color: colorScheme.outline),
+                      ),
                     ),
                   ),
+                  const SizedBox(width: 10),
                 ],
               ),
             ),

lib/pages/member_article/controller.dart

@@ -20,7 +20,7 @@ class MemberArticleController extends GetxController {
   }
 
   Future getMemberArticle(type) async {
-    if (isLoading.value) {
+    if (isLoading.value || !hasMore) {
       return;
     }
     isLoading.value = true;

lib/pages/member_article/view.dart

@@ -113,12 +113,14 @@ class _MemberArticlePageState extends State<MemberArticlePage> {
           'articleType': 'opus',
         });
       },
-      leading: NetworkImgLayer(
+      leading: item?.cover != null
-        width: 50,
+          ? NetworkImgLayer(
-        height: 50,
+              width: 50,
-        type: 'emote',
+              height: 50,
-        src: item.cover['url'],
+              type: 'emote',
-      ),
+              src: item?.cover?['url'] ?? '',
+            )
+          : const SizedBox(),
       title: Text(
         item.content,
         maxLines: 2,

lib/pages/message/like/view.dart

@@ -3,6 +3,7 @@ import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:pilipala/common/widgets/http_error.dart';
 import 'package:pilipala/common/widgets/network_img_layer.dart';
+import 'package:pilipala/common/widgets/no_data.dart';
 import 'package:pilipala/models/msg/like.dart';
 import 'package:pilipala/utils/utils.dart';
 import '../utils/index.dart';
@@ -57,34 +58,34 @@ class _MessageLikePageState extends State<MessageLikePage> {
           future: _futureBuilderFuture,
           builder: (BuildContext context, AsyncSnapshot snapshot) {
             if (snapshot.connectionState == ConnectionState.done) {
-              if (snapshot.data == null) {
+              Map? data = snapshot.data;
-                return const SizedBox();
+              if (data != null && data['status']) {
-              }
-              if (snapshot.data['status']) {
                 final likeItems = _messageLikeCtr.likeItems;
                 return Obx(
-                  () => ListView.separated(
+                  () => likeItems.isEmpty
-                    controller: scrollController,
+                      ? const CustomScrollView(slivers: [NoData()])
-                    itemBuilder: (context, index) => LikeItem(
+                      : ListView.separated(
-                      item: likeItems[index],
+                          controller: scrollController,
-                      index: index,
+                          itemBuilder: (context, index) => LikeItem(
-                      messageLikeCtr: _messageLikeCtr,
+                            item: likeItems[index],
-                    ),
+                            index: index,
-                    itemCount: likeItems.length,
+                            messageLikeCtr: _messageLikeCtr,
-                    separatorBuilder: (BuildContext context, int index) {
+                          ),
-                      return Divider(
+                          itemCount: likeItems.length,
-                        indent: 66,
+                          separatorBuilder: (BuildContext context, int index) {
-                        endIndent: 14,
+                            return Divider(
-                        height: 1,
+                              indent: 66,
-                        color: Colors.grey.withOpacity(0.1),
+                              endIndent: 14,
-                      );
+                              height: 1,
-                    },
+                              color: Colors.grey.withOpacity(0.1),
-                  ),
+                            );
+                          },
+                        ),
                 );
               } else {
                 // 请求错误
                 return HttpError(
-                  errMsg: snapshot.data['msg'],
+                  errMsg: data?['msg'] ?? '请求异常',
                   fn: () {
                     setState(() {
                       _futureBuilderFuture = _messageLikeCtr.queryMessageLike();

lib/pages/message/reply/view.dart

@@ -4,6 +4,7 @@ import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:pilipala/common/widgets/http_error.dart';
 import 'package:pilipala/common/widgets/network_img_layer.dart';
+import 'package:pilipala/common/widgets/no_data.dart';
 import 'package:pilipala/models/msg/reply.dart';
 import 'package:pilipala/pages/message/utils/index.dart';
 import 'package:pilipala/utils/utils.dart';
@@ -58,31 +59,31 @@ class _MessageReplyPageState extends State<MessageReplyPage> {
           future: _futureBuilderFuture,
           builder: (BuildContext context, AsyncSnapshot snapshot) {
             if (snapshot.connectionState == ConnectionState.done) {
-              if (snapshot.data == null) {
+              Map? data = snapshot.data;
-                return const SizedBox();
+              if (data != null && data['status']) {
-              }
-              if (snapshot.data['status']) {
                 final replyItems = _messageReplyCtr.replyItems;
                 return Obx(
-                  () => ListView.separated(
+                  () => replyItems.isEmpty
-                    controller: scrollController,
+                      ? const CustomScrollView(slivers: [NoData()])
-                    itemBuilder: (context, index) =>
+                      : ListView.separated(
-                        ReplyItem(item: replyItems[index]),
+                          controller: scrollController,
-                    itemCount: replyItems.length,
+                          itemBuilder: (context, index) =>
-                    separatorBuilder: (BuildContext context, int index) {
+                              ReplyItem(item: replyItems[index]),
-                      return Divider(
+                          itemCount: replyItems.length,
-                        indent: 66,
+                          separatorBuilder: (BuildContext context, int index) {
-                        endIndent: 14,
+                            return Divider(
-                        height: 1,
+                              indent: 66,
-                        color: Colors.grey.withOpacity(0.1),
+                              endIndent: 14,
-                      );
+                              height: 1,
-                    },
+                              color: Colors.grey.withOpacity(0.1),
-                  ),
+                            );
+                          },
+                        ),
                 );
               } else {
                 // 请求错误
                 return HttpError(
-                  errMsg: snapshot.data['msg'],
+                  errMsg: data?['msg'] ?? '请求异常',
                   fn: () {
                     setState(() {
                       _futureBuilderFuture =

lib/pages/mine/view.dart

@@ -75,60 +75,58 @@ class _MinePageState extends State<MinePage>
               parent: BouncingScrollPhysics()),
           child: Padding(
             padding: const EdgeInsets.only(bottom: 110),
-            child: Expanded(
+            child: Column(
-              child: Column(
+              children: [
-                children: [
+                Obx(() => _buildProfileSection(context, ctr.userInfo.value)),
-                  Obx(() => _buildProfileSection(context, ctr.userInfo.value)),
+                const SizedBox(height: 10),
-                  const SizedBox(height: 10),
+                FutureBuilder(
-                  FutureBuilder(
+                  future: _futureBuilderFuture,
-                    future: _futureBuilderFuture,
+                  builder: (context, snapshot) {
-                    builder: (context, snapshot) {
+                    if (snapshot.connectionState == ConnectionState.done) {
-                      if (snapshot.connectionState == ConnectionState.done) {
+                      if (snapshot.data == null) {
-                        if (snapshot.data == null) {
+                        return const SizedBox();
-                          return const SizedBox();
+                      }
-                        }
+                      if (snapshot.data['status']) {
-                        if (snapshot.data['status']) {
+                        return Obx(
-                          return Obx(
+                          () => _buildStatsSection(
-                            () => _buildStatsSection(
-                              context,
-                              ctr.userStat.value,
-                            ),
-                          );
-                        } else {
-                          return _buildStatsSection(
                             context,
                             ctr.userStat.value,
-                          );
+                          ),
-                        }
+                        );
                       } else {
                         return _buildStatsSection(
                           context,
                           ctr.userStat.value,
                         );
                       }
-                    },
+                    } else {
-                  ),
+                      return _buildStatsSection(
-                  _buildMenuSection(context),
+                        context,
-                  Obx(
+                        ctr.userStat.value,
-                    () => Visibility(
+                      );
-                      visible: ctr.userLogin.value,
+                    }
-                      child: Divider(
+                  },
-                        height: 25,
+                ),
-                        color: Theme.of(context).dividerColor.withOpacity(0.1),
+                _buildMenuSection(context),
-                      ),
+                Obx(
+                  () => Visibility(
+                    visible: ctr.userLogin.value,
+                    child: Divider(
+                      height: 25,
+                      color: Theme.of(context).dividerColor.withOpacity(0.1),
                     ),
                   ),
-                  Obx(
+                ),
-                    () => ctr.userLogin.value
+                Obx(
-                        ? _buildFavoritesSection(context)
+                  () => ctr.userLogin.value
-                        : const SizedBox(),
+                      ? _buildFavoritesSection(context)
-                  ),
+                      : const SizedBox(),
-                  SizedBox(
+                ),
-                    height: MediaQuery.of(context).padding.bottom +
+                SizedBox(
-                        kBottomNavigationBarHeight,
+                  height: MediaQuery.of(context).padding.bottom +
-                  )
+                      kBottomNavigationBarHeight,
-                ],
+                )
-              ),
+              ],
             ),
           ),
         ),

lib/pages/subscription_detail/view.dart

@@ -80,16 +80,21 @@ class _SubDetailPageState extends State<SubDetailPage> {
                       Column(
                         crossAxisAlignment: CrossAxisAlignment.start,
                         children: [
-                          Text(
+                          SizedBox(
-                            _subDetailController.item.title!,
+                            width: Get.size.width - 100,
-                            style: Theme.of(context).textTheme.titleMedium,
+                            child: Text(
+                              _subDetailController.item.title!,
+                              overflow: TextOverflow.ellipsis,
+                              maxLines: 1,
+                              style: Theme.of(context).textTheme.titleMedium,
+                            ),
                           ),
                           Text(
                             '共${_subDetailController.item.mediaCount!}条视频',
                             style: Theme.of(context).textTheme.labelMedium,
                           )
                         ],
-                      )
+                      ),
                     ],
                   ),
                 );

lib/pages/video/detail/reply/widgets/reply_item.dart

@@ -59,9 +59,7 @@ class ReplyItem extends StatelessWidget {
             return;
           }
           feedBack();
-          if (replyReply != null) {
+          replyReply?.call(replyItem, null, replyItem!.rcount! > 0);
-            replyReply!(replyItem, null, replyItem!.replies!.isNotEmpty);
-          }
         },
         onLongPress: () {
           if (replySave) {
@@ -267,9 +265,7 @@ class ReplyItem extends StatelessWidget {
         // 操作区域
         bottonAction(context, replyItem!.replyControl, replySave),
         // 一楼的评论
-        if ((replyItem!.replyControl!.isShow! ||
+        if ((replyItem!.rcount! > 0) && showReplyRow!) ...[
-                replyItem!.replies!.isNotEmpty) &&
-            showReplyRow!) ...[
           Padding(
             padding: const EdgeInsets.only(top: 5, bottom: 12),
             child: ReplyItemRow(
@@ -416,8 +412,7 @@ class ReplyItemRow extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final bool isShow = replyControl!.isShow!;
+    final int extraRow = replyItem!.rcount! > 0 ? 1 : 0;
-    final int extraRow = replyControl != null && isShow ? 1 : 0;
     ColorScheme colorScheme = Theme.of(context).colorScheme;
     TextTheme textTheme = Theme.of(context).textTheme;
 

lib/pages/whisper/controller.dart

@@ -45,7 +45,9 @@ class WhisperController extends GetxController {
     if (isLoading) return;
     var res = await MsgHttp.sessionList(
         endTs: type == 'onLoad' ? sessionList.last.sessionTs : null);
-    if (res['data'].sessionList != null && res['data'].sessionList.isNotEmpty) {
+    if (res['status'] &&
+        res['data'].sessionList != null &&
+        res['data'].sessionList.isNotEmpty) {
       await queryAccountList(res['data'].sessionList);
       // 将 accountList 转换为 Map 结构
       Map<int, dynamic> accountMap = {};
@@ -67,8 +69,6 @@ class WhisperController extends GetxController {
           );
         }
       }
-    }
-    if (res['status'] && res['data'].sessionList != null) {
       if (type == 'onLoad') {
         sessionList.addAll(res['data'].sessionList);
       } else {
@@ -81,10 +81,33 @@ class WhisperController extends GetxController {
 
   Future queryAccountList(sessionList) async {
     List midsList = sessionList.map((e) => e.talkerId!).toList();
+    var index = midsList.indexOf(0);
+    AccountListModel? accountInfo;
+    if (index != -1) {
+      accountInfo = AccountListModel(
+        mid: 0,
+        name: '客服消息',
+        face:
+            'https://i0.hdslb.com/bfs/activity-plat/static/20230809/f87fc7ea98282a4dd48ec7743044b0bf/OWdoP9ZXAX.png',
+      );
+    }
+    if (midsList.length == 1 && index != -1) {
+      accountList.add(accountInfo!);
+      return;
+    }
+
     var res = await MsgHttp.accountList(midsList.join(','));
     if (res['status']) {
       accountList.value = res['data'];
+      if (accountInfo != null) {
+        if (accountList.isNotEmpty) {
+          accountList.insert(index, accountInfo);
+        } else {
+          accountList.add(accountInfo);
+        }
+      }
     }
+
     return res;
   }
 

lib/pages/whisper/view.dart

@@ -4,7 +4,9 @@ import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:get/get.dart';
 import 'package:pilipala/common/constants.dart';
 import 'package:pilipala/common/skeleton/skeleton.dart';
+import 'package:pilipala/common/widgets/http_error.dart';
 import 'package:pilipala/common/widgets/network_img_layer.dart';
+import 'package:pilipala/common/widgets/no_data.dart';
 import 'package:pilipala/utils/utils.dart';
 
 import 'controller.dart';
@@ -126,7 +128,7 @@ class _WhisperPageState extends State<WhisperPage> {
                       RxList sessionList = _whisperController.sessionList;
                       return Obx(
                         () => sessionList.isEmpty
-                            ? const SizedBox()
+                            ? const CustomScrollView(slivers: [NoData()])
                             : ListView.separated(
                                 itemCount: sessionList.length,
                                 shrinkWrap: true,
@@ -150,8 +152,15 @@ class _WhisperPageState extends State<WhisperPage> {
                       );
                     } else {
                       // 请求错误
-                      return Center(
+                      return HttpError(
-                        child: Text(data?['msg'] ?? '请求异常'),
+                        errMsg: data?['msg'] ?? '请求异常',
+                        fn: () {
+                          setState(() {
+                            _futureBuilderFuture =
+                                _whisperController.querySessionList('init');
+                          });
+                        },
+                        isInSliver: false,
                       );
                     }
                   } else {
@@ -227,8 +236,8 @@ class SessionItem extends StatelessWidget {
           '/whisperDetail',
           parameters: {
             'talkerId': sessionItem.talkerId.toString(),
-            'name': sessionItem.accountInfo.name,
+            'name': sessionItem.accountInfo?.name ?? '',
-            'face': sessionItem.accountInfo.face ?? '',
+            'face': sessionItem.accountInfo?.face ?? '',
             'mid': (sessionItem.accountInfo?.mid ?? 0).toString(),
             'heroTag': heroTag,
           },
@@ -244,11 +253,11 @@ class SessionItem extends StatelessWidget {
             width: 45,
             height: 45,
             type: 'avatar',
-            src: sessionItem.accountInfo.face ?? '',
+            src: sessionItem.accountInfo?.face ?? '',
           ),
         ),
       ),
-      title: Text(sessionItem.accountInfo.name),
+      title: Text(sessionItem.accountInfo?.name ?? ''),
       subtitle: Text(
           msgStatus == 1
               ? '你撤回了一条消息'

lib/utils/route_push.dart

@@ -8,7 +8,7 @@ import 'package:pilipala/utils/utils.dart';
 class RoutePush {
   // 番剧跳转
   static Future<void> bangumiPush(int? seasonId, int? epId,
-      {String? heroTag}) async {
+      {String? heroTag, int? progressIndex}) async {
     SmartDialog.showLoading<dynamic>(msg: '获取中...');
     try {
       var result = await SearchHttp.bangumiInfo(seasonId: seasonId, epId: epId);
@@ -19,7 +19,10 @@ class RoutePush {
           return;
         }
         final BangumiInfoModel bangumiDetail = result['data'];
-        final EpisodeItem episode = bangumiDetail.episodes!.first;
+        EpisodeItem episode = bangumiDetail.episodes!.first;
+        if (progressIndex != null && progressIndex >= 1) {
+          episode = bangumiDetail.episodes![progressIndex - 1];
+        }
         final int epId = episode.id!;
         final int cid = episode.cid!;
         final String bvid = episode.bvid!;
@@ -31,7 +34,7 @@ class RoutePush {
         };
         arguments['heroTag'] = heroTag ?? Utils.makeHeroTag(cid);
         Get.toNamed(
-          '/video?bvid=$bvid&cid=$cid&epId=$epId',
+          '/video?bvid=$bvid&cid=$cid&epId=$epId&seasonId=$seasonId',
           arguments: arguments,
         );
       } else {