Merge branch 'main' into fix-pip

lib/main.dart

@@ -34,7 +34,6 @@ void main() async {
       .then((_) async {
     await GStrorage.init();
     await setupServiceLocator();
-    clearLogs();
     Request();
     await Request.setCookie();
     RecommendFilter();

lib/models/member/info.dart

@@ -47,23 +47,18 @@ class Vip {
     this.status,
     this.dueDate,
     this.label,
-    this.nicknameColor,
   });
 
   int? type;
   int? status;
   int? dueDate;
   Map? label;
-  int? nicknameColor;
 
   Vip.fromJson(Map<String, dynamic> json) {
     type = json['type'];
     status = json['status'];
     dueDate = json['due_date'];
     label = json['label'];
-    nicknameColor = json['nickname_color'] == ''
-        ? null
-        : int.parse("0xFF${json['nickname_color'].replaceAll('#', '')}");
   }
 }
 

lib/pages/danmaku/view.dart

@@ -55,7 +55,13 @@ class _PlDanmakuState extends State<PlDanmaku> {
         ..addStatusLister(playerListener)
         ..addPositionListener(videoPositionListen);
     }
-    danmakuStatusListen();
+    playerController.isOpenDanmu.listen((p0) {
+      if (p0 && !_plDanmakuController.initiated) {
+        _plDanmakuController.initiate(
+            playerController.duration.value.inMilliseconds,
+            playerController.position.value.inMilliseconds);
+      }
+    });
     blockTypes = playerController.blockTypes;
     showArea = playerController.showArea;
     opacityVal = playerController.opacityVal;
@@ -105,20 +111,6 @@ class _PlDanmakuState extends State<PlDanmaku> {
     }
   }
 
-  // 弹幕开关状态监听
-  void danmakuStatusListen() {
-    playerController.isOpenDanmu.listen((p0) {
-      if (p0 && !_plDanmakuController.initiated) {
-        _plDanmakuController.initiate(
-            playerController.duration.value.inMilliseconds,
-            playerController.position.value.inMilliseconds);
-      } else {
-        playerController.danmakuController!.pause();
-        playerController.danmakuController!.clear();
-      }
-    });
-  }
-
   @override
   void dispose() {
     playerController.removePositionListener(videoPositionListen);
@@ -130,23 +122,28 @@ class _PlDanmakuState extends State<PlDanmaku> {
     return LayoutBuilder(builder: (context, box) {
       // double initDuration = box.maxWidth / 12;
       return Obx(
-        () => DanmakuView(
+        () => AnimatedOpacity(
-          createdController: (DanmakuController e) async {
+          opacity: playerController.isOpenDanmu.value ? 1 : 0,
-            playerController.danmakuController = _controller = e;
+          duration: const Duration(milliseconds: 100),
-          },
+          child: DanmakuView(
-          option: DanmakuOption(
+            createdController: (DanmakuController e) async {
-            fontSize: 15 * fontSizeVal,
+              playerController.danmakuController = _controller = e;
-            area: showArea,
+            },
-            opacity: opacityVal,
+            option: DanmakuOption(
-            hideTop: blockTypes.contains(5),
+              fontSize: 15 * fontSizeVal,
-            hideScroll: blockTypes.contains(2),
+              area: showArea,
-            hideBottom: blockTypes.contains(4),
+              opacity: opacityVal,
-            duration: danmakuDurationVal / playerController.playbackSpeed,
+              hideTop: blockTypes.contains(5),
-            strokeWidth: strokeWidth,
+              hideScroll: blockTypes.contains(2),
-            // initDuration /
+              hideBottom: blockTypes.contains(4),
-            //     (danmakuSpeedVal * widget.playerController.playbackSpeed),
+              duration:
+                  danmakuDurationVal / playerController.playbackSpeed,
+              strokeWidth: strokeWidth,
+              // initDuration /
+              //     (danmakuSpeedVal * widget.playerController.playbackSpeed),
+            ),
+            statusChanged: (isPlaying) {},
           ),
-          statusChanged: (isPlaying) {},
         ),
       );
     });

lib/pages/member/view.dart

@@ -281,8 +281,8 @@ class _MemberPageState extends State<MemberPage>
         future: _futureBuilderFuture,
         builder: (context, snapshot) {
           if (snapshot.connectionState == ConnectionState.done) {
-            Map? data = snapshot.data;
+            Map data = snapshot.data!;
-            if (data != null && data['status']) {
+            if (data['status']) {
               return Obx(
                 () => Stack(
                   alignment: AlignmentDirectional.center,
@@ -302,14 +302,7 @@ class _MemberPageState extends State<MemberPage>
                               style: Theme.of(context)
                                   .textTheme
                                   .titleMedium!
-                                  .copyWith(
+                                  .copyWith(fontWeight: FontWeight.bold),
-                                      fontWeight: FontWeight.bold,
-                                      color: _memberController.memberInfo.value
-                                                  .vip!.nicknameColor !=
-                                              null
-                                          ? Color(_memberController.memberInfo
-                                              .value.vip!.nicknameColor!)
-                                          : null),
                             )),
                             const SizedBox(width: 2),
                             if (_memberController.memberInfo.value.sex == '女')

lib/pages/member/widgets/seasons.dart

@@ -18,32 +18,45 @@ class MemberSeasonsPanel extends StatelessWidget {
       itemBuilder: (context, index) {
         MemberSeasonsList item = data!.seasonsList![index];
         return Padding(
-          padding: const EdgeInsets.only(bottom: 12),
+          padding: const EdgeInsets.only(bottom: 12, right: 4),
           child: Column(
             mainAxisAlignment: MainAxisAlignment.start,
             crossAxisAlignment: CrossAxisAlignment.start,
             children: [
-              ListTile(
+              Padding(
-                onTap: () => Get.toNamed(
+                padding: const EdgeInsets.only(bottom: 12, left: 4),
-                    '/memberSeasons?mid=${item.meta!.mid}&seasonId=${item.meta!.seasonId}'),
+                child: Row(
-                title: Text(
+                  children: [
-                  item.meta!.name!,
+                    Text(
-                  maxLines: 1,
+                      item.meta!.name!,
-                  overflow: TextOverflow.ellipsis,
+                      maxLines: 1,
-                  style: Theme.of(context).textTheme.titleSmall!,
+                      style: Theme.of(context).textTheme.titleSmall!,
-                ),
+                    ),
-                dense: true,
+                    const SizedBox(width: 10),
-                leading: PBadge(
+                    PBadge(
-                  stack: 'relative',
+                      stack: 'relative',
-                  size: 'small',
+                      size: 'small',
-                  text: item.meta!.total.toString(),
+                      text: item.meta!.total.toString(),
-                ),
+                    ),
-                trailing: const Icon(
+                    const Spacer(),
-                  Icons.arrow_forward,
+                    SizedBox(
-                  size: 20,
+                      width: 35,
+                      height: 35,
+                      child: IconButton(
+                        onPressed: () => Get.toNamed(
+                            '/memberSeasons?mid=${item.meta!.mid}&seasonId=${item.meta!.seasonId}'),
+                        style: ButtonStyle(
+                          padding: MaterialStateProperty.all(EdgeInsets.zero),
+                        ),
+                        icon: const Icon(
+                          Icons.arrow_forward,
+                          size: 20,
+                        ),
+                      ),
+                    )
+                  ],
                 ),
               ),
-              const SizedBox(height: 10),
               LayoutBuilder(
                 builder: (context, boxConstraints) {
                   return GridView.builder(

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

@@ -525,18 +525,14 @@ InlineSpan buildContent(
   if (jumpUrlKeysList.isNotEmpty) {
     patternStr += '|${jumpUrlKeysList.join('|')}';
   }
-  RegExp bv23Regex = RegExp(r'https://b23\.tv/[a-zA-Z0-9]{7}');
   final RegExp pattern = RegExp(patternStr);
   List<String> matchedStrs = [];
   void addPlainTextSpan(str) {
-    spanChilds.add(
+    spanChilds.add(TextSpan(
-      TextSpan(
         text: str,
         recognizer: TapGestureRecognizer()
           ..onTap = () =>
-              replyReply?.call(replyItem.root == 0 ? replyItem : fReplyItem),
+              replyReply?.call(replyItem.root == 0 ? replyItem : fReplyItem)));
-      ),
-    );
   }
 
   // 分割文本并处理每个部分
@@ -738,36 +734,8 @@ InlineSpan buildContent(
       return '';
     },
     onNonMatch: (String nonMatchStr) {
-      return nonMatchStr.splitMapJoin(
+      addPlainTextSpan(nonMatchStr);
-        bv23Regex,
+      return nonMatchStr;
-        onMatch: (Match match) {
-          String matchStr = match[0]!;
-          spanChilds.add(
-            TextSpan(
-              text: ' $matchStr ',
-              style: isVideoPage
-                  ? TextStyle(
-                      color: Theme.of(context).colorScheme.primary,
-                    )
-                  : null,
-              recognizer: TapGestureRecognizer()
-                ..onTap = () => Get.toNamed(
-                      '/webview',
-                      parameters: {
-                        'url': matchStr,
-                        'type': 'url',
-                        'pageTitle': matchStr
-                      },
-                    ),
-            ),
-          );
-          return '';
-        },
-        onNonMatch: (String nonMatchOtherStr) {
-          addPlainTextSpan(nonMatchOtherStr);
-          return nonMatchOtherStr;
-        },
-      );
     },
   );
 

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

@@ -142,10 +142,9 @@ class _VideoReplyNewDialogState extends State<VideoReplyNewDialog>
 
   @override
   Widget build(BuildContext context) {
-    double _keyboardHeight = EdgeInsets.fromViewPadding(
+    double keyboardHeight = EdgeInsets.fromViewPadding(
             View.of(context).viewInsets, View.of(context).devicePixelRatio)
         .bottom;
-    print('_keyboardHeight: $_keyboardHeight');
     return Container(
       clipBehavior: Clip.hardEdge,
       decoration: BoxDecoration(
@@ -236,11 +235,7 @@ class _VideoReplyNewDialogState extends State<VideoReplyNewDialog>
             duration: const Duration(milliseconds: 300),
             child: SizedBox(
               width: double.infinity,
-              height: toolbarType == 'input'
+              height: toolbarType == 'input' ? keyboardHeight : emoteHeight,
-                  ? (_keyboardHeight > keyboardHeight
-                      ? _keyboardHeight
-                      : keyboardHeight)
-                  : emoteHeight,
               child: EmotePanel(
                 onChoose: (package, emote) => onChooseEmote(package, emote),
               ),

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

@@ -17,7 +17,6 @@ import 'package:pilipala/plugin/pl_player/index.dart';
 import 'package:pilipala/plugin/pl_player/models/play_repeat.dart';
 import 'package:pilipala/utils/storage.dart';
 import 'package:pilipala/services/shutdown_timer_service.dart';
-import '../../../../http/danmaku.dart';
 import '../../../../models/common/search_type.dart';
 import '../../../../models/video_detail_res.dart';
 import '../introduction/index.dart';
@@ -53,7 +52,7 @@ class _HeaderControlState extends State<HeaderControl> {
   final Box<dynamic> videoStorage = GStrorage.video;
   late List<double> speedsList;
   double buttonSpace = 8;
-  RxBool isFullScreen = false.obs;
+  bool showTitle = false;
   late String heroTag;
   late VideoIntroController videoIntroController;
   late VideoDetailData videoDetail;
@@ -70,8 +69,13 @@ class _HeaderControlState extends State<HeaderControl> {
   }
 
   void fullScreenStatusListener() {
-    widget.videoDetailCtr!.plPlayerController.isFullScreen.listen((bool val) {
+    widget.videoDetailCtr!.plPlayerController.isFullScreen
-      isFullScreen.value = val;
+        .listen((bool isFullScreen) {
+      if (isFullScreen) {
+        showTitle = true;
+      } else {
+        showTitle = false;
+      }
 
       /// TODO setState() called after dispose()
       if (mounted) {
@@ -214,87 +218,6 @@ class _HeaderControlState extends State<HeaderControl> {
     );
   }
 
-  /// 发送弹幕
-  void showShootDanmakuSheet() {
-    final TextEditingController textController = TextEditingController();
-    bool isSending = false; // 追踪是否正在发送
-    showDialog(
-      context: Get.context!,
-      builder: (BuildContext context) {
-        // TODO: 支持更多类型和颜色的弹幕
-        return AlertDialog(
-          title: const Text('发送弹幕（测试）'),
-          content: StatefulBuilder(
-              builder: (BuildContext context, StateSetter setState) {
-            return TextField(
-              controller: textController,
-            );
-          }),
-          actions: [
-            TextButton(
-              onPressed: () => Get.back(),
-              child: Text(
-                '取消',
-                style: TextStyle(color: Theme.of(context).colorScheme.outline),
-              ),
-            ),
-            StatefulBuilder(
-                builder: (BuildContext context, StateSetter setState) {
-              return TextButton(
-                onPressed: isSending
-                    ? null
-                    : () async {
-                        final String msg = textController.text;
-                        if (msg.isEmpty) {
-                          SmartDialog.showToast('弹幕内容不能为空');
-                          return;
-                        } else if (msg.length > 100) {
-                          SmartDialog.showToast('弹幕内容不能超过100个字符');
-                          return;
-                        }
-                        setState(() {
-                          isSending = true; // 开始发送，更新状态
-                        });
-                        //修改按钮文字
-                        final dynamic res = await DanmakaHttp.shootDanmaku(
-                          oid: widget.videoDetailCtr!.cid.value,
-                          msg: textController.text,
-                          bvid: widget.videoDetailCtr!.bvid,
-                          progress:
-                              widget.controller!.position.value.inMilliseconds,
-                          type: 1,
-                        );
-                        setState(() {
-                          isSending = false; // 发送结束，更新状态
-                        });
-                        if (res['status']) {
-                          SmartDialog.showToast('发送成功');
-                          // 发送成功，自动预览该弹幕，避免重新请求
-                          // TODO: 暂停状态下预览弹幕仍会移动与计时，可考虑添加到dmSegList或其他方式实现
-                          widget.controller!.danmakuController!.addItems([
-                            DanmakuItem(
-                              msg,
-                              color: Colors.white,
-                              time: widget
-                                  .controller!.position.value.inMilliseconds,
-                              type: DanmakuItemType.scroll,
-                              isSend: true,
-                            )
-                          ]);
-                          Get.back();
-                        } else {
-                          SmartDialog.showToast('发送失败，错误信息为${res['msg']}');
-                        }
-                      },
-                child: Text(isSending ? '发送中...' : '发送'),
-              );
-            })
-          ],
-        );
-      },
-    );
-  }
-
   /// 定时关闭
   void scheduleExit() async {
     const List<int> scheduleTimeChoices = [
@@ -1156,7 +1079,7 @@ class _HeaderControlState extends State<HeaderControl> {
             },
           ),
           SizedBox(width: buttonSpace),
-          if (isFullScreen.value &&
+          if (showTitle &&
               isLandscape &&
               widget.videoType == SearchType.video) ...[
             Column(
@@ -1208,43 +1131,6 @@ class _HeaderControlState extends State<HeaderControl> {
           //   ),
           //   fuc: () => _.screenshot(),
           // ),
-          if (isFullScreen.value) ...[
-            SizedBox(
-              width: 56,
-              height: 34,
-              child: TextButton(
-                style: ButtonStyle(
-                  padding: MaterialStateProperty.all(EdgeInsets.zero),
-                ),
-                onPressed: () => showShootDanmakuSheet(),
-                child: const Text(
-                  '发弹幕',
-                  style: textStyle,
-                ),
-              ),
-            ),
-            SizedBox(
-              width: 34,
-              height: 34,
-              child: Obx(
-                () => IconButton(
-                  style: ButtonStyle(
-                    padding: MaterialStateProperty.all(EdgeInsets.zero),
-                  ),
-                  onPressed: () {
-                    _.isOpenDanmu.value = !_.isOpenDanmu.value;
-                  },
-                  icon: Icon(
-                    _.isOpenDanmu.value
-                        ? Icons.subtitles_outlined
-                        : Icons.subtitles_off_outlined,
-                    size: 19,
-                    color: Colors.white,
-                  ),
-                ),
-              ),
-            ),
-          ],
           SizedBox(width: buttonSpace),
           if (Platform.isAndroid) ...<Widget>[
             SizedBox(

lib/utils/utils.dart

@@ -51,7 +51,7 @@ class Utils {
     }
     if (time < 3600) {
       if (time == 0) {
-        return '00:00';
+        return time;
       }
       final int minute = time ~/ 60;
       final double res = time / 60;
@@ -208,16 +208,14 @@ class Utils {
 
   static int findClosestNumber(int target, List<int> numbers) {
     int minDiff = 127;
-    int closestNumber = 0; // 初始化为0，表示没有找到比目标值小的整数
+    late int closestNumber;
     try {
       for (int number in numbers) {
-        if (number < target) {
+        int diff = (number - target).abs();
-          int diff = target - number; // 计算目标值与当前整数的差值
 
-          if (diff < minDiff) {
+        if (diff < minDiff) {
-            minDiff = diff;
+          minDiff = diff;
-            closestNumber = number;
+          closestNumber = number;
-          }
         }
       }
     } catch (_) {}