Merge branch 'main' into feature-ad

lib/models/search/result.dart

@@ -437,8 +437,7 @@ class SearchArticleItemModel {
     pubTime = json['pub_time'];
     like = json['like'];
     title = Em.regTitle(json['title']);
-    subTitle =
+    subTitle = json['title'].replaceAll(RegExp(r'<[^>]*>'), '');
-        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: 8.0,
+                                        bottom: 6.0,
                                         type: 'gray',
                                       ),
                                     // 右上角
@@ -258,24 +258,6 @@ 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/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(
+            child: Text(
-              controller: _expandableCtr,
-              collapsed: Text(
               widget.videoDetail!.title!,
-                softWrap: true,
+              style: const TextStyle(
+                fontSize: 18,
+                fontWeight: FontWeight.bold,
+              ),
               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,
-              ),
             ),
           ),
           Stack(
@@ -358,16 +328,12 @@ class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
           ),
 
           /// 视频简介
-          ExpandablePanel(
+          Obx(
-            controller: _expandableCtr,
+            () => ExpandedSection(
-            collapsed: const SizedBox(height: 0),
+              expand: isExpand.value,
-            expanded: IntroDetail(videoDetail: widget.videoDetail!),
+              begin: 0,
-            theme: const ExpandableThemeData(
+              end: 1,
-              animationDuration: Duration(milliseconds: 300),
+              child: IntroDetail(videoDetail: widget.videoDetail!),
-              scrollAnimationDuration: Duration(milliseconds: 300),
-              crossFadePoint: 0,
-              fadeCurve: Curves.ease,
-              sizeCurve: Curves.linear,
             ),
           ),
 

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

@@ -149,17 +149,14 @@ class _VideoReplyPanelState extends State<VideoReplyPanel>
                 delegate: _MySliverPersistentHeaderDelegate(
                   child: Container(
                     height: 40,
-                    padding: const EdgeInsets.fromLTRB(12, 0, 6, 0),
+                    padding: const EdgeInsets.fromLTRB(12, 6, 6, 0),
-                    color: Theme.of(context).colorScheme.surface,
                     child: Row(
                       mainAxisAlignment: MainAxisAlignment.spaceBetween,
                       children: [
-                        Obx(
+                        Text(
-                          () => Text(
                           '${_videoReplyController.sortTypeLabel.value}评论',
                           style: const TextStyle(fontSize: 13),
                         ),
-                        ),
                         SizedBox(
                           height: 35,
                           child: TextButton.icon(

lib/plugin/pl_player/controller.dart

@@ -393,13 +393,7 @@ class PlPlayerController {
       }
       // 配置Player 音轨、字幕等等
       _videoPlayerController = await _createVideoController(
-        dataSource,
+          dataSource, _looping, enableHA, width, height);
-        _looping,
-        enableHA,
-        width,
-        height,
-        seekTo,
-      );
       // 获取视频时长 00:00
       _duration.value = duration ?? _videoPlayerController!.state.duration;
       updateDurationSecond();
@@ -410,7 +404,7 @@ class PlPlayerController {
       if (!_listenersInitialized) {
         startListeners();
       }
-      await _initializePlayer(duration: _duration.value);
+      await _initializePlayer(seekTo: seekTo, duration: _duration.value);
       bool autoEnterFullcreen =
           setting.get(SettingBoxKey.enableAutoEnter, defaultValue: false);
       if (autoEnterFullcreen && _isFirstTime) {
@@ -430,7 +424,6 @@ class PlPlayerController {
     bool enableHA,
     double? width,
     double? height,
-    Duration? seekTo,
   ) async {
     // 每次配置时先移除监听
     removeListeners();
@@ -513,11 +506,7 @@ class PlPlayerController {
       );
     }
     player.open(
-      Media(
+      Media(dataSource.videoSource!, httpHeaders: dataSource.httpHeaders),
-        dataSource.videoSource!,
-        httpHeaders: dataSource.httpHeaders,
-        start: seekTo ?? Duration.zero,
-      ),
       play: false,
     );
     // 音轨
@@ -530,6 +519,7 @@ class PlPlayerController {
 
   // 开始播放
   Future _initializePlayer({
+    Duration seekTo = Duration.zero,
     Duration? duration,
   }) async {
     // 设置倍速
@@ -547,6 +537,11 @@ class PlPlayerController {
     //   await setLooping(_looping);
     // }
 
+    // 跳转播放
+    if (seekTo != Duration.zero) {
+      await this.seekTo(seekTo);
+    }
+
     // 自动播放
     if (_autoPlay) {
       await play(duration: duration);
@@ -666,14 +661,21 @@ class PlPlayerController {
         await _videoPlayerController?.stream.buffer.first;
       }
       await _videoPlayerController?.seek(position);
+      // if (playerStatus.stopped) {
+      //   play();
+      // }
     } else {
       print('seek duration else');
       _timerForSeek?.cancel();
       _timerForSeek =
           Timer.periodic(const Duration(milliseconds: 200), (Timer t) async {
+        //_timerForSeek = null;
         if (duration.value.inSeconds != 0) {
           await _videoPlayerController!.stream.buffer.first;
           await _videoPlayerController?.seek(position);
+          // if (playerStatus.status.value == PlayerStatus.paused) {
+          //   play();
+          // }
           t.cancel();
           _timerForSeek = null;
         }

lib/utils/em.dart

@@ -19,17 +19,7 @@ class Em {
       return regCate(matchStr);
     }, onNonMatch: (String str) {
       if (str != '') {
-        str = decodeHtmlEntities(str);
+        str = str
-        Map map = {'type': 'text', 'text': str};
-        res.add(map);
-      }
-      return str;
-    });
-    return res;
-  }
-
-  static String decodeHtmlEntities(String title) {
-    return title
             .replaceAll('&lt;', '<')
             .replaceAll('&gt;', '>')
             .replaceAll('&#34;', '"')
@@ -37,7 +27,12 @@ class Em {
             .replaceAll('&quot;', '"')
             .replaceAll('&apos;', "'")
             .replaceAll('&nbsp;', " ")
-        .replaceAll('&amp;', "&")
+            .replaceAll('&amp;', "&");
-        .replaceAll('&#x27;', "'");
+        Map map = {'type': 'text', 'text': str};
+        res.add(map);
+      }
+      return str;
+    });
+    return res;
   }
 }

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:
@@ -865,11 +857,10 @@ packages:
   media_kit:
     dependency: "direct main"
     description:
-      path: media_kit
+      name: media_kit
-      ref: HEAD
+      sha256: "3289062540e3b8b9746e5c50d95bd78a9289826b7227e253dff806d002b9e67a"
-      resolved-ref: "77a130b1d7ce733b47d2133b57563716090450d0"
+      url: "https://pub.flutter-io.cn"
-      url: "https://github.com/media-kit/media-kit.git"
+    source: hosted
-    source: git
     version: "1.1.10+1"
   media_kit_libs_android_video:
     dependency: transitive
@@ -906,11 +897,10 @@ packages:
   media_kit_libs_video:
     dependency: "direct main"
     description:
-      path: "libs/universal/media_kit_libs_video"
+      name: media_kit_libs_video
-      ref: HEAD
+      sha256: "3688e0c31482074578652bf038ce6301a5d21e1eda6b54fc3117ffeb4bdba067"
-      resolved-ref: "77a130b1d7ce733b47d2133b57563716090450d0"
+      url: "https://pub.flutter-io.cn"
-      url: "https://github.com/media-kit/media-kit.git"
+    source: hosted
-    source: git
     version: "1.0.4"
   media_kit_libs_windows_video:
     dependency: transitive
@@ -931,11 +921,10 @@ packages:
   media_kit_video:
     dependency: "direct main"
     description:
-      path: media_kit_video
+      name: media_kit_video
-      ref: HEAD
+      sha256: c048d11a19e379aebbe810647636e3fc6d18374637e2ae12def4ff8a4b99a882
-      resolved-ref: "77a130b1d7ce733b47d2133b57563716090450d0"
+      url: "https://pub.flutter-io.cn"
-      url: "https://github.com/media-kit/media-kit.git"
+    source: hosted
-    source: git
     version: "1.2.4"
   meta:
     dependency: transitive

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:
@@ -163,20 +161,6 @@ dev_dependencies:
   hive_generator: ^2.0.0
   build_runner: ^2.4.8
 
-dependency_overrides:
-  media_kit:
-    git:
-      url: https://github.com/media-kit/media-kit.git
-      path: media_kit
-  media_kit_video:
-    git:
-      url: https://github.com/media-kit/media-kit.git
-      path: media_kit_video
-  media_kit_libs_video:
-    git:
-      url: https://github.com/media-kit/media-kit.git
-      path: libs/universal/media_kit_libs_video
-
 flutter_launcher_icons:
   android: true
   ios: true