mod: 修改关于页面

fix: 修复焦点恢复时错误播放的问题

lib/common/widgets/http_error.dart

@@ -22,20 +22,27 @@ class HttpError extends StatelessWidget {
               "assets/images/error.svg",
               height: 200,
             ),
-            const SizedBox(height: 20),
+            const SizedBox(height: 30),
             Text(
               errMsg ?? '请求异常',
               textAlign: TextAlign.center,
               style: Theme.of(context).textTheme.titleSmall,
             ),
-            const SizedBox(height: 30),
+            const SizedBox(height: 20),
-            OutlinedButton.icon(
+            FilledButton.tonal(
               onPressed: () {
                 fn!();
               },
-              icon: const Icon(Icons.arrow_forward_outlined, size: 20),
+              style: ButtonStyle(
-              label: Text(btnText ?? '点击重试'),
+                backgroundColor: MaterialStateProperty.resolveWith((states) {
-            )
+                  return Theme.of(context).colorScheme.primary.withAlpha(20);
+                }),
+              ),
+              child: Text(
+                btnText ?? '点击重试',
+                style: TextStyle(color: Theme.of(context).colorScheme.primary),
+              ),
+            ),
           ],
         ),
       ),

lib/common/widgets/stat/danmu.dart

@@ -3,7 +3,7 @@ import 'package:pilipala/utils/utils.dart';
 
 class StatDanMu extends StatelessWidget {
   final String? theme;
-  final int? danmu;
+  final dynamic danmu;
   final String? size;
 
   const StatDanMu({Key? key, this.theme, this.danmu, this.size})

lib/common/widgets/stat/view.dart

@@ -3,7 +3,7 @@ import 'package:pilipala/utils/utils.dart';
 
 class StatView extends StatelessWidget {
   final String? theme;
-  final int? view;
+  final dynamic view;
   final String? size;
 
   const StatView({Key? key, this.theme, this.view, this.size})

lib/common/widgets/video_card_v.dart

@@ -1,6 +1,9 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:get/get.dart';
+import '../../models/model_rec_video_item.dart';
+import 'stat/danmu.dart';
+import 'stat/view.dart';
 import '../../http/dynamics.dart';
 import '../../http/search.dart';
 import '../../http/user.dart';
@@ -322,19 +325,31 @@ class VideoStat extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return RichText(
+    return Row(
+      children: [
+        StatView(
+          theme: 'gray',
+          view: videoItem.stat.view,
+        ),
+        const SizedBox(width: 8),
+        StatDanMu(
+          theme: 'gray',
+          danmu: videoItem.stat.danmu,
+        ),
+        if (videoItem is RecVideoItemModel) ...<Widget>[
+          const Spacer(),
+          RichText(
             maxLines: 1,
             text: TextSpan(
                 style: TextStyle(
-          fontSize: MediaQuery.textScalerOf(context)
+                  fontSize: Theme.of(context).textTheme.labelSmall!.fontSize,
-              .scale(Theme.of(context).textTheme.labelSmall!.fontSize!),
                   color: Theme.of(context).colorScheme.outline,
                 ),
-        children: [
+                text: Utils.formatTimestampToRelativeTime(videoItem.pubdate)),
-          TextSpan(text: '${Utils.numFormat(videoItem.stat.view)}观看'),
-          TextSpan(text: ' • ${Utils.numFormat(videoItem.stat.danmu)}弹幕'),
-        ],
           ),
+          const SizedBox(width: 4),
+        ]
+      ],
     );
   }
 }

lib/http/member.dart

@@ -101,10 +101,13 @@ class MemberHttp {
         'data': MemberArchiveDataModel.fromJson(res.data['data'])
       };
     } else {
+      Map errMap = {
+        -352: '风控校验失败，请检查登录状态',
+      };
       return {
         'status': false,
         'data': [],
-        'msg': res.data['message'],
+        'msg': errMap[res.data['code']] ?? res.data['message'],
       };
     }
   }
@@ -123,10 +126,13 @@ class MemberHttp {
         'data': DynamicsDataModel.fromJson(res.data['data']),
       };
     } else {
+      Map errMap = {
+        -352: '风控校验失败，请检查登录状态',
+      };
       return {
         'status': false,
         'data': [],
-        'msg': res.data['message'],
+        'msg': errMap[res.data['code']] ?? res.data['message'],
       };
     }
   }

lib/http/video.dart

@@ -130,7 +130,7 @@ class VideoHttp {
         }
         return {'status': true, 'data': list};
       } else {
-        return {'status': false, 'data': []};
+        return {'status': false, 'data': [], 'msg': res.data['message']};
       }
     } catch (err) {
       return {'status': false, 'data': [], 'msg': err};

lib/models/home/rcmd/result.dart

@@ -1,3 +1,5 @@
+import 'package:pilipala/utils/id_utils.dart';
+
 class RecVideoItemAppModel {
   RecVideoItemAppModel({
     this.id,
@@ -50,14 +52,15 @@ class RecVideoItemAppModel {
         ? json['player_args']['aid']
         : int.parse(json['param'] ?? '-1');
     aid = json['player_args'] != null ? json['player_args']['aid'] : -1;
-    bvid = null;
+    bvid = json['player_args'] != null
+        ? IdUtils.av2bv(json['player_args']['aid'])
+        : '';
     cid = json['player_args'] != null ? json['player_args']['cid'] : -1;
     pic = json['cover'];
     stat = RcmdStat.fromJson(json);
     // 改用player_args中的duration作为原始数据（秒数）
-    duration = json['player_args'] != null
+    duration =
-        ? json['player_args']['duration']
+        json['player_args'] != null ? json['player_args']['duration'] : -1;
-        : -1;
     //duration = json['cover_right_text'];
     title = json['title'];
     owner = RcmdOwner.fromJson(json);

lib/models/member/archive.dart

@@ -142,7 +142,7 @@ class Stat {
 
   Stat.fromJson(Map<String, dynamic> json) {
     view = json["play"];
-    danmaku = json['comment'];
+    danmaku = json['video_review'];
   }
 }
 

lib/models/video/play/url.dart

@@ -34,6 +34,7 @@ class PlayUrlModel {
   String? seekParam;
   String? seekType;
   Dash? dash;
+  List<Durl>? durl;
   List<FormatItem>? supportFormats;
   // String? highFormat;
   int? lastPlayTime;
@@ -52,7 +53,8 @@ class PlayUrlModel {
     videoCodecid = json['video_codecid'];
     seekParam = json['seek_param'];
     seekType = json['seek_type'];
-    dash = Dash.fromJson(json['dash']);
+    dash = json['dash'] != null ? Dash.fromJson(json['dash']) : null;
+    durl = json['durl']?.map<Durl>((e) => Durl.fromJson(e)).toList();
     supportFormats = json['support_formats'] != null
         ? json['support_formats']
             .map<FormatItem>((e) => FormatItem.fromJson(e))
@@ -250,3 +252,30 @@ class Flac {
     audio = json['audio'] != null ? AudioItem.fromJson(json['audio']) : null;
   }
 }
+
+class Durl {
+  Durl({
+    this.order,
+    this.length,
+    this.size,
+    this.ahead,
+    this.vhead,
+    this.url,
+  });
+
+  int? order;
+  int? length;
+  int? size;
+  String? ahead;
+  String? vhead;
+  String? url;
+
+  Durl.fromJson(Map<String, dynamic> json) {
+    order = json['order'];
+    length = json['length'];
+    size = json['size'];
+    ahead = json['ahead'];
+    vhead = json['vhead'];
+    url = json['url'];
+  }
+}

lib/pages/about/index.dart

@@ -53,29 +53,54 @@ class _AboutPageState extends State<AboutPage> {
               style: Theme.of(context).textTheme.titleMedium,
             ),
             const SizedBox(height: 6),
-            Text(
-              '使用Flutter开发的哔哩哔哩第三方客户端',
-              style: TextStyle(color: Theme.of(context).colorScheme.outline),
-            ),
-            const SizedBox(height: 20),
             Obx(
-              () => ListTile(
+              () => Badge(
-                title: const Text('当前版本'),
+                isLabelVisible: _aboutController.isLoading.value
-                trailing: Text(_aboutController.currentVersion.value,
+                    ? false
-                    style: subTitleStyle),
+                    : _aboutController.isUpdate.value,
+                label: const Text('New'),
+                child: Padding(
+                  padding: const EdgeInsets.fromLTRB(0, 0, 0, 30),
+                  child: FilledButton.tonal(
+                    onPressed: () {
+                      showModalBottomSheet(
+                        context: context,
+                        builder: (context) {
+                          return Column(
+                            mainAxisSize: MainAxisSize.min,
+                            children: [
+                              ListTile(
+                                onTap: () => _aboutController.githubRelease(),
+                                title: const Text('Github下载'),
+                              ),
+                              ListTile(
+                                onTap: () => _aboutController.panDownload(),
+                                title: const Text('网盘下载'),
+                              ),
+                              ListTile(
+                                onTap: () => _aboutController.webSiteUrl(),
+                                title: const Text('官网下载'),
+                              ),
+                              ListTile(
+                                onTap: () => _aboutController.qimiao(),
+                                title: const Text('奇妙应用'),
+                              ),
+                              SizedBox(
+                                  height:
+                                      MediaQuery.of(context).padding.bottom +
+                                          20)
+                            ],
+                          );
+                        },
+                      );
+                    },
+                    child: Text(
+                      'V${_aboutController.currentVersion.value}',
+                      style: subTitleStyle.copyWith(
+                        color: Theme.of(context).primaryColor,
+                      ),
                     ),
                   ),
-            Obx(
-              () => ListTile(
-                onTap: () => _aboutController.onUpdate(),
-                title: const Text('最新版本'),
-                trailing: Text(
-                  _aboutController.isLoading.value
-                      ? '正在获取'
-                      : _aboutController.isUpdate.value
-                          ? '有新版本  ❤️${_aboutController.remoteVersion.value}'
-                          : '当前已是最新版',
-                  style: subTitleStyle,
                 ),
               ),
             ),
@@ -87,14 +112,9 @@ class _AboutPageState extends State<AboutPage> {
             //     size: 16,
             //   ),
             // ),
-            Divider(
-              thickness: 1,
-              height: 30,
-              color: Theme.of(context).colorScheme.outlineVariant,
-            ),
             ListTile(
               onTap: () => _aboutController.githubUrl(),
-              title: const Text('Github'),
+              title: const Text('开源地址'),
               trailing: Text(
                 'github.com/guozhigq/pilipala',
                 style: subTitleStyle,
@@ -128,19 +148,43 @@ class _AboutPageState extends State<AboutPage> {
                 color: outline,
               ),
             ),
+            ListTile(
+              onTap: () {
+                showModalBottomSheet(
+                  context: context,
+                  builder: (context) {
+                    return Column(
+                      mainAxisSize: MainAxisSize.min,
+                      children: [
                         ListTile(
                           onTap: () => _aboutController.qqChanel(),
                           title: const Text('QQ群'),
-              trailing: Icon(
+                          trailing: Text(
-                Icons.arrow_forward_ios,
+                            '616150809',
-                size: 16,
+                            style: subTitleStyle,
-                color: outline,
                           ),
                         ),
                         ListTile(
                           onTap: () => _aboutController.tgChanel(),
                           title: const Text('TG频道'),
-              trailing: Icon(Icons.arrow_forward_ios, size: 16, color: outline),
+                          trailing: Text(
+                            'https://t.me/+lm_oOVmF0RJiODk1',
+                            style: subTitleStyle,
+                          ),
+                        ),
+                        SizedBox(
+                            height: MediaQuery.of(context).padding.bottom + 20)
+                      ],
+                    );
+                  },
+                );
+              },
+              title: const Text('交流社区'),
+              trailing: Icon(
+                Icons.arrow_forward_ios,
+                size: 16,
+                color: outline,
+              ),
             ),
             ListTile(
               onTap: () => _aboutController.aPay(),
@@ -163,6 +207,7 @@ class _AboutPageState extends State<AboutPage> {
               subtitle: Text('图片及网络缓存 $cacheSize', style: subTitleStyle),
               trailing: Icon(Icons.arrow_forward_ios, size: 16, color: outline),
             ),
+            SizedBox(height: MediaQuery.of(context).padding.bottom + 20)
           ],
         ),
       ),
@@ -230,11 +275,26 @@ class AboutController extends GetxController {
     );
   }
 
+  githubRelease() {
+    launchUrl(
+      Uri.parse('https://github.com/guozhigq/pilipala/release'),
+      mode: LaunchMode.externalApplication,
+    );
+  }
+
   // 从网盘下载
   panDownload() {
-    launchUrl(
+    Clipboard.setData(
+      const ClipboardData(text: 'pili'),
+    );
+    SmartDialog.showToast(
+      '已复制提取码：pili',
+      displayTime: const Duration(milliseconds: 500),
+    ).then(
+      (value) => launchUrl(
         Uri.parse('https://www.123pan.com/s/9sVqVv-flu0A.html'),
         mode: LaunchMode.externalApplication,
+      ),
     );
   }
 
@@ -250,7 +310,7 @@ class AboutController extends GetxController {
   // qq频道
   qqChanel() {
     Clipboard.setData(
-      const ClipboardData(text: '489981949'),
+      const ClipboardData(text: '616150809'),
     );
     SmartDialog.showToast('已复制QQ群号');
   }
@@ -291,6 +351,13 @@ class AboutController extends GetxController {
     );
   }
 
+  qimiao() {
+    launchUrl(
+      Uri.parse('https://www.magicalapk.com/home'),
+      mode: LaunchMode.externalApplication,
+    );
+  }
+
   // 日志
   logs() {
     Get.toNamed('/logs');

lib/pages/bangumi/introduction/controller.dart

@@ -218,14 +218,12 @@ class BangumiIntroController extends GetxController {
         addIds: addMediaIdsNew.join(','),
         delIds: delMediaIdsNew.join(','));
     if (result['status']) {
-      if (result['data']['prompt']) {
       addMediaIdsNew = [];
       delMediaIdsNew = [];
-        Get.back();
       // 重新获取收藏状态
       queryHasFavVideo();
       SmartDialog.showToast('✅ 操作成功');
-      }
+      Get.back();
     }
   }
 

lib/pages/bangumi/view.dart

@@ -9,7 +9,6 @@ import 'package:pilipala/common/constants.dart';
 import 'package:pilipala/common/widgets/http_error.dart';
 import 'package:pilipala/pages/home/index.dart';
 import 'package:pilipala/pages/main/index.dart';
-import 'package:pilipala/pages/rcmd/view.dart';
 
 import 'controller.dart';
 import 'widgets/bangumu_card_v.dart';
@@ -199,7 +198,10 @@ class _BangumiPageState extends State<BangumiPage>
                   } else {
                     return HttpError(
                       errMsg: data['msg'],
-                      fn: () => {},
+                      fn: () {
+                        _futureBuilderFuture =
+                            _bangumidController.queryBangumiListFeed();
+                      },
                     );
                   }
                 } else {
@@ -208,7 +210,6 @@ class _BangumiPageState extends State<BangumiPage>
               },
             ),
           ),
-          const LoadingMore()
         ],
       ),
     );

lib/pages/dynamics/view.dart

@@ -192,22 +192,6 @@ class _DynamicsPageState extends State<DynamicsPage>
                   )
                 ],
               ),
-              // Obx(
-              //   () => Visibility(
-              //     visible: _dynamicsController.userLogin.value,
-              //     child: Positioned(
-              //       right: 4,
-              //       top: 0,
-              //       bottom: 0,
-              //       child: IconButton(
-              //         padding: EdgeInsets.zero,
-              //         onPressed: () =>
-              //             {feedBack(), _dynamicsController.resetSearch()},
-              //         icon: const Icon(Icons.history, size: 21),
-              //       ),
-              //     ),
-              //   ),
-              // ),
             ],
           ),
         ),
@@ -229,7 +213,8 @@ class _DynamicsPageState extends State<DynamicsPage>
                     return Obx(() => UpPanel(_dynamicsController.upData.value));
                   } else {
                     return const SliverToBoxAdapter(
-                        child: SizedBox(height: 80));
+                      child: SizedBox(height: 80),
+                    );
                   }
                 } else {
                   return const SliverToBoxAdapter(
@@ -240,15 +225,6 @@ class _DynamicsPageState extends State<DynamicsPage>
                 }
               },
             ),
-            SliverToBoxAdapter(
-              child: Container(
-                height: 6,
-                color: Theme.of(context)
-                    .colorScheme
-                    .onInverseSurface
-                    .withOpacity(0.5),
-              ),
-            ),
             FutureBuilder(
               future: _futureBuilderFuture,
               builder: (context, snapshot) {

lib/pages/dynamics/widgets/up_panel.dart

@@ -36,8 +36,7 @@ class _UpPanelState extends State<UpPanel> {
     }
     upList.insert(
       0,
-      UpItem(
+      UpItem(face: '', uname: '全部动态', mid: -1),
-          face: 'https://files.catbox.moe/8uc48f.png', uname: '全部动态', mid: -1),
     );
     userInfo = userInfoCache.get('userInfoCache');
     upList.insert(
@@ -56,7 +55,7 @@ class _UpPanelState extends State<UpPanel> {
       floating: true,
       pinned: false,
       delegate: _SliverHeaderDelegate(
-          height: 124,
+          height: 126,
           child: Column(
             mainAxisAlignment: MainAxisAlignment.start,
             crossAxisAlignment: CrossAxisAlignment.start,
@@ -121,6 +120,13 @@ class _UpPanelState extends State<UpPanel> {
                   ],
                 ),
               ),
+              Container(
+                height: 6,
+                color: Theme.of(context)
+                    .colorScheme
+                    .onInverseSurface
+                    .withOpacity(0.5),
+              ),
             ],
           )),
     );
@@ -171,6 +177,9 @@ class _UpPanelState extends State<UpPanel> {
       },
       onLongPress: () {
         feedBack();
+        if (data.mid == -1) {
+          return;
+        }
         String heroTag = Utils.makeHeroTag(data.mid);
         Get.toNamed('/member?mid=${data.mid}',
             arguments: {'face': data.face, 'heroTag': heroTag});
@@ -198,11 +207,18 @@ class _UpPanelState extends State<UpPanel> {
                 backgroundColor: data.type == 'live'
                     ? Theme.of(context).colorScheme.secondaryContainer
                     : Theme.of(context).colorScheme.primary,
-                child: NetworkImgLayer(
+                child: data.face != ''
-                  width: 49,
+                    ? NetworkImgLayer(
-                  height: 49,
+                        width: 50,
+                        height: 50,
                         src: data.face,
                         type: 'avatar',
+                      )
+                    : const CircleAvatar(
+                        radius: 25,
+                        backgroundImage: AssetImage(
+                          'assets/images/noface.jpeg',
+                        ),
                       ),
               ),
               Padding(
@@ -271,13 +287,11 @@ class UpPanelSkeleton extends StatelessWidget {
             mainAxisAlignment: MainAxisAlignment.center,
             children: [
               Container(
-                width: 49,
+                width: 50,
-                height: 49,
+                height: 50,
                 decoration: BoxDecoration(
                   color: Theme.of(context).colorScheme.onInverseSurface,
-                  borderRadius: const BorderRadius.all(
+                  borderRadius: BorderRadius.circular(50),
-                    Radius.circular(24),
-                  ),
                 ),
               ),
               Container(

lib/pages/fav_detail/controller.dart

@@ -60,7 +60,6 @@ class FavDetailController extends GetxController {
     var result = await VideoHttp.favVideo(
         aid: id, addIds: '', delIds: mediaId.toString());
     if (result['status']) {
-      if (result['data']['prompt']) {
       List dataList = favList;
       for (var i in dataList) {
         if (i.id == id) {
@@ -71,7 +70,6 @@ class FavDetailController extends GetxController {
       SmartDialog.showToast('取消收藏');
     }
   }
-  }
 
   onLoad() {
     queryUserFavFolderDetail(type: 'onLoad');

lib/pages/fav_detail/view.dart

@@ -24,11 +24,14 @@ class _FavDetailPageState extends State<FavDetailPage> {
       Get.put(FavDetailController());
   late StreamController<bool> titleStreamC; // a
   Future? _futureBuilderFuture;
+  late String mediaId;
 
   @override
   void initState() {
     super.initState();
+    mediaId = Get.parameters['mediaId']!;
     _futureBuilderFuture = _favDetailController.queryUserFavFolderDetail();
+    mediaId = Get.parameters['mediaId']!;
     titleStreamC = StreamController<bool>();
     _controller.addListener(
       () {
@@ -94,8 +97,8 @@ class _FavDetailPageState extends State<FavDetailPage> {
             ),
             actions: [
               IconButton(
-                onPressed: () => Get.toNamed(
+                onPressed: () =>
-                    '/favSearch?searchType=0&mediaId=${Get.parameters['mediaId']!}'),
+                    Get.toNamed('/favSearch?searchType=0&mediaId=$mediaId'),
                 icon: const Icon(Icons.search_outlined),
               ),
               //   IconButton(

lib/pages/fav_detail/widget/fav_video_card.dart

@@ -15,9 +15,14 @@ import '../../../common/widgets/badge.dart';
 class FavVideoCardH extends StatelessWidget {
   final dynamic videoItem;
   final Function? callFn;
+  final int? searchType;
 
-  const FavVideoCardH({Key? key, required this.videoItem, this.callFn})
+  const FavVideoCardH({
-      : super(key: key);
+    Key? key,
+    required this.videoItem,
+    this.callFn,
+    this.searchType,
+  }) : super(key: key);
 
   @override
   Widget build(BuildContext context) {
@@ -107,7 +112,11 @@ class FavVideoCardH extends StatelessWidget {
                           },
                         ),
                       ),
-                      VideoContent(videoItem: videoItem, callFn: callFn)
+                      VideoContent(
+                        videoItem: videoItem,
+                        callFn: callFn,
+                        searchType: searchType,
+                      )
                     ],
                   ),
                 );
@@ -123,7 +132,13 @@ class FavVideoCardH extends StatelessWidget {
 class VideoContent extends StatelessWidget {
   final dynamic videoItem;
   final Function? callFn;
-  const VideoContent({super.key, required this.videoItem, this.callFn});
+  final int? searchType;
+  const VideoContent({
+    super.key,
+    required this.videoItem,
+    this.callFn,
+    this.searchType,
+  });
 
   @override
   Widget build(BuildContext context) {
@@ -189,7 +204,8 @@ class VideoContent extends StatelessWidget {
                 ),
               ],
             ),
-            Positioned(
+            searchType != 1
+                ? Positioned(
                     right: 0,
                     bottom: -4,
                     child: IconButton(
@@ -209,8 +225,9 @@ class VideoContent extends StatelessWidget {
                                     child: Text(
                                       '取消',
                                       style: TextStyle(
-                                    color:
+                                          color: Theme.of(context)
-                                        Theme.of(context).colorScheme.outline),
+                                              .colorScheme
+                                              .outline),
                                     )),
                                 TextButton(
                                   onPressed: () async {
@@ -230,7 +247,8 @@ class VideoContent extends StatelessWidget {
                         size: 18,
                       ),
                     ),
-            ),
+                  )
+                : const SizedBox(),
           ],
         ),
       ),

lib/pages/fav_search/controller.dart

@@ -1,8 +1,11 @@
 import 'package:flutter/material.dart';
+import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:get/get.dart';
 import 'package:pilipala/http/user.dart';
 import 'package:pilipala/models/user/fav_detail.dart';
 
+import '../../http/video.dart';
+
 class FavSearchController extends GetxController {
   final ScrollController scrollController = ScrollController();
   Rx<TextEditingController> controller = TextEditingController().obs;
@@ -72,4 +75,19 @@ class FavSearchController extends GetxController {
     if (!hasMore) return;
     searchFav(type: 'onLoad');
   }
+
+  onCancelFav(int id) async {
+    var result = await VideoHttp.favVideo(
+        aid: id, addIds: '', delIds: mediaId.toString());
+    if (result['status']) {
+      List dataList = favList;
+      for (var i in dataList) {
+        if (i.id == id) {
+          dataList.remove(i);
+          break;
+        }
+      }
+      SmartDialog.showToast('取消收藏');
+    }
+  }
 }

lib/pages/fav_search/view.dart

@@ -8,9 +8,7 @@ import 'package:pilipala/pages/fav_detail/widget/fav_video_card.dart';
 import 'controller.dart';
 
 class FavSearchPage extends StatefulWidget {
-  final int? sourceType;
+  const FavSearchPage({super.key});
-  final int? mediaId;
-  const FavSearchPage({super.key, this.sourceType, this.mediaId});
 
   @override
   State<FavSearchPage> createState() => _FavSearchPageState();
@@ -19,11 +17,12 @@ class FavSearchPage extends StatefulWidget {
 class _FavSearchPageState extends State<FavSearchPage> {
   final FavSearchController _favSearchCtr = Get.put(FavSearchController());
   late ScrollController scrollController;
+  late int searchType;
 
   @override
   void initState() {
     super.initState();
-
+    searchType = int.parse(Get.parameters['searchType']!);
     scrollController = _favSearchCtr.scrollController;
     scrollController.addListener(
       () {
@@ -100,7 +99,11 @@ class _FavSearchPageState extends State<FavSearchPage> {
                       } else {
                         return FavVideoCardH(
                           videoItem: _favSearchCtr.favList[index],
-                          callFn: () => null,
+                          searchType: searchType,
+                          callFn: () => searchType != 1
+                              ? _favSearchCtr
+                                  .onCancelFav(_favSearchCtr.favList[index].id!)
+                              : {},
                         );
                       }
                     },

lib/pages/home/controller.dart

@@ -26,6 +26,7 @@ class HomeController extends GetxController with GetTickerProviderStateMixin {
   late List defaultTabs;
   late List<String> tabbarSort;
   RxString defaultSearch = ''.obs;
+  late bool enableGradientBg;
 
   @override
   void onInit() {
@@ -40,6 +41,8 @@ class HomeController extends GetxController with GetTickerProviderStateMixin {
     if (setting.get(SettingBoxKey.enableSearchWord, defaultValue: true)) {
       searchDefault();
     }
+    enableGradientBg =
+        setting.get(SettingBoxKey.enableGradientBg, defaultValue: true);
   }
 
   void onRefresh() {

lib/pages/home/view.dart

@@ -48,17 +48,20 @@ class _HomePageState extends State<HomePage>
     super.build(context);
     Brightness currentBrightness = MediaQuery.of(context).platformBrightness;
     // 设置状态栏图标的亮度
+    if (_homeController.enableGradientBg) {
       SystemChrome.setSystemUIOverlayStyle(SystemUiOverlayStyle(
         statusBarIconBrightness: currentBrightness == Brightness.light
             ? Brightness.dark
             : Brightness.light,
       ));
+    }
     return Scaffold(
       extendBody: true,
       extendBodyBehindAppBar: true,
       body: Stack(
         children: [
           // gradient background
+          if (_homeController.enableGradientBg) ...[
             Align(
               alignment: Alignment.topLeft,
               child: Opacity(
@@ -69,8 +72,14 @@ class _HomePageState extends State<HomePage>
                   decoration: BoxDecoration(
                     gradient: LinearGradient(
                         colors: [
-                        Theme.of(context).colorScheme.primary.withOpacity(0.9),
+                          Theme.of(context)
-                        Theme.of(context).colorScheme.primary.withOpacity(0.5),
+                              .colorScheme
+                              .primary
+                              .withOpacity(0.9),
+                          Theme.of(context)
+                              .colorScheme
+                              .primary
+                              .withOpacity(0.5),
                           Theme.of(context).colorScheme.surface
                         ],
                         begin: Alignment.topLeft,
@@ -80,6 +89,7 @@ class _HomePageState extends State<HomePage>
                 ),
               ),
             ),
+          ],
           Column(
             children: [
               CustomAppBar(
@@ -90,7 +100,37 @@ class _HomePageState extends State<HomePage>
                 callback: showUserBottomSheet,
               ),
               if (_homeController.tabs.length > 1) ...[
+                if (_homeController.enableGradientBg) ...[
                   const CustomTabs(),
+                ] else ...[
+                  const SizedBox(height: 4),
+                  SizedBox(
+                    width: double.infinity,
+                    height: 42,
+                    child: Align(
+                      alignment: Alignment.center,
+                      child: TabBar(
+                        controller: _homeController.tabController,
+                        tabs: [
+                          for (var i in _homeController.tabs)
+                            Tab(text: i['label'])
+                        ],
+                        isScrollable: true,
+                        dividerColor: Colors.transparent,
+                        enableFeedback: true,
+                        splashBorderRadius: BorderRadius.circular(10),
+                        tabAlignment: TabAlignment.center,
+                        onTap: (value) {
+                          feedBack();
+                          if (_homeController.initialIndex.value == value) {
+                            _homeController.tabsCtrList[value]().animateToTop();
+                          }
+                          _homeController.initialIndex.value = value;
+                        },
+                      ),
+                    ),
+                  ),
+                ],
               ] else ...[
                 const SizedBox(height: 6),
               ],

lib/pages/hot/view.dart

@@ -89,8 +89,7 @@ class _HotPageState extends State<HotPage> with AutomaticKeepAliveClientMixin {
                   if (data['status']) {
                     return Obx(
                       () => SliverList(
-                        delegate:
+                        delegate: SliverChildBuilderDelegate((context, index) {
-                            SliverChildBuilderDelegate((context, index) {
                           return VideoCardH(
                             videoItem: _hotController.videoList[index],
                             showPubdate: true,
@@ -110,7 +109,12 @@ class _HotPageState extends State<HotPage> with AutomaticKeepAliveClientMixin {
                   } else {
                     return HttpError(
                       errMsg: data['msg'],
-                      fn: () => setState(() {}),
+                      fn: () {
+                        setState(() {
+                          _futureBuilderFuture =
+                              _hotController.queryHotFeed('init');
+                        });
+                      },
                     );
                   }
                 } else {

lib/pages/live/controller.dart

@@ -10,8 +10,7 @@ class LiveController extends GetxController {
   int count = 12;
   int _currentPage = 1;
   RxInt crossAxisCount = 2.obs;
-  RxList<LiveItemModel> liveList = [LiveItemModel()].obs;
+  RxList<LiveItemModel> liveList = <LiveItemModel>[].obs;
-  bool isLoadingMore = false;
   bool flag = false;
   OverlayEntry? popupDialog;
   Box setting = GStrorage.setting;
@@ -39,7 +38,6 @@ class LiveController extends GetxController {
       }
       _currentPage += 1;
     }
-    isLoadingMore = false;
     return res;
   }
 

lib/pages/live/view.dart

@@ -11,7 +11,6 @@ import 'package:pilipala/common/widgets/http_error.dart';
 import 'package:pilipala/common/widgets/overlay_pop.dart';
 import 'package:pilipala/pages/home/index.dart';
 import 'package:pilipala/pages/main/index.dart';
-import 'package:pilipala/pages/rcmd/index.dart';
 
 import 'controller.dart';
 import 'widgets/live_item.dart';
@@ -45,8 +44,8 @@ class _LivePageState extends State<LivePage>
       () {
         if (scrollController.position.pixels >=
             scrollController.position.maxScrollExtent - 200) {
-          EasyThrottle.throttle('liveList', const Duration(seconds: 1), () {
+          EasyThrottle.throttle('liveList', const Duration(milliseconds: 200),
-            _liveController.isLoadingMore = true;
+              () {
             _liveController.onLoad();
           });
         }
@@ -108,24 +107,20 @@ class _LivePageState extends State<LivePage>
                     } else {
                       return HttpError(
                         errMsg: data['msg'],
-                        fn: () => {},
+                        fn: () {
+                          setState(() {
+                            _futureBuilderFuture =
+                                _liveController.queryLiveList('init');
+                          });
+                        },
                       );
                     }
                   } else {
-                    // 缓存数据
-                    if (_liveController.liveList.length > 1) {
-                      return contentGrid(
-                          _liveController, _liveController.liveList);
-                    }
-                    // 骨架屏
-                    else {
                     return contentGrid(_liveController, []);
                   }
-                  }
                 },
               ),
             ),
-            LoadingMore(ctr: _liveController)
           ],
         ),
       ),

lib/pages/live_room/controller.dart

@@ -3,7 +3,6 @@ import 'package:pilipala/http/constants.dart';
 import 'package:pilipala/http/live.dart';
 import 'package:pilipala/models/live/room_info.dart';
 import 'package:pilipala/plugin/pl_player/index.dart';
-
 import '../../models/live/room_info_h5.dart';
 
 class LiveRoomController extends GetxController {
@@ -16,13 +15,6 @@ class LiveRoomController extends GetxController {
   RxBool volumeOff = false.obs;
   PlPlayerController plPlayerController =
       PlPlayerController.getInstance(videoType: 'live');
-
-  // MeeduPlayerController meeduPlayerController = MeeduPlayerController(
-  //   colorTheme: Theme.of(Get.context!).colorScheme.primary,
-  //   pipEnabled: true,
-  //   controlsStyle: ControlsStyle.live,
-  //   enabledButtons: const EnabledButtons(pip: true),
-  // );
   Rx<RoomInfoH5Model> roomInfoH5 = RoomInfoH5Model().obs;
 
   @override
@@ -39,8 +31,6 @@ class LiveRoomController extends GetxController {
         cover = liveItem.cover;
       }
     }
-    queryLiveInfo();
-    queryLiveInfoH5();
   }
 
   playerInit(source) async {

lib/pages/live_room/view.dart

@@ -29,22 +29,18 @@ class _LiveRoomPageState extends State<LiveRoomPage> {
   @override
   void initState() {
     super.initState();
-    plPlayerController = _liveRoomController.plPlayerController;
-    plPlayerController!.onPlayerStatusChanged.listen(
-      (PlayerStatus status) {
-        if (status == PlayerStatus.playing) {
-          isShowCover = false;
-          setState(() {});
-        }
-      },
-    );
     if (Platform.isAndroid) {
       floating = Floating();
     }
-    _futureBuilder = _liveRoomController.queryLiveInfoH5();
+    videoSourceInit();
     _futureBuilderFuture = _liveRoomController.queryLiveInfo();
   }
 
+  Future<void> videoSourceInit() async {
+    _futureBuilder = _liveRoomController.queryLiveInfoH5();
+    plPlayerController = _liveRoomController.plPlayerController;
+  }
+
   @override
   void dispose() {
     plPlayerController!.dispose();

lib/pages/member/view.dart

@@ -105,7 +105,7 @@ class _MemberPageState extends State<MemberPage>
             actions: [
               IconButton(
                 onPressed: () => Get.toNamed(
-                    '/memberSearch?mid=${Get.parameters['mid']}&uname=${_memberController.memberInfo.value.name!}'),
+                    '/memberSearch?mid=$mid&uname=${_memberController.memberInfo.value.name!}'),
                 icon: const Icon(Icons.search_outlined),
               ),
               PopupMenuButton(

lib/pages/member_archive/view.dart

@@ -3,6 +3,7 @@ import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:pilipala/common/widgets/video_card_h.dart';
 import 'package:pilipala/utils/utils.dart';
+import '../../common/widgets/http_error.dart';
 import 'controller.dart';
 
 class MemberArchivePage extends StatefulWidget {
@@ -86,10 +87,16 @@ class _MemberArchivePageState extends State<MemberArchivePage> {
                           : const SliverToBoxAdapter(),
                     );
                   } else {
-                    return const SliverToBoxAdapter();
+                    return HttpError(
+                      errMsg: snapshot.data['msg'],
+                      fn: () {},
+                    );
                   }
                 } else {
-                  return const SliverToBoxAdapter();
+                  return HttpError(
+                    errMsg: snapshot.data['msg'],
+                    fn: () {},
+                  );
                 }
               } else {
                 return const SliverToBoxAdapter();

lib/pages/member_dynamics/view.dart

@@ -4,6 +4,7 @@ import 'package:get/get.dart';
 import 'package:pilipala/pages/member_dynamics/index.dart';
 import 'package:pilipala/utils/utils.dart';
 
+import '../../common/widgets/http_error.dart';
 import '../dynamics/widgets/dynamic_panel.dart';
 
 class MemberDynamicsPage extends StatefulWidget {
@@ -80,10 +81,16 @@ class _MemberDynamicsPageState extends State<MemberDynamicsPage> {
                           : const SliverToBoxAdapter(),
                     );
                   } else {
-                    return const SliverToBoxAdapter();
+                    return HttpError(
+                      errMsg: snapshot.data['msg'],
+                      fn: () {},
+                    );
                   }
                 } else {
-                  return const SliverToBoxAdapter();
+                  return HttpError(
+                    errMsg: snapshot.data['msg'],
+                    fn: () {},
+                  );
                 }
               } else {
                 return const SliverToBoxAdapter();

lib/pages/preview/view.dart

@@ -102,15 +102,12 @@ class _ImagePreviewState extends State<ImagePreview>
     );
   }
 
-  // 设置状态栏图标透明
+  // 隐藏状态栏，避免遮挡图片内容
   setStatusBar() async {
-    if (Platform.isIOS) {
+    if (Platform.isIOS || Platform.isAndroid) {
       await StatusBarControl.setHidden(true,
           animation: StatusBarAnimation.SLIDE);
     }
-    if (Platform.isAndroid) {
-      await StatusBarControl.setColor(Colors.transparent);
-    }
   }
 
   @override

lib/pages/rcmd/view.dart

@@ -44,7 +44,7 @@ class _RcmdPageState extends State<RcmdPage>
         if (scrollController.position.pixels >=
             scrollController.position.maxScrollExtent - 200) {
           EasyThrottle.throttle(
-              'my-throttler', const Duration(milliseconds: 500), () {
+              'my-throttler', const Duration(milliseconds: 200), () {
             _rcmdController.isLoadingMore = true;
             _rcmdController.onLoad();
           });
@@ -113,6 +113,7 @@ class _RcmdPageState extends State<RcmdPage>
                         errMsg: data['msg'],
                         fn: () {
                           setState(() {
+                            _rcmdController.isLoadingMore = true;
                             _futureBuilderFuture =
                                 _rcmdController.queryRcmdFeed('init');
                           });
@@ -125,7 +126,6 @@ class _RcmdPageState extends State<RcmdPage>
                 },
               ),
             ),
-            LoadingMore(ctr: _rcmdController),
           ],
         ),
       ),
@@ -188,33 +188,3 @@ class _RcmdPageState extends State<RcmdPage>
     );
   }
 }
-
-class LoadingMore extends StatelessWidget {
-  final dynamic ctr;
-  const LoadingMore({super.key, this.ctr});
-
-  @override
-  Widget build(BuildContext context) {
-    return SliverToBoxAdapter(
-      child: Container(
-        height: MediaQuery.of(context).padding.bottom + 80,
-        padding: EdgeInsets.only(bottom: MediaQuery.of(context).padding.bottom),
-        child: GestureDetector(
-          onTap: () {
-            if (ctr != null) {
-              ctr!.isLoadingMore = true;
-              ctr!.onLoad();
-            }
-          },
-          child: Center(
-            child: Text(
-              '点击加载更多 👇',
-              style: TextStyle(
-                  color: Theme.of(context).colorScheme.outline, fontSize: 13),
-            ),
-          ),
-        ),
-      ),
-    );
-  }
-}

lib/pages/search/view.dart

@@ -187,9 +187,13 @@ class _SearchPageState extends State<SearchPage> with RouteAware {
                         ),
                       );
                     } else {
-                      return HttpError(
+                      return CustomScrollView(
+                        slivers: [
+                          HttpError(
                             errMsg: data['msg'],
                             fn: () => setState(() {}),
+                          )
+                        ],
                       );
                     }
                   } else {

lib/pages/search_panel/view.dart

@@ -105,7 +105,11 @@ class _SearchPanelState extends State<SearchPanel>
                   slivers: [
                     HttpError(
                       errMsg: data['msg'],
-                      fn: () => setState(() {}),
+                      fn: () {
+                        setState(() {
+                          _searchPanelController.onSearch();
+                        });
+                      },
                     ),
                   ],
                 );
@@ -116,7 +120,11 @@ class _SearchPanelState extends State<SearchPanel>
                 slivers: [
                   HttpError(
                     errMsg: '没有相关数据',
-                    fn: () => setState(() {}),
+                    fn: () {
+                      setState(() {
+                        _searchPanelController.onSearch();
+                      });
+                    },
                   ),
                 ],
               );

lib/pages/search_panel/widgets/video_panel.dart

@@ -35,7 +35,7 @@ class SearchVideoPanel extends StatelessWidget {
                 padding: index == 0
                     ? const EdgeInsets.only(top: 2)
                     : EdgeInsets.zero,
-                child: VideoCardH(videoItem: i),
+                child: VideoCardH(videoItem: i, showPubdate: true),
               );
             },
           ),
@@ -70,7 +70,7 @@ class SearchVideoPanel extends StatelessWidget {
                               controller.selectedType.value = i['type'];
                               ctr!.order.value =
                                   i['type'].toString().split('.').last;
-                              SmartDialog.showLoading(msg: 'loooad');
+                              SmartDialog.showLoading(msg: 'loading');
                               await ctr!.onRefresh();
                               SmartDialog.dismiss();
                             },
@@ -202,7 +202,7 @@ class VideoPanelController extends GetxController {
                           Get.find<SearchPanelController>(
                               tag: 'video${searchPanelCtr.keyword!}');
                       ctr.duration.value = i['value'];
-                      SmartDialog.showLoading(msg: 'loooad');
+                      SmartDialog.showLoading(msg: 'loading');
                       await ctr.onRefresh();
                       SmartDialog.dismiss();
                     },

lib/pages/setting/style_setting.dart

@@ -102,6 +102,12 @@ class _StyleSettingState extends State<StyleSetting> {
             defaultVal: true,
             needReboot: true,
           ),
+          const SetSwitchItem(
+            title: '首页底栏背景渐变',
+            setKey: SettingBoxKey.enableGradientBg,
+            defaultVal: true,
+            needReboot: true,
+          ),
           ListTile(
             onTap: () async {
               int? result = await showDialog(

lib/pages/video/detail/controller.dart

@@ -90,6 +90,8 @@ class VideoDetailController extends GetxController
   late String cacheDecode;
   late int cacheAudioQa;
 
+  PersistentBottomSheetController? replyReplyBottomSheetCtr;
+
   @override
   void onInit() {
     super.onInit();
@@ -140,7 +142,7 @@ class VideoDetailController extends GetxController
   }
 
   showReplyReplyPanel() {
-    PersistentBottomSheetController? ctr =
+    replyReplyBottomSheetCtr =
         scaffoldKey.currentState?.showBottomSheet((BuildContext context) {
       return VideoReplyReplyPanel(
         oid: oid.value,
@@ -153,7 +155,7 @@ class VideoDetailController extends GetxController
         source: 'videoDetail',
       );
     });
-    ctr?.closed.then((value) {
+    replyReplyBottomSheetCtr?.closed.then((value) {
       fRpid = 0;
     });
   }
@@ -229,9 +231,11 @@ class VideoDetailController extends GetxController
       seekTo: seekToTime ?? defaultST,
       duration: duration ?? Duration(milliseconds: data.timeLength ?? 0),
       // 宽>高 水平 否则 垂直
-      direction: (firstVideo.width! - firstVideo.height!) > 0
+      direction: firstVideo.width != null && firstVideo.height != null
+          ? ((firstVideo.width! - firstVideo.height!) > 0
               ? 'horizontal'
-          : 'vertical',
+              : 'vertical')
+          : null,
       bvid: bvid,
       cid: cid.value,
       enableHeart: enableHeart,
@@ -248,6 +252,21 @@ class VideoDetailController extends GetxController
     var result = await VideoHttp.videoUrl(cid: cid.value, bvid: bvid);
     if (result['status']) {
       data = result['data'];
+      if (data.acceptDesc!.isNotEmpty && data.acceptDesc!.contains('试看')) {
+        SmartDialog.showToast(
+          '该视频为专属视频，仅提供试看',
+          displayTime: const Duration(seconds: 3),
+        );
+        videoUrl = data.durl!.first.url!;
+        audioUrl = '';
+        defaultST = Duration.zero;
+        firstVideo = VideoItem();
+        if (autoPlay.value) {
+          await playerInit();
+          isShowCover.value = false;
+        }
+        return result;
+      }
       final List<VideoItem> allVideosList = data.dash!.video!;
       try {
         // 当前可播放的最高质量视频
@@ -355,4 +374,11 @@ class VideoDetailController extends GetxController
     }
     return result;
   }
+
+  // mob端全屏状态关闭二级回复
+  hiddenReplyReplyPanel() {
+    replyReplyBottomSheetCtr != null
+        ? replyReplyBottomSheetCtr!.close()
+        : print('replyReplyBottomSheetCtr is null');
+  }
 }

lib/pages/video/detail/introduction/controller.dart

@@ -18,6 +18,7 @@ import 'package:pilipala/utils/id_utils.dart';
 import 'package:pilipala/utils/storage.dart';
 import 'package:share_plus/share_plus.dart';
 
+import '../related/index.dart';
 import 'widgets/group_panel.dart';
 
 class VideoIntroController extends GetxController {
@@ -304,11 +305,9 @@ class VideoIntroController extends GetxController {
         delIds: favStatus == 1 ? '$defaultFolderId' : '',
       );
       if (result['status']) {
-        if (result['data']['prompt']) {
         // 重新获取收藏状态
         await queryHasFavVideo();
         SmartDialog.showToast('✅ 操作成功');
-        }
       } else {
         SmartDialog.showToast(result['msg']);
       }
@@ -333,14 +332,12 @@ class VideoIntroController extends GetxController {
         delIds: delMediaIdsNew.join(','));
     SmartDialog.dismiss();
     if (result['status']) {
-      if (result['data']['prompt']) {
       addMediaIdsNew = [];
       delMediaIdsNew = [];
       Get.back();
       // 重新获取收藏状态
       await queryHasFavVideo();
       SmartDialog.showToast('✅ 操作成功');
-      }
     } else {
       SmartDialog.showToast(result['msg']);
     }
@@ -478,11 +475,15 @@ class VideoIntroController extends GetxController {
     // 重新获取视频资源
     final VideoDetailController videoDetailCtr =
         Get.find<VideoDetailController>(tag: heroTag);
+    final ReleatedController releatedCtr =
+        Get.find<ReleatedController>(tag: heroTag);
     videoDetailCtr.bvid = bvid;
-    videoDetailCtr.oid.value = aid;
+    videoDetailCtr.oid.value = aid ?? IdUtils.bv2av(bvid);
     videoDetailCtr.cid.value = cid;
     videoDetailCtr.danmakuCid.value = cid;
     videoDetailCtr.queryVideoUrl();
+    releatedCtr.bvid = bvid;
+    releatedCtr.queryRelatedVideo();
     // 重新请求评论
     try {
       /// 未渲染回复组件时可能异常

lib/pages/video/detail/related/controller.dart

@@ -1,14 +1,22 @@
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:pilipala/http/video.dart';
+import '../../../../models/model_hot_video_item.dart';
 
 class ReleatedController extends GetxController {
   // 视频aid
   String bvid = Get.parameters['bvid'] ?? "";
   // 推荐视频列表
-  List relatedVideoList = [];
+  RxList relatedVideoList = <HotVideoItemModel>[].obs;
 
   OverlayEntry? popupDialog;
 
-  Future<dynamic> queryRelatedVideo() => VideoHttp.relatedVideoList(bvid: bvid);
+  Future<dynamic> queryRelatedVideo() async {
+    return VideoHttp.relatedVideoList(bvid: bvid).then((value) {
+      if (value['status']) {
+        relatedVideoList.value = value['data'];
+      }
+      return value;
+    });
+  }
 }

lib/pages/video/detail/related/view.dart

@@ -7,35 +7,58 @@ import 'package:pilipala/common/widgets/overlay_pop.dart';
 import 'package:pilipala/common/widgets/video_card_h.dart';
 import './controller.dart';
 
-class RelatedVideoPanel extends StatelessWidget {
+class RelatedVideoPanel extends StatefulWidget {
-  final ReleatedController _releatedController =
+  const RelatedVideoPanel({super.key});
+
+  @override
+  State<RelatedVideoPanel> createState() => _RelatedVideoPanelState();
+}
+
+class _RelatedVideoPanelState extends State<RelatedVideoPanel>
+    with AutomaticKeepAliveClientMixin {
+  late ReleatedController _releatedController;
+  late Future _futureBuilder;
+
+  @override
+  bool get wantKeepAlive => true;
+
+  @override
+  void initState() {
+    super.initState();
+    _releatedController =
         Get.put(ReleatedController(), tag: Get.arguments?['heroTag']);
-  RelatedVideoPanel({super.key});
+    _futureBuilder = _releatedController.queryRelatedVideo();
+  }
 
   @override
   Widget build(BuildContext context) {
+    super.build(context);
     return FutureBuilder(
-      future: _releatedController.queryRelatedVideo(),
+      future: _futureBuilder,
       builder: (BuildContext context, AsyncSnapshot snapshot) {
         if (snapshot.connectionState == ConnectionState.done) {
           if (snapshot.data == null) {
             return const SliverToBoxAdapter(child: SizedBox());
           }
-          if (snapshot.data!['status']) {
+          if (snapshot.data!['status'] && snapshot.data != null) {
+            RxList relatedVideoList = _releatedController.relatedVideoList;
             // 请求成功
-            return SliverList(
+            return Obx(
+              () => SliverList(
                 delegate: SliverChildBuilderDelegate((context, index) {
-              if (index == snapshot.data['data'].length) {
+                  if (index == relatedVideoList.length) {
-                return SizedBox(height: MediaQuery.of(context).padding.bottom);
+                    return SizedBox(
+                        height: MediaQuery.of(context).padding.bottom);
                   } else {
                     return Material(
                       child: VideoCardH(
-                    videoItem: snapshot.data['data'][index],
+                        videoItem: relatedVideoList[index],
                         showPubdate: true,
                         longPress: () {
                           try {
                             _releatedController.popupDialog =
-                            _createPopupDialog(snapshot.data['data'][index]);
+                                _createPopupDialog(_releatedController
+                                    .relatedVideoList[index]);
                             Overlay.of(context)
                                 .insert(_releatedController.popupDialog!);
                           } catch (err) {
@@ -48,7 +71,9 @@ class RelatedVideoPanel extends StatelessWidget {
                       ),
                     );
                   }
-            }, childCount: snapshot.data['data'].length + 1));
+                }, childCount: relatedVideoList.length + 1),
+              ),
+            );
           } else {
             // 请求错误
             return HttpError(errMsg: '出错了', fn: () {});

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

@@ -1,5 +1,6 @@
 import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
 import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:get/get.dart';
 import 'package:hive/hive.dart';
@@ -11,6 +12,7 @@ import 'package:pilipala/pages/preview/index.dart';
 import 'package:pilipala/pages/video/detail/index.dart';
 import 'package:pilipala/pages/video/detail/reply_new/index.dart';
 import 'package:pilipala/utils/feed_back.dart';
+import 'package:pilipala/utils/id_utils.dart';
 import 'package:pilipala/utils/storage.dart';
 import 'package:pilipala/utils/url_utils.dart';
 import 'package:pilipala/utils/utils.dart';
@@ -46,6 +48,17 @@ class ReplyItem extends StatelessWidget {
             replyReply!(replyItem);
           }
         },
+        onLongPress: () {
+          feedBack();
+          showModalBottomSheet(
+            context: context,
+            useRootNavigator: true,
+            isScrollControlled: true,
+            builder: (context) {
+              return MorePanel(item: replyItem);
+            },
+          );
+        },
         child: Column(
           children: [
             Padding(
@@ -121,98 +134,6 @@ class ReplyItem extends StatelessWidget {
     return Column(
       crossAxisAlignment: CrossAxisAlignment.start,
       children: <Widget>[
-        // 头像、昵称
-        // SizedBox(
-        //   width: double.infinity,
-        //   child: Stack(
-        //     children: [
-        //       GestureDetector(
-        //         behavior: HitTestBehavior.opaque,
-        //         onTap: () {
-        //           feedBack();
-        //           Get.toNamed('/member?mid=${replyItem!.mid}', arguments: {
-        //             'face': replyItem!.member!.avatar!,
-        //             'heroTag': heroTag
-        //           });
-        //         },
-        //         child: Row(
-        //           crossAxisAlignment: CrossAxisAlignment.center,
-        //           mainAxisSize: MainAxisSize.min,
-        //           children: <Widget>[
-        //             lfAvtar(context, heroTag),
-        //             const SizedBox(width: 12),
-        //             Text(
-        //               replyItem!.member!.uname!,
-        //               style: TextStyle(
-        //                 color: replyItem!.member!.vip!['vipStatus'] > 0
-        //                     ? const Color.fromARGB(255, 251, 100, 163)
-        //                     : Theme.of(context).colorScheme.outline,
-        //                 fontSize: 13,
-        //               ),
-        //             ),
-        //             const SizedBox(width: 6),
-        //             Image.asset(
-        //               'assets/images/lv/lv${replyItem!.member!.level}.png',
-        //               height: 11,
-        //             ),
-        //             const SizedBox(width: 6),
-        //             if (replyItem!.isUp!)
-        //               const PBadge(
-        //                 text: 'UP',
-        //                 size: 'small',
-        //                 stack: 'normal',
-        //                 fs: 9,
-        //               ),
-        //           ],
-        //         ),
-        //       ),
-        //       Positioned(
-        //         top: 0,
-        //         left: 0,
-        //         right: 0,
-        //         child: Container(
-        //           width: double.infinity,
-        //           height: 45,
-        //           decoration: BoxDecoration(
-        //             image: replyItem!.member!.userSailing!.cardbg != null
-        //                 ? DecorationImage(
-        //                     alignment: Alignment.centerRight,
-        //                     fit: BoxFit.fitHeight,
-        //                     image: NetworkImage(
-        //                       replyItem!.member!.userSailing!.cardbg!['image'],
-        //                     ),
-        //                   )
-        //                 : null,
-        //           ),
-        //         ),
-        //       ),
-        //       if (replyItem!.member!.userSailing!.cardbg != null &&
-        //           replyItem!.member!.userSailing!.cardbg!['fan']['number'] > 0)
-        //         Positioned(
-        //           top: 10,
-        //           left: Get.size.width / 7 * 5.8,
-        //           child: DefaultTextStyle(
-        //             style: TextStyle(
-        //               fontFamily: 'fansCard',
-        //               fontSize: 9,
-        //               color: Theme.of(context).colorScheme.primary,
-        //             ),
-        //             child: Column(
-        //               crossAxisAlignment: CrossAxisAlignment.start,
-        //               mainAxisAlignment: MainAxisAlignment.center,
-        //               children: [
-        //                 const Text('NO.'),
-        //                 Text(
-        //                   replyItem!.member!.userSailing!.cardbg!['fan']
-        //                       ['num_desc'],
-        //                 ),
-        //               ],
-        //             ),
-        //           ),
-        //         ),
-        //     ],
-        //   ),
-        // ),
         /// fix Stack内GestureDetector  onTap无效
         GestureDetector(
           behavior: HitTestBehavior.opaque,
@@ -289,9 +210,6 @@ class ReplyItem extends StatelessWidget {
         // title
         Container(
           margin: const EdgeInsets.only(top: 10, left: 45, right: 6, bottom: 4),
-          child: SelectableRegion(
-            focusNode: FocusNode(),
-            selectionControls: MaterialTextSelectionControls(),
           child: Text.rich(
             style: const TextStyle(height: 1.75),
             maxLines:
@@ -315,7 +233,6 @@ class ReplyItem extends StatelessWidget {
             ),
           ),
         ),
-        ),
         // 操作区域
         bottonAction(context, replyItem!.replyControl),
         // 一楼的评论
@@ -445,6 +362,17 @@ class ReplyItemRow extends StatelessWidget {
                 InkWell(
                   // 一楼点击评论展开评论详情
                   onTap: () => replyReply!(replyItem),
+                  onLongPress: () {
+                    feedBack();
+                    showModalBottomSheet(
+                      context: context,
+                      useRootNavigator: true,
+                      isScrollControlled: true,
+                      builder: (context) {
+                        return MorePanel(item: replies![i]);
+                      },
+                    );
+                  },
                   child: Container(
                     width: double.infinity,
                     padding: EdgeInsets.fromLTRB(
@@ -636,8 +564,8 @@ InlineSpan buildContent(
               },
           ),
         );
-
+      } else if (RegExp(r'^\b(?:\d+[:：])?[0-5]?[0-9][:：][0-5]?[0-9]\b$')
-      } else if (RegExp(r'^\b(?:\d+[:：])?[0-5]?[0-9][:：][0-5]?[0-9]\b$').hasMatch(matchStr)) {
+          .hasMatch(matchStr)) {
         matchStr = matchStr.replaceAll('：', ':');
         spanChilds.add(
           TextSpan(
@@ -693,6 +621,13 @@ InlineSpan buildContent(
                   ..onTap = () async {
                     final String title = content.jumpUrl[matchStr]['title'];
                     if (appUrlSchema == '') {
+                      if (matchStr.startsWith('BV')) {
+                        UrlUtils.matchUrlPush(
+                          matchStr,
+                          title,
+                          '',
+                        );
+                      } else {
                         final String redirectUrl =
                             await UrlUtils.parseRedirectUrl(matchStr);
                         final String pathSegment = Uri.parse(redirectUrl).path;
@@ -714,6 +649,7 @@ InlineSpan buildContent(
                             },
                           );
                         }
+                      }
                     } else {
                       if (appUrlSchema.startsWith('bilibili://search')) {
                         Get.toNamed('/searchResult',
@@ -955,3 +891,100 @@ InlineSpan buildContent(
   // spanChilds.add(TextSpan(text: matchMember));
   return TextSpan(children: spanChilds);
 }
+
+class MorePanel extends StatelessWidget {
+  final dynamic item;
+  const MorePanel({super.key, required this.item});
+
+  Future<dynamic> menuActionHandler(String type) async {
+    String message = item.content.message ?? item.content;
+    switch (type) {
+      case 'copyAll':
+        await Clipboard.setData(ClipboardData(text: message));
+        SmartDialog.showToast('已复制');
+        Get.back();
+        break;
+      case 'copyFreedom':
+        Get.back();
+        showDialog(
+          context: Get.context!,
+          builder: (context) {
+            return AlertDialog(
+              title: const Text('自由复制'),
+              content: SelectableText(message),
+            );
+          },
+        );
+        break;
+      // case 'block':
+      //   SmartDialog.showToast('加入黑名单');
+      //   break;
+      // case 'report':
+      //   SmartDialog.showToast('举报');
+      //   break;
+      // case 'delete':
+      //   SmartDialog.showToast('删除');
+      //   break;
+      default:
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    Color errorColor = Theme.of(context).colorScheme.error;
+    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))),
+                ),
+              ),
+            ),
+          ),
+          ListTile(
+            onTap: () async => await menuActionHandler('copyAll'),
+            minLeadingWidth: 0,
+            leading: const Icon(Icons.copy_all_outlined, size: 19),
+            title: Text('复制全部', style: Theme.of(context).textTheme.titleSmall),
+          ),
+          ListTile(
+            onTap: () async => await menuActionHandler('copyFreedom'),
+            minLeadingWidth: 0,
+            leading: const Icon(Icons.copy_outlined, size: 19),
+            title: Text('自由复制', style: Theme.of(context).textTheme.titleSmall),
+          ),
+          // ListTile(
+          //   onTap: () async => await menuActionHandler('block'),
+          //   minLeadingWidth: 0,
+          //   leading: Icon(Icons.block_outlined, color: errorColor),
+          //   title: Text('加入黑名单', style: TextStyle(color: errorColor)),
+          // ),
+          // ListTile(
+          //   onTap: () async => await menuActionHandler('report'),
+          //   minLeadingWidth: 0,
+          //   leading: Icon(Icons.report_outlined, color: errorColor),
+          //   title: Text('举报', style: TextStyle(color: errorColor)),
+          // ),
+          // ListTile(
+          //   onTap: () async => await menuActionHandler('del'),
+          //   minLeadingWidth: 0,
+          //   leading: Icon(Icons.delete_outline, color: errorColor),
+          //   title: Text('删除', style: TextStyle(color: errorColor)),
+          // ),
+        ],
+      ),
+    );
+  }
+}

lib/pages/video/detail/view.dart

@@ -92,6 +92,7 @@ class _VideoDetailPageState extends State<VideoDetailPage>
     videoSourceInit();
     appbarStreamListen();
     lifecycleListener();
+    fullScreenStatusListener();
   }
 
   // 获取视频资源，初始化播放器
@@ -188,6 +189,14 @@ class _VideoDetailPageState extends State<VideoDetailPage>
     );
   }
 
+  void fullScreenStatusListener() {
+    plPlayerController?.isFullScreen.listen((bool isFullScreen) {
+      if (isFullScreen) {
+        videoDetailController.hiddenReplyReplyPanel();
+      }
+    });
+  }
+
   @override
   void dispose() {
     shutdownTimerService.handleWaitingFinished();
@@ -225,7 +234,10 @@ class _VideoDetailPageState extends State<VideoDetailPage>
   @override
   // 返回当前页面时
   void didPopNext() async {
+    if (plPlayerController != null &&
+        plPlayerController!.videoPlayerController != null) {
       setState(() => isShowing = true);
+    }
     videoDetailController.isFirstTime = false;
     final bool autoplay = autoPlayEnable;
     videoDetailController.playerInit(autoplay: autoplay);

lib/pages/video/detail/widgets/header_control.dart

@@ -438,7 +438,7 @@ class _HeaderControlState extends State<HeaderControl> {
           }),
           actions: <Widget>[
             TextButton(
-              onPressed: () => SmartDialog.dismiss(),
+              onPressed: () => Get.back(),
               child: Text(
                 '取消',
                 style: TextStyle(color: Theme.of(context).colorScheme.outline),

lib/services/audio_session.dart

@@ -20,11 +20,15 @@ class AudioSessionHandler {
     session.interruptionEventStream.listen((event) {
       final player = PlPlayerController.getInstance();
       if (event.begin) {
+        if (player.playerStatus != PlayerStatus.playing) return;
         switch (event.type) {
           case AudioInterruptionType.duck:
             player.setVolume(player.volume.value * 0.5);
             break;
           case AudioInterruptionType.pause:
+            player.pause(isInterrupt: true);
+            _playInterrupted = true;
+            break;
           case AudioInterruptionType.unknown:
             player.pause(isInterrupt: true);
             _playInterrupted = true;
@@ -36,7 +40,7 @@ class AudioSessionHandler {
             player.setVolume(player.volume.value * 2);
             break;
           case AudioInterruptionType.pause:
-            if (_playInterrupted) PlPlayerController.getInstance().play();
+            if (_playInterrupted) player.play();
             break;
           case AudioInterruptionType.unknown:
             break;
@@ -47,7 +51,10 @@ class AudioSessionHandler {
 
     // 耳机拔出暂停
     session.becomingNoisyEventStream.listen((_) {
-      PlPlayerController.getInstance().pause();
+      final player = PlPlayerController.getInstance();
+      if (player.playerStatus == PlayerStatus.playing) {
+        player.pause();
+      }
     });
   }
 }

lib/utils/storage.dart

@@ -135,7 +135,8 @@ class SettingBoxKey {
       hideSearchBar = 'hideSearchBar', // 收起顶栏
       hideTabBar = 'hideTabBar', // 收起底栏
       tabbarSort = 'tabbarSort', // 首页tabbar
-      dynamicBadgeMode = 'dynamicBadgeMode';
+      dynamicBadgeMode = 'dynamicBadgeMode',
+      enableGradientBg = 'enableGradientBg';
 }
 
 class LocalCacheKey {

lib/utils/utils.dart

@@ -63,6 +63,26 @@ class Utils {
     }
   }
 
+  // 完全相对时间显示
+  static String formatTimestampToRelativeTime(timeStamp) {
+    var difference = DateTime.now()
+        .difference(DateTime.fromMillisecondsSinceEpoch(timeStamp * 1000));
+
+    if (difference.inDays > 365) {
+      return '${difference.inDays ~/ 365}年前';
+    } else if (difference.inDays > 30) {
+      return '${difference.inDays ~/ 30}个月前';
+    } else if (difference.inDays > 0) {
+      return '${difference.inDays}天前';
+    } else if (difference.inHours > 0) {
+      return '${difference.inHours}小时前';
+    } else if (difference.inMinutes > 0) {
+      return '${difference.inMinutes}分钟前';
+    } else {
+      return '刚刚';
+    }
+  }
+
   // 时间显示，刚刚，x分钟前
   static String dateFormat(timeStamp, {formatType = 'list'}) {
     // 当前时间