feat: 订阅取消 issues #658

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';
 }

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']};
+    }
+  }
 }

lib/models/common/nav_bar_config.dart

@@ -1,10 +1,5 @@
 import 'package:flutter/material.dart';
 
-import '../../pages/dynamics/index.dart';
-import '../../pages/home/index.dart';
-import '../../pages/media/index.dart';
-import '../../pages/rank/index.dart';
-
 List defaultNavigationBars = [
   {
     'id': 0,
@@ -18,7 +13,6 @@ List defaultNavigationBars = [
     ),
     'label': "首页",
     'count': 0,
-    'page': const HomePage(),
   },
   {
     'id': 1,
@@ -32,7 +26,6 @@ List defaultNavigationBars = [
     ),
     'label': "排行榜",
     'count': 0,
-    'page': const RankPage(),
   },
   {
     'id': 2,
@@ -46,7 +39,6 @@ List defaultNavigationBars = [
     ),
     'label': "动态",
     'count': 0,
-    'page': const DynamicsPage(),
   },
   {
     'id': 3,
@@ -60,6 +52,5 @@ List defaultNavigationBars = [
     ),
     'label': "媒体库",
     'count': 0,
-    'page': const MediaPage(),
   }
 ];

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'];

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,24 @@ class HistoryItem extends StatelessWidget {
                               ),
                             ),
                           ),
+                          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)

lib/pages/main/controller.dart

@@ -6,16 +6,23 @@ import 'package:get/get.dart';
 import 'package:flutter/material.dart';
 import 'package:hive/hive.dart';
 import 'package:pilipala/http/common.dart';
+import 'package:pilipala/pages/dynamics/index.dart';
+import 'package:pilipala/pages/home/view.dart';
+import 'package:pilipala/pages/media/index.dart';
+import 'package:pilipala/pages/rank/index.dart';
 import 'package:pilipala/utils/storage.dart';
 import 'package:pilipala/utils/utils.dart';
 import '../../models/common/dynamic_badge_mode.dart';
 import '../../models/common/nav_bar_config.dart';
 
 class MainController extends GetxController {
-  List<Widget> pages = <Widget>[];
+  List<Widget> pages = <Widget>[
-  RxList navigationBars = [].obs;
+    const HomePage(),
-  late List defaultNavTabs;
+    const RankPage(),
-  late List<int> navBarSort;
+    const DynamicsPage(),
+    const MediaPage(),
+  ];
+  RxList navigationBars = defaultNavigationBars.obs;
   final StreamController<bool> bottomBarStream =
       StreamController<bool>.broadcast();
   Box setting = GStrorage.setting;
@@ -34,7 +41,10 @@ class MainController extends GetxController {
       Utils.checkUpdata();
     }
     hideTabBar = setting.get(SettingBoxKey.hideTabBar, defaultValue: true);
-
+    int defaultHomePage =
+        setting.get(SettingBoxKey.defaultHomePage, defaultValue: 0) as int;
+    selectedIndex = defaultNavigationBars
+        .indexWhere((item) => item['id'] == defaultHomePage);
     var userInfo = userInfoCache.get('userInfoCache');
     userLogin.value = userInfo != null;
     dynamicBadgeType.value = DynamicBadgeMode.values[setting.get(
@@ -43,7 +53,6 @@ class MainController extends GetxController {
     if (dynamicBadgeType.value != DynamicBadgeMode.hidden) {
       getUnreadDynamic();
     }
-    setNavBarConfig();
   }
 
   void onBackPressed(BuildContext context) {
@@ -84,21 +93,4 @@ class MainController extends GetxController {
     }
     navigationBars.refresh();
   }
-
-  void setNavBarConfig() async {
-    defaultNavTabs = [...defaultNavigationBars];
-    navBarSort =
-        setting.get(SettingBoxKey.navBarSort, defaultValue: [0, 1, 2, 3]);
-    defaultNavTabs.retainWhere((item) => navBarSort.contains(item['id']));
-    defaultNavTabs.sort((a, b) =>
-        navBarSort.indexOf(a['id']).compareTo(navBarSort.indexOf(b['id'])));
-    navigationBars.value = defaultNavTabs;
-    int defaultHomePage =
-        setting.get(SettingBoxKey.defaultHomePage, defaultValue: 0) as int;
-    int defaultIndex =
-        navigationBars.indexWhere((item) => item['id'] == defaultHomePage);
-    // 如果找不到匹配项，默认索引设置为0或其他合适的值
-    selectedIndex = defaultIndex != -1 ? defaultIndex : 0;
-    pages = navigationBars.map<Widget>((e) => e['page']).toList();
-  }
 }

lib/pages/setting/pages/navigation_bar_set.dart

@@ -1,100 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
-import 'package:hive/hive.dart';
-import 'package:pilipala/models/common/tab_type.dart';
-import 'package:pilipala/utils/storage.dart';
-
-import '../../../models/common/nav_bar_config.dart';
-
-class NavigationBarSetPage extends StatefulWidget {
-  const NavigationBarSetPage({super.key});
-
-  @override
-  State<NavigationBarSetPage> createState() => _NavigationbarSetPageState();
-}
-
-class _NavigationbarSetPageState extends State<NavigationBarSetPage> {
-  Box settingStorage = GStrorage.setting;
-  late List defaultNavTabs;
-  late List<int> navBarSort;
-
-  @override
-  void initState() {
-    super.initState();
-    defaultNavTabs = defaultNavigationBars;
-    navBarSort = settingStorage
-        .get(SettingBoxKey.navBarSort, defaultValue: [0, 1, 2, 3]);
-    // 对 tabData 进行排序
-    defaultNavTabs.sort((a, b) {
-      int indexA = navBarSort.indexOf(a['id']);
-      int indexB = navBarSort.indexOf(b['id']);
-
-      // 如果类型在 sortOrder 中不存在，则放在末尾
-      if (indexA == -1) indexA = navBarSort.length;
-      if (indexB == -1) indexB = navBarSort.length;
-
-      return indexA.compareTo(indexB);
-    });
-  }
-
-  void saveEdit() {
-    List<int> sortedTabbar = defaultNavTabs
-        .where((i) => navBarSort.contains(i['id']))
-        .map<int>((i) => i['id'])
-        .toList();
-    settingStorage.put(SettingBoxKey.navBarSort, sortedTabbar);
-    SmartDialog.showToast('保存成功，下次启动时生效');
-  }
-
-  void onReorder(int oldIndex, int newIndex) {
-    setState(() {
-      if (newIndex > oldIndex) {
-        newIndex -= 1;
-      }
-      final tabsItem = defaultNavTabs.removeAt(oldIndex);
-      defaultNavTabs.insert(newIndex, tabsItem);
-    });
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    final listTiles = [
-      for (int i = 0; i < defaultNavTabs.length; i++) ...[
-        CheckboxListTile(
-          key: Key(defaultNavTabs[i]['label']),
-          value: navBarSort.contains(defaultNavTabs[i]['id']),
-          onChanged: (bool? newValue) {
-            int tabTypeId = defaultNavTabs[i]['id'];
-            if (!newValue!) {
-              navBarSort.remove(tabTypeId);
-            } else {
-              navBarSort.add(tabTypeId);
-            }
-            setState(() {});
-          },
-          title: Text(defaultNavTabs[i]['label']),
-          secondary: const Icon(Icons.drag_indicator_rounded),
-          enabled: defaultNavTabs[i]['id'] != 3,
-        )
-      ]
-    ];
-
-    return Scaffold(
-      appBar: AppBar(
-        title: const Text('Navbar编辑'),
-        actions: [
-          TextButton(onPressed: () => saveEdit(), child: const Text('保存')),
-          const SizedBox(width: 12)
-        ],
-      ),
-      body: ReorderableListView(
-        onReorder: onReorder,
-        physics: const NeverScrollableScrollPhysics(),
-        footer: SizedBox(
-          height: MediaQuery.of(context).padding.bottom + 30,
-        ),
-        children: listTiles,
-      ),
-    );
-  }
-}

lib/pages/setting/style_setting.dart

@@ -284,17 +284,12 @@ class _StyleSettingState extends State<StyleSetting> {
             onTap: () => Get.toNamed('/tabbarSetting'),
             title: Text('首页tabbar', style: titleStyle),
           ),
-          ListTile(
-            dense: false,
-            onTap: () => Get.toNamed('/navbarSetting'),
-            title: Text('navbar设置', style: titleStyle),
-          ),
           if (Platform.isAndroid)
             ListTile(
               dense: false,
               onTap: () => Get.toNamed('/displayModeSetting'),
               title: Text('屏幕帧率', style: titleStyle),
-            ),
+            )
         ],
       ),
     );

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('确定'),
+          ),
+        ],
+      ),
+    );
+  }
 }

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);
                   },
                 ),
               );

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),
+                  ),
+                )
+              ],
+            )
           ],
         ),
       ),

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';
@@ -16,7 +17,6 @@ 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,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
@@ -163,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);
   }
 
   // 收藏
@@ -216,6 +219,7 @@ class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
   showIntroDetail() {
     feedBack();
     isExpand.value = !(isExpand.value);
+    _expandableCtr.toggle();
   }
 
   // 用户主页
@@ -239,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);
@@ -256,14 +266,34 @@ class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
           GestureDetector(
             behavior: HitTestBehavior.translucent,
             onTap: () => showIntroDetail(),
-            child: Text(
+            child: ExpandablePanel(
-              widget.videoDetail!.title!,
+              controller: _expandableCtr,
-              style: const TextStyle(
+              collapsed: Text(
-                fontSize: 18,
+                widget.videoDetail!.title!,
-                fontWeight: FontWeight.bold,
+                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,
               ),
-              maxLines: 2,
-              overflow: TextOverflow.ellipsis,
             ),
           ),
           Stack(
@@ -328,12 +358,16 @@ class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
           ),
 
           /// 视频简介
-          Obx(
+          ExpandablePanel(
-            () => ExpandedSection(
+            controller: _expandableCtr,
-              expand: isExpand.value,
+            collapsed: const SizedBox(height: 0),
-              begin: 0,
+            expanded: IntroDetail(videoDetail: widget.videoDetail!),
-              end: 1,
+            theme: const ExpandableThemeData(
-              child: IntroDetail(videoDetail: widget.videoDetail!),
+              animationDuration: Duration(milliseconds: 300),
+              scrollAnimationDuration: Duration(milliseconds: 300),
+              crossFadePoint: 0,
+              fadeCurve: Curves.ease,
+              sizeCurve: Curves.linear,
             ),
           ),
 

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

@@ -149,13 +149,16 @@ 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(
-                          '${_videoReplyController.sortTypeLabel.value}评论',
+                          () => Text(
-                          style: const TextStyle(fontSize: 13),
+                            '${_videoReplyController.sortTypeLabel.value}评论',
+                            style: const TextStyle(fontSize: 13),
+                          ),
                         ),
                         SizedBox(
                           height: 35,

lib/router/app_pages.dart

@@ -39,7 +39,6 @@ import '../pages/setting/pages/color_select.dart';
 import '../pages/setting/pages/display_mode.dart';
 import '../pages/setting/pages/font_size_select.dart';
 import '../pages/setting/pages/home_tabbar_set.dart';
-import '../pages/setting/pages/navigation_bar_set.dart';
 import '../pages/setting/pages/play_gesture_set.dart';
 import '../pages/setting/pages/play_speed_set.dart';
 import '../pages/setting/recommend_setting.dart';
@@ -171,9 +170,6 @@ class Routes {
     // 播放器手势
     CustomGetPage(
         name: '/playerGestureSet', page: () => const PlayGesturePage()),
-    // navigation bar
-    CustomGetPage(
-        name: '/navbarSetting', page: () => const NavigationBarSetPage()),
   ];
 }
 

lib/utils/em.dart

@@ -19,15 +19,7 @@ class Em {
       return regCate(matchStr);
     }, onNonMatch: (String str) {
       if (str != '') {
-        str = str
+        str = decodeHtmlEntities(str);
-            .replaceAll('&lt;', '<')
-            .replaceAll('&gt;', '>')
-            .replaceAll('&#34;', '"')
-            .replaceAll('&#39;', "'")
-            .replaceAll('&quot;', '"')
-            .replaceAll('&apos;', "'")
-            .replaceAll('&nbsp;', " ")
-            .replaceAll('&amp;', "&");
         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;', "'");
+  }
 }

lib/utils/storage.dart

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

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:

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: