mod: 优化selectDialog选择逻辑

mod: 个人主页样式修改
feat: 启动时清除日志 issues #656
2024-04-04 23:41:16 +08:00 · 2024-04-01 23:03:31 +08:00 · 2024-03-31 11:11:50 +08:00 · 2024-03-28 00:29:22 +08:00 · 2024-03-28 00:27:28 +08:00 · 2024-03-23 21:56:59 +08:00
14 changed files with 49 additions and 244 deletions
--- a/lib/http/api.dart
+++ b/lib/http/api.dart
@ -506,6 +506,4 @@ class Api {
  /// 排行榜
  static const String getRankApi = "/x/web-interface/ranking/v2";

-  /// 取消订阅
-  static const String cancelSub = '/x/v3/fav/season/unfav';
 }
--- a/lib/http/user.dart
+++ b/lib/http/user.dart
@ -349,21 +349,4 @@ class UserHttp {
      return {'status': false, 'msg': res.data['message']};
    }
  }
-
-  // 取消订阅
-  static Future cancelSub({required int seasonId}) async {
-    var res = await Request().post(
-      Api.cancelSub,
-      queryParameters: {
-        'platform': 'web',
-        'season_id': seasonId,
-        'csrf': await Request.getCsrf(),
-      },
-    );
-    if (res.data['code'] == 0) {
-      return {'status': true};
-    } else {
-      return {'status': false, 'msg': res.data['message']};
-    }
-  }
 }
--- a/lib/pages/history/widgets/item.dart
+++ b/lib/pages/history/widgets/item.dart
@ -258,27 +258,24 @@ class HistoryItem extends StatelessWidget {
                              ),
                            ),
                          ),
-                          videoItem.progress != 0
-                              ? Positioned(
-                                  left: 3,
-                                  right: 3,
-                                  bottom: 0,
-                                  child: ClipRRect(
-                                    borderRadius: BorderRadius.only(
-                                      bottomLeft: Radius.circular(
-                                          StyleString.imgRadius.x),
-                                      bottomRight: Radius.circular(
-                                          StyleString.imgRadius.x),
-                                    ),
-                                    child: LinearProgressIndicator(
-                                      value: videoItem.progress == -1
-                                          ? 100
-                                          : videoItem.progress /
-                                              videoItem.duration,
-                                    ),
-                                  ),
-                                )
-                              : const SizedBox()
+                          Positioned(
+                            left: 3,
+                            right: 3,
+                            bottom: 0,
+                            child: ClipRRect(
+                              borderRadius: BorderRadius.only(
+                                bottomLeft:
+                                    Radius.circular(StyleString.imgRadius.x),
+                                bottomRight:
+                                    Radius.circular(StyleString.imgRadius.x),
+                              ),
+                              child: LinearProgressIndicator(
+                                value: videoItem.progress == -1
+                                    ? 100
+                                    : videoItem.progress / videoItem.duration,
+                              ),
+                            ),
+                          )
                        ],
                      ),
                      VideoContent(videoItem: videoItem, ctr: ctr)
--- a/lib/pages/setting/widgets/select_dialog.dart
+++ b/lib/pages/setting/widgets/select_dialog.dart
@ -44,6 +44,7 @@ class _SelectDialogState<T> extends State<SelectDialog<T>> {
                    setState(() {
                      _tempValue = value as T;
                    });
+                    Navigator.pop(context, _tempValue);
                  },
                ),
              ]
@ -51,19 +52,6 @@ class _SelectDialogState<T> extends State<SelectDialog<T>> {
          ),
        );
      }),
-      actions: [
-        TextButton(
-          onPressed: () => Navigator.pop(context),
-          child: Text(
-            '取消',
-            style: TextStyle(color: Theme.of(context).colorScheme.outline),
-          ),
-        ),
-        TextButton(
-          onPressed: () => Navigator.pop(context, _tempValue),
-          child: const Text('确定'),
-        )
-      ],
    );
  }
 }
--- a/lib/pages/subscription/controller.dart
+++ b/lib/pages/subscription/controller.dart
@ -46,40 +46,4 @@ class SubController extends GetxController {
  Future onLoad() async {
    querySubFolder(type: 'onload');
  }
-
-  // 取消订阅
-  Future<void> cancelSub(SubFolderItemData subFolderItem) async {
-    showDialog(
-      context: Get.context!,
-      builder: (context) => AlertDialog(
-        title: const Text('提示'),
-        content: const Text('确定取消订阅吗？'),
-        actions: [
-          TextButton(
-            onPressed: () {
-              Get.back();
-            },
-            child: Text(
-              '取消',
-              style: TextStyle(color: Theme.of(context).colorScheme.outline),
-            ),
-          ),
-          TextButton(
-            onPressed: () async {
-              var res = await UserHttp.cancelSub(seasonId: subFolderItem.id!);
-              if (res['status']) {
-                subFolderData.value.list!.remove(subFolderItem);
-                subFolderData.update((val) {});
-                SmartDialog.showToast('取消订阅成功');
-              } else {
-                SmartDialog.showToast(res['msg']);
-              }
-              Get.back();
-            },
-            child: const Text('确定'),
-          ),
-        ],
-      ),
-    );
-  }
 }
--- a/lib/pages/subscription/view.dart
+++ b/lib/pages/subscription/view.dart
@ -58,8 +58,7 @@ class _SubPageState extends State<SubPage> {
                  itemBuilder: (context, index) {
                    return SubItem(
                        subFolderItem:
-                            _subController.subFolderData.value.list![index],
-                        cancelSub: _subController.cancelSub);
+                            _subController.subFolderData.value.list![index]);
                  },
                ),
              );
--- a/lib/pages/subscription/widgets/item.dart
+++ b/lib/pages/subscription/widgets/item.dart
@ -8,12 +8,7 @@ import '../../../models/user/sub_folder.dart';

 class SubItem extends StatelessWidget {
  final SubFolderItemData subFolderItem;
-  final Function(SubFolderItemData) cancelSub;
-  const SubItem({
-    super.key,
-    required this.subFolderItem,
-    required this.cancelSub,
-  });
+  const SubItem({super.key, required this.subFolderItem});

  @override
  Widget build(BuildContext context) {
@ -56,10 +51,7 @@ class SubItem extends StatelessWidget {
                      },
                    ),
                  ),
-                  VideoContent(
-                    subFolderItem: subFolderItem,
-                    cancelSub: cancelSub,
-                  )
+                  VideoContent(subFolderItem: subFolderItem)
                ],
              ),
            );
@ -72,8 +64,7 @@ class SubItem extends StatelessWidget {

 class VideoContent extends StatelessWidget {
  final SubFolderItemData subFolderItem;
-  final Function(SubFolderItemData)? cancelSub;
-  const VideoContent({super.key, required this.subFolderItem, this.cancelSub});
+  const VideoContent({super.key, required this.subFolderItem});

  @override
  Widget build(BuildContext context) {
@ -109,24 +100,6 @@ class VideoContent extends StatelessWidget {
                color: Theme.of(context).colorScheme.outline,
              ),
            ),
-            const Spacer(),
-            Row(
-              mainAxisAlignment: MainAxisAlignment.end,
-              children: [
-                SizedBox(
-                  height: 35,
-                  width: 35,
-                  child: IconButton(
-                    onPressed: () => cancelSub?.call(subFolderItem),
-                    style: TextButton.styleFrom(
-                      foregroundColor: Theme.of(context).colorScheme.outline,
-                      padding: const EdgeInsets.fromLTRB(0, 0, 0, 0),
-                    ),
-                    icon: const Icon(Icons.delete_outline, size: 18),
-                  ),
-                )
-              ],
-            )
          ],
        ),
      ),
--- a/lib/pages/video/detail/controller.dart
+++ b/lib/pages/video/detail/controller.dart
@ -91,7 +91,7 @@ class VideoDetailController extends GetxController
  late bool enableCDN;
  late int? cacheVideoQa;
  late String cacheDecode;
-  late int defaultAudioQa;
+  late int cacheAudioQa;

  PersistentBottomSheetController? replyReplyBottomSheetCtr;
  RxList<SubTitileContentModel> subtitleContents =
@ -146,7 +146,7 @@ class VideoDetailController extends GetxController
    // 预设的解码格式
    cacheDecode = setting.get(SettingBoxKey.defaultDecode,
        defaultValue: VideoDecodeFormats.values.last.code);
-    defaultAudioQa = setting.get(SettingBoxKey.defaultAudioQa,
+    cacheAudioQa = setting.get(SettingBoxKey.defaultAudioQa,
        defaultValue: AudioQuality.hiRes.code);
    oid.value = IdUtils.bv2av(Get.parameters['bvid']!);
    getSubtitle();
@ -353,9 +353,9 @@ class VideoDetailController extends GetxController

        if (audiosList.isNotEmpty) {
          final List<int> numbers = audiosList.map((map) => map.id!).toList();
-          int closestNumber = Utils.findClosestNumber(defaultAudioQa, numbers);
-          if (!numbers.contains(defaultAudioQa) &&
-              numbers.any((e) => e > defaultAudioQa)) {
+          int closestNumber = Utils.findClosestNumber(cacheAudioQa, numbers);
+          if (!numbers.contains(cacheAudioQa) &&
+              numbers.any((e) => e > cacheAudioQa)) {
            closestNumber = 30280;
          }
          firstAudio = audiosList.firstWhere((e) => e.id == closestNumber);
--- a/lib/pages/video/detail/introduction/view.dart
+++ b/lib/pages/video/detail/introduction/view.dart
@ -1,4 +1,3 @@
-import 'package:expandable/expandable.dart';
 import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 import 'package:get/get.dart';
@ -17,6 +16,7 @@ import 'package:pilipala/utils/feed_back.dart';
 import 'package:pilipala/utils/storage.dart';
 import 'package:pilipala/utils/utils.dart';
 import '../../../../http/user.dart';
+import '../widgets/expandable_section.dart';
 import 'widgets/action_item.dart';
 import 'widgets/fav_panel.dart';
 import 'widgets/intro_detail.dart';
@ -140,8 +140,6 @@ class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
  late bool enableAi;
  bool isProcessing = false;
  RxBool isExpand = false.obs;
-  late ExpandableController _expandableCtr;
-
  void Function()? handleState(Future Function() action) {
    return isProcessing
        ? null
@ -165,7 +163,6 @@ class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
    follower = Utils.numFormat(videoIntroController.userStat['follower']);
    followStatus = videoIntroController.followStatus;
    enableAi = setting.get(SettingBoxKey.enableAi, defaultValue: true);
-    _expandableCtr = ExpandableController(initialExpanded: false);
  }

  // 收藏
@ -219,7 +216,6 @@ class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
  showIntroDetail() {
    feedBack();
    isExpand.value = !(isExpand.value);
-    _expandableCtr.toggle();
  }

  // 用户主页
@ -243,12 +239,6 @@ class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
    );
  }

-  @override
-  void dispose() {
-    _expandableCtr.dispose();
-    super.dispose();
-  }
-
  @override
  Widget build(BuildContext context) {
    final ThemeData t = Theme.of(context);
@ -266,34 +256,14 @@ class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
          GestureDetector(
            behavior: HitTestBehavior.translucent,
            onTap: () => showIntroDetail(),
-            child: ExpandablePanel(
-              controller: _expandableCtr,
-              collapsed: Text(
-                widget.videoDetail!.title!,
-                softWrap: true,
-                maxLines: 2,
-                overflow: TextOverflow.ellipsis,
-                style: const TextStyle(
-                  fontSize: 18,
-                  fontWeight: FontWeight.bold,
-                ),
-              ),
-              expanded: Text(
-                widget.videoDetail!.title!,
-                softWrap: true,
-                maxLines: 4,
-                style: const TextStyle(
-                  fontSize: 18,
-                  fontWeight: FontWeight.bold,
-                ),
-              ),
-              theme: const ExpandableThemeData(
-                animationDuration: Duration(milliseconds: 300),
-                scrollAnimationDuration: Duration(milliseconds: 300),
-                crossFadePoint: 0,
-                fadeCurve: Curves.ease,
-                sizeCurve: Curves.linear,
+            child: Text(
+              widget.videoDetail!.title!,
+              style: const TextStyle(
+                fontSize: 18,
+                fontWeight: FontWeight.bold,
              ),
+              maxLines: 2,
+              overflow: TextOverflow.ellipsis,
            ),
          ),
          Stack(
@ -358,16 +328,12 @@ class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
          ),

          /// 视频简介
-          ExpandablePanel(
-            controller: _expandableCtr,
-            collapsed: const SizedBox(height: 0),
-            expanded: IntroDetail(videoDetail: widget.videoDetail!),
-            theme: const ExpandableThemeData(
-              animationDuration: Duration(milliseconds: 300),
-              scrollAnimationDuration: Duration(milliseconds: 300),
-              crossFadePoint: 0,
-              fadeCurve: Curves.ease,
-              sizeCurve: Curves.linear,
+          Obx(
+            () => ExpandedSection(
+              expand: isExpand.value,
+              begin: 0,
+              end: 1,
+              child: IntroDetail(videoDetail: widget.videoDetail!),
            ),
          ),

--- a/lib/pages/video/detail/reply/widgets/reply_item.dart
+++ b/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(
-      TextSpan(
+    spanChilds.add(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(
-        bv23Regex,
-        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;
-        },
-      );
+      addPlainTextSpan(nonMatchStr);
+      return nonMatchStr;
    },
  );

--- a/lib/pages/video/detail/reply_new/view.dart
+++ b/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'
-                  ? (_keyboardHeight > keyboardHeight
-                      ? _keyboardHeight
-                      : keyboardHeight)
-                  : emoteHeight,
+              height: toolbarType == 'input' ? keyboardHeight : emoteHeight,
              child: EmotePanel(
                onChoose: (package, emote) => onChooseEmote(package, emote),
              ),
--- a/lib/utils/utils.dart
+++ b/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;
@ -209,8 +209,6 @@ class Utils {
  static int findClosestNumber(int target, List<int> numbers) {
    int minDiff = 127;
    int closestNumber = 0; // 初始化为0，表示没有找到比目标值小的整数
-
-    // 向下查找
    try {
      for (int number in numbers) {
        if (number < target) {
@ -223,20 +221,6 @@ class Utils {
        }
      }
    } catch (_) {}
-
-    // 向上查找
-    if (closestNumber == 0) {
-      try {
-        for (int number in numbers) {
-          int diff = (number - target).abs();
-
-          if (diff < minDiff) {
-            minDiff = diff;
-            closestNumber = number;
-          }
-        }
-      } catch (_) {}
-    }
    return closestNumber;
  }

--- a/pubspec.lock
+++ b/pubspec.lock
@ -433,14 +433,6 @@ packages:
      url: "https://pub.flutter-io.cn"
    source: hosted
    version: "5.0.3"
-  expandable:
-    dependency: "direct main"
-    description:
-      name: expandable
-      sha256: "9604d612d4d1146dafa96c6d8eec9c2ff0994658d6d09fed720ab788c7f5afc2"
-      url: "https://pub.flutter-io.cn"
-    source: hosted
-    version: "5.0.1"
  extended_image:
    dependency: "direct main"
    description:
--- a/pubspec.yaml
+++ b/pubspec.yaml
@ -142,8 +142,6 @@ dependencies:
  path: 1.8.3
  # 电池优化
  disable_battery_optimization: ^1.1.1
-  # 展开/收起
-  expandable: ^5.0.1

 dev_dependencies:
  flutter_test:
Author	SHA1	Message	Date
guozhigq	b58df720fd	mod: 优化selectDialog选择逻辑	2024-04-04 23:41:16 +08:00
guozhigq	469a5ec691	mod: 个人主页样式修改	2024-04-01 23:03:31 +08:00
guozhigq	8897c4dd5b	feat: 启动时清除日志 issues #656	2024-03-31 11:11:50 +08:00
guozhigq	53941469ce	opt: 向下查找可用视频清晰度	2024-03-28 00:29:22 +08:00
guozhigq	eb73680296	Merge branch 'main' into design	2024-03-28 00:27:28 +08:00
guozhigq	b1e80c298e	Merge branch 'main' into design	2024-03-23 21:56:59 +08:00