Merge branch 'main' into fix-pip

2024-03-31 00:11:25 +08:00
parent 7902cef80f fd54915399
commit 9e8e8f73c2
15 changed files with 206 additions and 56 deletions
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@ -9,6 +9,7 @@ PODS:
    - Flutter
  - connectivity_plus (0.0.1):
    - Flutter
+    - FlutterMacOS
    - ReachabilitySwift
  - device_info_plus (0.0.1):
    - Flutter
@ -38,7 +39,7 @@ PODS:
  - path_provider_foundation (0.0.1):
    - Flutter
    - FlutterMacOS
-  - permission_handler_apple (9.1.1):
+  - permission_handler_apple (9.3.0):
    - Flutter
  - ReachabilitySwift (5.0.0)
  - saver_gallery (0.0.1):
@ -71,7 +72,7 @@ DEPENDENCIES:
  - audio_service (from `.symlinks/plugins/audio_service/ios`)
  - audio_session (from `.symlinks/plugins/audio_session/ios`)
  - auto_orientation (from `.symlinks/plugins/auto_orientation/ios`)
-  - connectivity_plus (from `.symlinks/plugins/connectivity_plus/ios`)
+  - connectivity_plus (from `.symlinks/plugins/connectivity_plus/darwin`)
  - device_info_plus (from `.symlinks/plugins/device_info_plus/ios`)
  - Flutter (from `Flutter`)
  - flutter_mailer (from `.symlinks/plugins/flutter_mailer/ios`)
@ -113,7 +114,7 @@ EXTERNAL SOURCES:
  auto_orientation:
    :path: ".symlinks/plugins/auto_orientation/ios"
  connectivity_plus:
-    :path: ".symlinks/plugins/connectivity_plus/ios"
+    :path: ".symlinks/plugins/connectivity_plus/darwin"
  device_info_plus:
    :path: ".symlinks/plugins/device_info_plus/ios"
  Flutter:
@ -166,7 +167,7 @@ SPEC CHECKSUMS:
  audio_service: f509d65da41b9521a61f1c404dd58651f265a567
  audio_session: 4f3e461722055d21515cf3261b64c973c062f345
  auto_orientation: 102ed811a5938d52c86520ddd7ecd3a126b5d39d
-  connectivity_plus: 07c49e96d7fc92bc9920617b83238c4d178b446a
+  connectivity_plus: e2dad488011aeb593e219360e804c43cc1af5770
  device_info_plus: c6fb39579d0f423935b0c9ce7ee2f44b71b9fce6
  Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
  flutter_mailer: 2ef5a67087bc8c6c4cefd04a178bf1ae2c94cd83
@ -180,7 +181,7 @@ SPEC CHECKSUMS:
  media_kit_video: 5da63f157170e5bf303bf85453b7ef6971218a2e
  package_info_plus: 115f4ad11e0698c8c1c5d8a689390df880f47e85
  path_provider_foundation: 29f094ae23ebbca9d3d0cec13889cd9060c0e943
-  permission_handler_apple: e76247795d700c14ea09e3a2d8855d41ee80a2e6
+  permission_handler_apple: 9878588469a2b0d0fc1e048d9f43605f92e6cec2
  ReachabilitySwift: 985039c6f7b23a1da463388634119492ff86c825
  saver_gallery: 2b4e584106fde2407ab51560f3851564963e6b78
  screen_brightness_ios: 715ca807df953bf676d339f11464e438143ee625
@ -193,7 +194,7 @@ SPEC CHECKSUMS:
  volume_controller: 531ddf792994285c9b17f9d8a7e4dcdd29b3eae9
  wakelock_plus: 8b09852c8876491e4b6d179e17dfe2a0b5f60d47
  webview_cookie_manager: eaf920722b493bd0f7611b5484771ca53fed03f7
-  webview_flutter_wkwebview: 2e2d318f21a5e036e2c3f26171342e95908bd60a
+  webview_flutter_wkwebview: 4f3e50f7273d31e5500066ed267e3ae4309c5ae4

 PODFILE CHECKSUM: 637cd290bed23275b5f5ffcc7eb1e73d0a5fb2be

--- a/lib/http/api.dart
+++ b/lib/http/api.dart
@ -506,4 +506,6 @@ 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,4 +349,21 @@ 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/models/search/result.dart
+++ b/lib/models/search/result.dart
@ -437,7 +437,8 @@ class SearchArticleItemModel {
    pubTime = json['pub_time'];
    like = json['like'];
    title = Em.regTitle(json['title']);
-    subTitle = json['title'].replaceAll(RegExp(r'<[^>]*>'), '');
+    subTitle =
+        Em.decodeHtmlEntities(json['title'].replaceAll(RegExp(r'<[^>]*>'), ''));
    rankOffset = json['rank_offset'];
    mid = json['mid'];
    imageUrls = json['image_urls'];
--- a/lib/pages/history/widgets/item.dart
+++ b/lib/pages/history/widgets/item.dart
@ -185,7 +185,7 @@ class HistoryItem extends StatelessWidget {
                                            ? '已看完'
                                            : '${Utils.timeFormat(videoItem.progress!)}/${Utils.timeFormat(videoItem.duration!)}',
                                        right: 6.0,
-                                        bottom: 6.0,
+                                        bottom: 8.0,
                                        type: 'gray',
                                      ),
                                    // 右上角
@ -258,6 +258,27 @@ 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()
                        ],
                      ),
                      VideoContent(videoItem: videoItem, ctr: ctr)
--- a/lib/pages/rank/controller.dart
+++ b/lib/pages/rank/controller.dart
@ -50,21 +50,5 @@ class RankController extends GetxController with GetTickerProviderStateMixin {
      length: tabs.length,
      vsync: this,
    );
-    // 监听 tabController 切换
-    if (enableGradientBg) {
-      tabController.animation!.addListener(() {
-        if (tabController.indexIsChanging) {
-          if (initialIndex.value != tabController.index) {
-            initialIndex.value = tabController.index;
-          }
-        } else {
-          final int temp = tabController.animation!.value.round();
-          if (initialIndex.value != temp) {
-            initialIndex.value = temp;
-            tabController.index = initialIndex.value;
-          }
-        }
-      });
-    }
  }
 }
--- a/lib/pages/subscription/controller.dart
+++ b/lib/pages/subscription/controller.dart
@ -46,4 +46,40 @@ 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,7 +58,8 @@ class _SubPageState extends State<SubPage> {
                  itemBuilder: (context, index) {
                    return SubItem(
                        subFolderItem:
-                            _subController.subFolderData.value.list![index]);
+                            _subController.subFolderData.value.list![index],
+                        cancelSub: _subController.cancelSub);
                  },
                ),
              );
--- a/lib/pages/subscription/widgets/item.dart
+++ b/lib/pages/subscription/widgets/item.dart
@ -8,7 +8,12 @@ import '../../../models/user/sub_folder.dart';

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

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

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

  @override
  Widget build(BuildContext context) {
@ -100,6 +109,24 @@ 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/introduction/view.dart
+++ b/lib/pages/video/detail/introduction/view.dart
@ -1,3 +1,4 @@
+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';
@ -15,7 +16,7 @@ import 'package:pilipala/pages/video/detail/widgets/ai_detail.dart';
 import 'package:pilipala/utils/feed_back.dart';
 import 'package:pilipala/utils/storage.dart';
 import 'package:pilipala/utils/utils.dart';
-import '../widgets/expandable_section.dart';
+import '../../../../http/user.dart';
 import 'widgets/action_item.dart';
 import 'widgets/fav_panel.dart';
 import 'widgets/intro_detail.dart';
@ -139,6 +140,8 @@ 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
@ -162,6 +165,7 @@ 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);
  }

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

  // 用户主页
@ -238,6 +243,12 @@ 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);
@ -255,14 +266,34 @@ class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
          GestureDetector(
            behavior: HitTestBehavior.translucent,
            onTap: () => showIntroDetail(),
-            child: Text(
+            child: ExpandablePanel(
+              controller: _expandableCtr,
+              collapsed: Text(
                widget.videoDetail!.title!,
+                softWrap: true,
+                maxLines: 2,
+                overflow: TextOverflow.ellipsis,
                style: const TextStyle(
                  fontSize: 18,
                  fontWeight: FontWeight.bold,
                ),
-              maxLines: 2,
-              overflow: TextOverflow.ellipsis,
+              ),
+              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,
+              ),
            ),
          ),
          Stack(
@ -327,12 +358,16 @@ class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
          ),

          /// 视频简介
-          Obx(
-            () => ExpandedSection(
-              expand: isExpand.value,
-              begin: 0,
-              end: 1,
-              child: IntroDetail(videoDetail: widget.videoDetail!),
+          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,
            ),
          ),

@ -479,7 +514,11 @@ class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
            ),
            ActionItem(
              icon: const Icon(FontAwesomeIcons.clock),
-              onTap: () => videoIntroController.actionShareVideo(),
+              onTap: () async {
+                final res =
+                    await UserHttp.toViewLater(bvid: widget.videoDetail!.bvid);
+                SmartDialog.showToast(res['msg']);
+              },
              selectStatus: false,
              text: '稍后看',
            ),
--- a/lib/pages/video/detail/reply/view.dart
+++ b/lib/pages/video/detail/reply/view.dart
@ -149,14 +149,17 @@ class _VideoReplyPanelState extends State<VideoReplyPanel>
                delegate: _MySliverPersistentHeaderDelegate(
                  child: Container(
                    height: 40,
-                    padding: const EdgeInsets.fromLTRB(12, 6, 6, 0),
+                    padding: const EdgeInsets.fromLTRB(12, 0, 6, 0),
+                    color: Theme.of(context).colorScheme.surface,
                    child: Row(
                      mainAxisAlignment: MainAxisAlignment.spaceBetween,
                      children: [
-                        Text(
+                        Obx(
+                          () => Text(
                            '${_videoReplyController.sortTypeLabel.value}评论',
                            style: const TextStyle(fontSize: 13),
                          ),
+                        ),
                        SizedBox(
                          height: 35,
                          child: TextButton.icon(
--- a/lib/pages/video/detail/view.dart
+++ b/lib/pages/video/detail/view.dart
@ -376,6 +376,9 @@ class _VideoDetailPageState extends State<VideoDetailPage>
                                    false)
                                ? SvgPicture.asset(
                                    'assets/images/video/danmu_close.svg',
+                                    // ignore: deprecated_member_use
+                                    color:
+                                        Theme.of(context).colorScheme.outline,
                                  )
                                : SvgPicture.asset(
                                    'assets/images/video/danmu_open.svg',
--- a/lib/utils/em.dart
+++ b/lib/utils/em.dart
@ -19,15 +19,7 @@ class Em {
      return regCate(matchStr);
    }, onNonMatch: (String str) {
      if (str != '') {
-        str = str
-            .replaceAll('&lt;', '<')
-            .replaceAll('&gt;', '>')
-            .replaceAll('&#34;', '"')
-            .replaceAll('&#39;', "'")
-            .replaceAll('&quot;', '"')
-            .replaceAll('&apos;', "'")
-            .replaceAll('&nbsp;', " ")
-            .replaceAll('&amp;', "&");
+        str = decodeHtmlEntities(str);
        Map map = {'type': 'text', 'text': str};
        res.add(map);
      }
@ -35,4 +27,17 @@ class Em {
    });
    return res;
  }
+
+  static String decodeHtmlEntities(String title) {
+    return title
+        .replaceAll('&lt;', '<')
+        .replaceAll('&gt;', '>')
+        .replaceAll('&#34;', '"')
+        .replaceAll('&#39;', "'")
+        .replaceAll('&quot;', '"')
+        .replaceAll('&apos;', "'")
+        .replaceAll('&nbsp;', " ")
+        .replaceAll('&amp;', "&")
+        .replaceAll('&#x27;', "'");
+  }
 }
--- a/pubspec.lock
+++ b/pubspec.lock
@ -433,6 +433,14 @@ 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,6 +142,8 @@ dependencies:
  path: 1.8.3
  # 电池优化
  disable_battery_optimization: ^1.1.1
+  # 展开/收起
+  expandable: ^5.0.1

 dev_dependencies:
  flutter_test: