opt set shader

opt refresh player

Signed-off-by: dom <githubaccount56556@proton.me>

lib/common/widgets/dialog/export_import.dart

@@ -211,7 +211,6 @@ void importFromInput<T>(
 Future<void> showImportExportDialog<T>(
   BuildContext context, {
   required String title,
-  String? label,
   required ValueGetter<String> onExport,
   required FutureOr<void> Function(T json) onImport,
   required ValueGetter<String> localFileName,

lib/http/download.dart

@@ -161,6 +161,7 @@ abstract final class DownloadHttp {
               dashDrmType: 0,
             ),
           ];
+          entry.hasDashAudio = true;
         }
         return Type2(
           duration: dash.duration!,

lib/models_new/download/bili_download_entry_info.dart

@@ -7,7 +7,7 @@ import 'package:get/route_manager.dart';
 
 class BiliDownloadEntryInfo with MultiSelectData {
   int mediaType;
-  final bool hasDashAudio;
+  bool hasDashAudio;
   bool isCompleted;
   int totalBytes;
   int downloadedBytes;

lib/pages/about/view.dart

@@ -267,7 +267,6 @@ Commit Hash: ${BuildConfig.commitHash}''',
               context,
               title: '设置',
               localFileName: () => 'setting_${context.platformName}',
-              label: GStorage.setting.name,
               onExport: GStorage.exportAllSettings,
               onImport: GStorage.importAllJsonSettings,
             ),

lib/pages/my_reply/view.dart

@@ -37,10 +37,9 @@ class _MyReplyState extends State<MyReply> with DynMixin {
   }
 
   void _initReply() {
-    _replies.assignAll(
+    _replies
-      GStorage.reply!.values.map(ReplyInfo.fromBuffer).toList()
+      ..assignAll(GStorage.reply!.values.map(ReplyInfo.fromBuffer))
-        ..sort((a, b) => b.ctime.compareTo(a.ctime)), // rpid not aligned
+      ..sort((a, b) => b.ctime.compareTo(a.ctime)); // rpid not aligned;
-    );
   }
 
   @override

lib/pages/save_panel/view.dart

@@ -336,55 +336,53 @@ class _SavePanelState extends State<SavePanel> {
     final padding = MediaQuery.viewPaddingOf(context);
     final maxWidth = context.mediaQueryShortestSide;
     late final coverSize = MediaQuery.textScalerOf(context).scale(65);
-    return GestureDetector(
+    return Stack(
-      behavior: HitTestBehavior.opaque,
+      clipBehavior: .none,
-      onTap: Get.back,
+      alignment: .center,
-      child: Stack(
-        clipBehavior: Clip.none,
-        alignment: Alignment.center,
       children: [
         SingleChildScrollView(
-            padding: EdgeInsets.only(
+          hitTestBehavior: .deferToChild,
+          padding: .only(
             top: 12 + padding.top,
             bottom: 80 + padding.bottom,
           ),
-            child: Listener(
           child: Container(
             width: maxWidth,
-                padding: const EdgeInsets.symmetric(horizontal: 12),
+            padding: const .symmetric(horizontal: 12),
             child: RepaintBoundary(
               key: boundaryKey,
               child: Container(
-                    clipBehavior: Clip.hardEdge,
+                clipBehavior: .hardEdge,
                 decoration: BoxDecoration(
                   color: theme.colorScheme.surface,
                   borderRadius: const .all(.circular(12)),
                 ),
                 child: AnimatedSize(
                   curve: Curves.easeInOut,
-                      alignment: Alignment.topCenter,
+                  alignment: .topCenter,
                   duration: const Duration(milliseconds: 255),
                   child: Column(
-                        mainAxisSize: MainAxisSize.min,
+                    mainAxisSize: .min,
-                        crossAxisAlignment: CrossAxisAlignment.start,
+                    crossAxisAlignment: .start,
                     children: [
-                          if (_item case final ReplyInfo reply)
+                      switch (_item) {
-                            IgnorePointer(
+                        ReplyInfo reply => IgnorePointer(
                           child: ReplyItemGrpc(
                             replyItem: reply,
                             replyLevel: 0,
                             needDivider: false,
                             upMid: widget.upMid,
                           ),
-                            )
+                        ),
-                          else if (_item case final DynamicItemModel dyn)
+                        DynamicItemModel dyn => IgnorePointer(
-                            IgnorePointer(
                           child: DynamicPanel(
                             item: dyn,
                             isDetail: true,
                             isSave: true,
                           ),
                         ),
+                        _ => throw UnsupportedError(_item.toString()),
+                      },
                       if (cover?.isNotEmpty == true &&
                           title?.isNotEmpty == true)
                         Container(
@@ -397,29 +395,29 @@ class _SavePanelState extends State<SavePanel> {
                             borderRadius: const .all(.circular(8)),
                           ),
                           child: Row(
+                            spacing: 10,
                             children: [
                               NetworkImgLayer(
                                 src: cover!,
                                 height: coverSize,
                                 width: coverType == .def16_9
-                                        ? coverSize *
+                                    ? coverSize * StyleString.aspectRatio16x9
-                                              StyleString.aspectRatio16x9
                                     : coverSize,
                                 quality: 100,
                                 borderRadius: const .all(.circular(6)),
                               ),
-                                  const SizedBox(width: 10),
                               Expanded(
                                 child: Column(
                                   crossAxisAlignment: .start,
                                   children: [
-                                        Text(
+                                    Expanded(
+                                      child: Text(
                                         '$title\n',
                                         maxLines: 2,
                                         overflow: .ellipsis,
                                       ),
-                                        if (pubdate != null) ...[
+                                    ),
-                                          const Spacer(),
+                                    if (pubdate != null)
                                       Text(
                                         DateFormatUtils.format(
                                           pubdate,
@@ -430,7 +428,6 @@ class _SavePanelState extends State<SavePanel> {
                                         ),
                                       ),
                                   ],
-                                      ],
                                 ),
                               ),
                             ],
@@ -438,18 +435,17 @@ class _SavePanelState extends State<SavePanel> {
                         ),
                       showBottom
                           ? Stack(
-                                  clipBehavior: Clip.none,
+                              clipBehavior: .none,
                               children: [
                                 if (uri.isNotEmpty)
                                   Align(
-                                        alignment: Alignment.centerRight,
+                                    alignment: .centerRight,
                                     child: Row(
                                       children: [
                                         Expanded(
                                           child: Column(
-                                                mainAxisSize: MainAxisSize.min,
+                                            mainAxisSize: .min,
-                                                crossAxisAlignment:
+                                            crossAxisAlignment: .end,
-                                                    CrossAxisAlignment.end,
                                             spacing: 4,
                                             children: [
                                               if (uname?.isNotEmpty == true)
@@ -465,7 +461,7 @@ class _SavePanelState extends State<SavePanel> {
                                                 ),
                                               Text(
                                                 '识别二维码，$viewType$itemType',
-                                                    textAlign: TextAlign.end,
+                                                textAlign: .end,
                                                 style: TextStyle(
                                                   color: theme
                                                       .colorScheme
@@ -475,12 +471,11 @@ class _SavePanelState extends State<SavePanel> {
                                               Text(
                                                 DateFormatUtils.longFormatDs
                                                     .format(.now()),
-                                                    textAlign: TextAlign.end,
+                                                textAlign: .end,
                                                 style: TextStyle(
                                                   fontSize: 13,
-                                                      color: theme
+                                                  color:
-                                                          .colorScheme
+                                                      theme.colorScheme.outline,
-                                                          .outline,
                                                 ),
                                               ),
                                             ],
@@ -510,13 +505,12 @@ class _SavePanelState extends State<SavePanel> {
                                     ),
                                   ),
                                 Align(
-                                      alignment: Alignment.centerLeft,
+                                  alignment: .centerLeft,
                                   child: Image.asset(
                                     'assets/images/logo/logo_2.png',
                                     width: 100,
                                     cacheWidth: 100.cacheSize(context),
-                                        color:
+                                    color: theme.colorScheme.onSurfaceVariant,
-                                            theme.colorScheme.onSurfaceVariant,
                                   ),
                                 ),
                               ],
@@ -529,7 +523,6 @@ class _SavePanelState extends State<SavePanel> {
             ),
           ),
         ),
-          ),
         Positioned(
           left: 0,
           right: 0,
@@ -537,8 +530,8 @@ class _SavePanelState extends State<SavePanel> {
           child: DecoratedBox(
             decoration: const BoxDecoration(
               gradient: LinearGradient(
-                  begin: Alignment.topCenter,
+                begin: .topCenter,
-                  end: Alignment.bottomCenter,
+                end: .bottomCenter,
                 colors: [
                   Colors.transparent,
                   Colors.black54,
@@ -553,7 +546,7 @@ class _SavePanelState extends State<SavePanel> {
               ),
               child: Row(
                 spacing: 40,
-                  mainAxisAlignment: MainAxisAlignment.center,
+                mainAxisAlignment: .center,
                 children: [
                   iconButton(
                     size: 42,
@@ -595,7 +588,6 @@ class _SavePanelState extends State<SavePanel> {
           ),
         ),
       ],
-      ),
     );
   }
 }

lib/pages/video/controller.dart

@@ -663,7 +663,9 @@ class VideoDetailController extends GetxController
             (isFileSource
                 ? true
                 : videoPlayerKey.currentState?.mounted == true)) {
-      return playerInit(autoFullScreenFlag: autoFullScreenFlag);
+      return playerInit(
+        autoFullScreenFlag: autoFullScreenFlag && _autoPlay.value,
+      );
     }
     return null;
   }
@@ -687,6 +689,7 @@ class VideoDetailController extends GetxController
               dir: args['dirPath'],
               typeTag: entry.typeTag!,
               isMp4: entry.mediaType == 1,
+              hasDashAudio: entry.hasDashAudio,
             )
           : NetworkSource(
               videoSource: video ?? videoUrl!,

lib/pages/video/view.dart

@@ -309,13 +309,17 @@ class _VideoDetailPageVState extends State<VideoDetailPageV>
         return null;
       }
     }
-    plPlayerController = videoDetailController.plPlayerController;
+    final plPlayerController = this.plPlayerController =
+        videoDetailController.plPlayerController;
     videoDetailController.autoPlay = true;
-    plPlayerController!
+    plPlayerController
       ..addStatusLister(playerListener)
       ..addPositionListener(positionListener);
-    if (videoDetailController.plPlayerController.preInitPlayer) {
+    if (plPlayerController.preInitPlayer) {
-      return plPlayerController!.play();
+      if (plPlayerController.autoEnterFullScreen) {
+        plPlayerController.triggerFullScreen();
+      }
+      return plPlayerController.play();
     } else {
       return videoDetailController.playerInit(
         autoplay: true,

lib/plugin/pl_player/controller.dart

@@ -34,7 +34,6 @@ import 'package:PiliPlus/utils/accounts.dart';
 import 'package:PiliPlus/utils/asset_utils.dart';
 import 'package:PiliPlus/utils/extension/box_ext.dart';
 import 'package:PiliPlus/utils/extension/num_ext.dart';
-import 'package:PiliPlus/utils/extension/string_ext.dart';
 import 'package:PiliPlus/utils/feed_back.dart';
 import 'package:PiliPlus/utils/image_utils.dart';
 import 'package:PiliPlus/utils/page_utils.dart';
@@ -369,7 +368,7 @@ class PlPlayerController with BlockConfigMixin {
   late final showFsLockBtn = Pref.showFsLockBtn;
   late final keyboardControl = Pref.keyboardControl;
 
-  late final bool _autoEnterFullScreen = Pref.autoEnterFullScreen;
+  late final bool autoEnterFullScreen = Pref.autoEnterFullScreen;
   late final bool autoExitFullscreen = Pref.autoExitFullscreen;
   late final bool autoPlayEnable = Pref.autoPlayEnable;
   late final bool enableVerticalExpand = Pref.enableVerticalExpand;
@@ -630,7 +629,7 @@ class PlPlayerController with BlockConfigMixin {
       // 数据加载完成
       dataStatus.value = DataStatus.loaded;
 
-      if (autoFullScreenFlag && _autoEnterFullScreen) {
+      if (autoFullScreenFlag && autoEnterFullScreen) {
         triggerFullScreen(status: true);
       }
 
@@ -774,9 +773,10 @@ class PlPlayerController with BlockConfigMixin {
         return;
       }
       _videoPlayerController = player;
+      if (isAnim && superResolutionType.value != .disable) {
+        await setShader();
+      }
     }
-
-    if (isAnim) await setShader();
 
     final Map<String, String> extras = {};
 
@@ -788,8 +788,6 @@ class PlPlayerController with BlockConfigMixin {
         extras['audio-files'] =
             '"${Platform.isWindows ? audio.replaceAll(';', r'\;') : audio.replaceAll(':', r'\:')}"';
       }
-    }
-
       if (kDebugMode || Platform.isAndroid) {
         String audioNormalization = AudioNormalization.getParamFromConfig(
           Pref.audioNormalization,
@@ -817,6 +815,7 @@ class PlPlayerController with BlockConfigMixin {
           extras['lavfi-complex'] = '"[aid1] $audioNormalization [ao]"';
         }
       }
+    }
 
     await player.open(
       Media(
@@ -828,38 +827,17 @@ class PlPlayerController with BlockConfigMixin {
     );
   }
 
-  Future<bool> refreshPlayer() async {
+  Future<void>? refreshPlayer() {
     if (dataSource is FileSource) {
-      return true;
+      return null;
     }
-    if (_videoPlayerController == null) {
+    if (_videoPlayerController?.current.isNotEmpty ?? false) {
-      // SmartDialog.showToast('视频播放器为空，请重新进入本页面');
+      return _videoPlayerController!.open(
-      return false;
+        _videoPlayerController!.current.last.copyWith(start: position),
-    }
-    if (dataSource.videoSource.isNullOrEmpty) {
-      SmartDialog.showToast('视频源为空，请重新进入本页面');
-      return false;
-    }
-    String? audioUri;
-    if (!isLive) {
-      if (dataSource.audioSource.isNullOrEmpty) {
-        SmartDialog.showToast('音频源为空');
-      } else {
-        audioUri = Platform.isWindows
-            ? dataSource.audioSource!.replaceAll(';', '\\;')
-            : dataSource.audioSource!.replaceAll(':', '\\:');
-      }
-    }
-    await _videoPlayerController!.open(
-      Media(
-        dataSource.videoSource,
-        start: position,
-        extras: audioUri == null ? null : {'audio-files': '"$audioUri"'},
-      ),
         play: true,
       );
-    return true;
+    }
-    // seekTo(currentPos);
+    return null;
   }
 
   // 开始播放
@@ -1000,7 +978,7 @@ class PlPlayerController with BlockConfigMixin {
             'controllerStream.error.listen',
             const Duration(milliseconds: 10000),
             () {
-              Future.delayed(const Duration(milliseconds: 3000), () async {
+              Future.delayed(const Duration(milliseconds: 3000), () {
                 // if (kDebugMode) {
                 //   debugPrint("isBuffering.value: ${isBuffering.value}");
                 // }
@@ -1012,9 +990,7 @@ class PlPlayerController with BlockConfigMixin {
                     '视频链接打开失败，重试中',
                     displayTime: const Duration(milliseconds: 500),
                   );
-                  if (!await refreshPlayer()) {
+                  refreshPlayer();
-                    if (kDebugMode) debugPrint("failed");
-                  }
                 }
               });
             },

lib/plugin/pl_player/models/data_source.dart

@@ -25,6 +25,7 @@ class FileSource extends DataSource {
   FileSource({
     required this.dir,
     required this.isMp4,
+    required bool hasDashAudio,
     required String typeTag,
   }) : super(
          videoSource: path.join(
@@ -32,7 +33,7 @@ class FileSource extends DataSource {
            typeTag,
            isMp4 ? PathUtils.videoNameType1 : PathUtils.videoNameType2,
          ),
-         audioSource: isMp4
+         audioSource: isMp4 || !hasDashAudio
              ? null
              : path.join(dir, typeTag, PathUtils.audioNameType2),
        );

lib/services/download/download_service.dart

@@ -138,7 +138,7 @@ class DownloadService extends GetxService {
     final currentTime = DateTime.now().millisecondsSinceEpoch ~/ 1000;
     final entry = BiliDownloadEntryInfo(
       mediaType: 2,
-      hasDashAudio: true,
+      hasDashAudio: false,
       isCompleted: false,
       totalBytes: 0,
       downloadedBytes: 0,
@@ -206,7 +206,7 @@ class DownloadService extends GetxService {
     );
     final entry = BiliDownloadEntryInfo(
       mediaType: 2,
-      hasDashAudio: true,
+      hasDashAudio: false,
       isCompleted: false,
       totalBytes: 0,
       downloadedBytes: 0,