feat: 新增定时关闭

Author: lyy

CHANGELOG.md

@@ -1,8 +1,10 @@
-## 1.0.2
+## 1.1.0
 
 - [feat] 新增数据导入导出
 - [feat] 歌单源完善，支持自定义文件
 - [feat] 播放列表添加高亮选中
+- [feat] 新增定时关闭
+- [feat] 云同步功能完善
 
 ## 1.0.1
 

lib/modules/player/card.dart

@@ -1,6 +1,7 @@
 import 'dart:async';
 
 import 'package:bbmusic/modules/download/model.dart';
+import 'package:bot_toast/bot_toast.dart';
 import 'package:cached_network_image/cached_network_image.dart';
 import 'package:flutter/material.dart';
 import 'package:bbmusic/modules/player/player.dart';
@@ -65,7 +66,7 @@ class PlayerCard extends StatelessWidget {
                       ),
               ),
               const SizedBox(height: 10),
-              // 下载，添加到歌单
+              // 下载，定时播放
               Row(
                 mainAxisAlignment: MainAxisAlignment.center,
                 children: [
@@ -84,7 +85,9 @@ class PlayerCard extends StatelessWidget {
                     message: "定时关闭",
                     child: IconButton(
                       iconSize: 30,
-                      onPressed: () {},
+                      onPressed: () {
+                        autoClose(context);
+                      },
                       icon: const Icon(Icons.alarm),
                     ),
                   )
@@ -200,3 +203,72 @@ class _PlayerProgressState extends State<PlayerProgress> {
     });
   }
 }
+
+class AutoCloseItem {
+  final String label;
+  final Duration value;
+
+  AutoCloseItem({required this.label, required this.value});
+}
+
+final List<AutoCloseItem> AutoCloseList = [
+  AutoCloseItem(label: "1 分钟", value: const Duration(minutes: 1)),
+  AutoCloseItem(label: "5 分钟", value: const Duration(minutes: 5)),
+  AutoCloseItem(label: "10 分钟", value: const Duration(minutes: 10)),
+  AutoCloseItem(label: "15 分钟", value: const Duration(minutes: 15)),
+  AutoCloseItem(label: "30 分钟", value: const Duration(minutes: 30)),
+  AutoCloseItem(label: "60 分钟", value: const Duration(minutes: 60)),
+];
+
+// 定时关闭
+autoClose(BuildContext context) {
+  showModalBottomSheet(
+    context: context,
+    showDragHandle: true,
+    builder: (BuildContext ctx) {
+      return SafeArea(
+        bottom: true,
+        child: Container(
+          color: Theme.of(context).cardTheme.color,
+          padding: const EdgeInsets.all(10),
+          height: 180,
+          width: double.infinity,
+          child: Column(
+            children: [
+              Wrap(
+                spacing: 10,
+                runSpacing: 18,
+                children: AutoCloseList.map((item) {
+                  return OutlinedButton(
+                    child: Text(item.label),
+                    onPressed: () {
+                      Navigator.of(context).pop();
+                      BotToast.showText(text: "${item.label}后自动关闭");
+                      Provider.of<PlayerModel>(context, listen: false)
+                          .autoCloseHandler(item.value);
+                    },
+                  );
+                }).toList(),
+              ),
+              const SizedBox(height: 20),
+              Row(
+                mainAxisAlignment: MainAxisAlignment.center,
+                children: [
+                  Consumer<PlayerModel>(builder: (context, player, child) {
+                    return Checkbox(
+                      value: player.playDoneAutoClose,
+                      onChanged: (e) {
+                        player.togglePlayDoneAutoClose();
+                      },
+                    );
+                  }),
+                  const Text("当前歌曲播放完成后再关闭"),
+                ],
+              ),
+            ],
+          ),
+        ),
+      );
+    },
+  );
+}

lib/modules/player/instance.dart

@@ -37,7 +37,12 @@ class BBPlayer {
   // 播放模式
   PlayerMode playerMode = PlayerMode.listLoop;
 
+  late AutoCloseMusic autoClose;
+
   Future<void> init() async {
+    autoClose = AutoCloseMusic(onPause: () {
+      pause();
+    });
     await _initLocalStorage();
     var throttleEndNext = Throttle(const Duration(seconds: 1));
 
@@ -51,7 +56,13 @@ class BBPlayer {
       }
       if (state.processingState == ProcessingState.completed) {
         // 会重复触发，添加节流方法
-        throttleEndNext.call(() => endNext());
+        throttleEndNext.call(() {
+          if (autoClose.isPlayDoneAutoClose) {
+            autoClose.isPlayDoneAutoClose = false;
+            return pause();
+          }
+          return endNext();
+        });
       }
       // notifyListeners();
     });
@@ -406,3 +417,49 @@ class BBPlayer {
     // notifyListeners();
   }
 }
+
+/// 定时关闭
+class AutoCloseMusic {
+  bool openPlayDoneAutoClose = false; // 是否开启等待播放完成后再关闭
+  bool isPlayDoneAutoClose = false;
+  DateTime? closeTime;
+  Timer? autoCloseTimer;
+
+  final Function onPause;
+
+  AutoCloseMusic({
+    required this.onPause,
+  });
+
+  void togglePlayDoneAutoClose() {
+    openPlayDoneAutoClose = !openPlayDoneAutoClose;
+  }
+
+  // 自动关闭
+  void close(Duration duration) {
+    isPlayDoneAutoClose = false;
+    if (autoCloseTimer != null) {
+      autoCloseTimer!.cancel();
+    }
+
+    // 设置时间为 5 min 后
+    final now = DateTime.now();
+    closeTime = now.add(duration);
+
+    autoCloseTimer = Timer(duration, () {
+      if (openPlayDoneAutoClose) {
+        isPlayDoneAutoClose = true;
+      } else {
+        onPause();
+      }
+    });
+  }
+
+  void cancel() {
+    closeTime = null;
+    isPlayDoneAutoClose = false;
+    if (autoCloseTimer != null) {
+      autoCloseTimer!.cancel();
+    }
+  }
+}

lib/modules/player/model.dart

@@ -96,6 +96,19 @@ class PlayerModel extends ChangeNotifier {
     notifyListeners();
   }
 
+  void togglePlayDoneAutoClose() {
+    _playerHandler?.player.autoClose.togglePlayDoneAutoClose();
+    notifyListeners();
+  }
+
+  get playDoneAutoClose {
+    return _playerHandler?.player.autoClose.openPlayDoneAutoClose ?? false;
+  }
+
+  autoCloseHandler(Duration duration) {
+    return _playerHandler?.player.autoClose.close(duration);
+  }
+
   // 监听播放进度
   StreamSubscription<Duration>? listenPosition(
     void Function(Duration)? onData,

lib/modules/user_music_order/github/github.dart

@@ -59,10 +59,32 @@ class UserMusicOrderForGithub implements UserMusicOrderOrigin {
     }
   }
 
+  // 判断文件是否存在，不存在则创建
+  _initFile() async {
+    try {
+      await dio.get(_path.toString(), queryParameters: {'ref': branch});
+    } catch (e) {
+      if (e is DioException) {
+        if ((e).response?.statusCode == 404) {
+          // 没有则文件创建
+          try {
+            await _update([], '创建歌单文件', '');
+          } catch (e) {
+            BotToast.showText(text: "创建文件失败");
+            return Future.error(e);
+          }
+        }
+      }
+
+      return Future.error(e);
+    }
+  }
+
   Future<GithubFile> _loadData() async {
     Map<String, String> query = {'ref': branch};
+    Response<dynamic>? response;
     try {
-      final response = await dio.get(_path.toString(), queryParameters: query);
+      response = await dio.get(_path.toString(), queryParameters: query);
       final res = GithubFile.fromJson(response.data);
       return res;
     } catch (e) {
@@ -130,6 +152,7 @@ class UserMusicOrderForGithub implements UserMusicOrderOrigin {
       return [];
     }
     try {
+      await _initFile();
       final res = await _loadData();
       return res.content;
     } catch (e) {

lib/modules/user_music_order/github/types.dart

@@ -73,7 +73,7 @@ List<MusicOrderItem> decodeGithubFileContent(String content) {
   final contentRaw = content.replaceAll('\n', '');
   // base 64 解码
   String raw = Utf8Decoder().convert(base64Decode(contentRaw));
-  final data = json.decode(raw);
+  final data = json.decode(raw.trim().isEmpty ? '[]' : raw);
   List<MusicOrderItem> list = [];
   for (var item in data) {
     list.add(

pubspec.yaml

@@ -2,7 +2,7 @@ name: bbmusic
 description: '哔哔音乐，听歌自由'
 publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 
-version: 1.0.2+4
+version: 1.1.0+5
 
 environment:
   sdk: '>=3.3.1 <4.0.0'