fix: 历史记录进度条

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
 

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

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

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

@@ -15,6 +15,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 '../../../../http/user.dart';
 import '../widgets/expandable_section.dart';
 import 'widgets/action_item.dart';
 import 'widgets/fav_panel.dart';
@@ -479,7 +480,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: '稍后看',
             ),

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/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',

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