Merge branch 'main' of github.com:guozhigq/pilipala

lib/pages/danmaku/view.dart

@@ -35,6 +35,7 @@ class _PlDanmakuState extends State<PlDanmaku> {
   late double opacityVal;
   late double fontSizeVal;
   late double danmakuDurationVal;
+  late double strokeWidth;
   int latestAddedPosition = -1;
 
   @override
@@ -65,6 +66,7 @@ class _PlDanmakuState extends State<PlDanmaku> {
     showArea = playerController.showArea;
     opacityVal = playerController.opacityVal;
     fontSizeVal = playerController.fontSizeVal;
+    strokeWidth = playerController.strokeWidth;
     danmakuDurationVal = playerController.danmakuDurationVal;
   }
 
@@ -136,6 +138,7 @@ class _PlDanmakuState extends State<PlDanmaku> {
               hideBottom: blockTypes.contains(4),
               duration:
                   danmakuDurationVal / playerController.playbackSpeed,
+              strokeWidth: strokeWidth,
               // initDuration /
               //     (danmakuSpeedVal * widget.playerController.playbackSpeed),
             ),

lib/pages/dynamics/widgets/content_panel.dart

@@ -1,5 +1,6 @@
 // 内容
 import 'package:flutter/material.dart';
+import 'package:get/get.dart';
 import 'package:pilipala/common/widgets/badge.dart';
 import 'package:pilipala/common/widgets/network_img_layer.dart';
 import 'package:pilipala/models/dynamics/result.dart';
@@ -80,7 +81,7 @@ class _ContentState extends State<Content> {
                             height: height,
                           ),
                         ),
-                        height > maxHeight
+                        height > Get.size.height * 0.9
                             ? const PBadge(
                                 text: '长图',
                                 right: 8,

lib/pages/dynamics/widgets/pic_panel.dart

@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:get/get.dart';
 import 'package:pilipala/common/constants.dart';
 import 'package:pilipala/common/widgets/badge.dart';
 import 'package:pilipala/common/widgets/network_img_layer.dart';
@@ -87,7 +88,7 @@ Widget picWidget(item, context) {
               childAspectRatio: aspectRatio,
               children: list,
             ),
-            if (len == 1 && origAspectRatio < 0.4)
+            if (len == 1 && height > Get.size.height * 0.9)
               const PBadge(
                 text: '长图',
                 top: null,

lib/pages/rcmd/controller.dart

@@ -13,7 +13,6 @@ class RcmdController extends GetxController {
   RxList<RecVideoItemModel> webVideoList = <RecVideoItemModel>[].obs;
   bool isLoadingMore = true;
   OverlayEntry? popupDialog;
-  Box recVideo = GStrorage.recVideo;
   Box setting = GStrorage.setting;
   RxInt crossAxisCount = 2.obs;
   late bool enableSaveLastData;
@@ -24,15 +23,6 @@ class RcmdController extends GetxController {
     super.onInit();
     crossAxisCount.value =
         setting.get(SettingBoxKey.customRows, defaultValue: 2);
-    // 读取app端缓存内容
-    // if (recVideo.get('cacheList') != null &&
-    //     recVideo.get('cacheList').isNotEmpty) {
-    //   List<RecVideoItemAppModel> list = [];
-    //   for (var i in recVideo.get('cacheList')) {
-    //     list.add(i);
-    //   }
-    //   videoList.value = list;
-    // }
     enableSaveLastData =
         setting.get(SettingBoxKey.enableSaveLastData, defaultValue: false);
     defaultRcmdType =
@@ -77,7 +67,6 @@ class RcmdController extends GetxController {
       } else if (type == 'onLoad') {
         appVideoList.addAll(res['data']);
       }
-      recVideo.put('cacheList', res['data']);
       _currentPage += 1;
     }
     isLoadingMore = false;

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

@@ -880,7 +880,7 @@ InlineSpan buildContent(
                           height: height,
                         ),
                       ),
-                      height > maxHeight
+                      height > Get.size.height * 0.9
                           ? const PBadge(
                               text: '长图',
                               right: 8,

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

@@ -1,4 +1,5 @@
 import 'dart:io';
+import 'dart:math';
 
 import 'package:floating/floating.dart';
 import 'package:flutter/material.dart';
@@ -724,6 +725,8 @@ class _HeaderControlState extends State<HeaderControl> {
     double fontSizeVal = widget.controller!.fontSizeVal;
     // 弹幕速度
     double danmakuDurationVal = widget.controller!.danmakuDurationVal;
+    // 弹幕描边
+    double strokeWidth = widget.controller!.strokeWidth;
 
     final DanmakuController danmakuController =
         widget.controller!.danmakuController!;
@@ -857,6 +860,44 @@ class _HeaderControlState extends State<HeaderControl> {
                       ),
                     ),
                   ),
+                  Text('描边粗细 $strokeWidth'),
+                  Padding(
+                    padding: const EdgeInsets.only(
+                      top: 0,
+                      bottom: 6,
+                      left: 10,
+                      right: 10,
+                    ),
+                    child: SliderTheme(
+                      data: SliderThemeData(
+                        trackShape: MSliderTrackShape(),
+                        thumbColor: Theme.of(context).colorScheme.primary,
+                        activeTrackColor: Theme.of(context).colorScheme.primary,
+                        trackHeight: 10,
+                        thumbShape: const RoundSliderThumbShape(
+                            enabledThumbRadius: 6.0),
+                      ),
+                      child: Slider(
+                        min: 0,
+                        max: 3,
+                        value: strokeWidth,
+                        divisions: 6,
+                        label: '$strokeWidth',
+                        onChanged: (double val) {
+                          strokeWidth = val;
+                          widget.controller!.strokeWidth = val;
+                          setState(() {});
+                          try {
+                            final DanmakuOption currentOption =
+                                danmakuController.option;
+                            final DanmakuOption updatedOption =
+                            currentOption.copyWith(strokeWidth: val);
+                            danmakuController.updateOption(updatedOption);
+                          } catch (_) {}
+                        },
+                      ),
+                    ),
+                  ),
                   Text('字体大小 ${(fontSizeVal * 100).toStringAsFixed(1)}%'),
                   Padding(
                     padding: const EdgeInsets.only(