From a6a086fea3577ab4508fdf03e4630cd1b8985a46 Mon Sep 17 00:00:00 2001 From: xkeyC <3334969096@qq.com> Date: Sat, 24 Feb 2024 17:55:03 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=A8=A1=E5=9D=97=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E6=8C=87=E7=A4=BA=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/ui/home/downloads/downloads_ui.dart | 42 +++++++++++++++---- lib/ui/home/downloads/downloads_ui_model.dart | 5 ++- 2 files changed, 37 insertions(+), 10 deletions(-) diff --git a/lib/ui/home/downloads/downloads_ui.dart b/lib/ui/home/downloads/downloads_ui.dart index ae190f1..135c45b 100644 --- a/lib/ui/home/downloads/downloads_ui.dart +++ b/lib/ui/home/downloads/downloads_ui.dart @@ -2,6 +2,7 @@ import 'package:file_sizes/file_sizes.dart'; import 'package:intl/intl.dart'; import 'package:starcitizen_doctor/base/ui.dart'; import 'package:starcitizen_doctor/base/ui_model.dart'; +import 'package:starcitizen_doctor/common/io/aria2c.dart'; import 'downloads_ui_model.dart'; @@ -12,19 +13,22 @@ class DownloadsUI extends BaseUI { Widget? buildBody(BuildContext context, DownloadsUIModel model) { return makeDefaultPage(context, model, content: Column( + crossAxisAlignment: CrossAxisAlignment.start, children: [ const SizedBox(height: 12), Row( children: [ const Spacer(), const SizedBox(width: 24), + const SizedBox(width: 12), for (final item in , String>{ const MapEntry("settings", FluentIcons.settings): "限速设置", if (model.tasks.isNotEmpty) - const MapEntry("pause_all", FluentIcons.pause): "暂停全部" - else + const MapEntry("pause_all", FluentIcons.pause): "全部暂停", + if (model.waitingTasks.isNotEmpty) const MapEntry("resume_all", FluentIcons.download): "恢复全部", - const MapEntry("cancel_all", FluentIcons.cancel): "取消全部", + if (model.tasks.isNotEmpty || model.waitingTasks.isNotEmpty) + const MapEntry("cancel_all", FluentIcons.cancel): "全部取消", }.entries) Padding( padding: const EdgeInsets.only(left: 6, right: 6), @@ -79,11 +83,6 @@ class DownloadsUI extends BaseUI { fontSize: 24, fontWeight: FontWeight.bold), ), - if (type == "active") - Text( - "下载: ${FileSize.getSize(model.globalStat?.downloadSpeed ?? 0)}/s 上传:${FileSize.getSize(model.globalStat?.uploadSpeed ?? 0)}/s", - style: const TextStyle(fontSize: 13), - ), ], )), ], @@ -213,7 +212,32 @@ class DownloadsUI extends BaseUI { ); }, itemCount: model.getTasksLen(), - )) + )), + Container( + color: FluentTheme.of(context).cardColor.withOpacity(.06), + child: Padding( + padding: const EdgeInsets.only(left: 12, bottom: 3, top: 3), + child: Row( + children: [ + Container( + width: 8, + height: 8, + decoration: BoxDecoration( + color: Aria2cManager.isAvailable + ? Colors.green + : Colors.white, + borderRadius: BorderRadius.circular(1000), + ), + ), + const SizedBox(width: 12), + Text( + "下载: ${FileSize.getSize(model.globalStat?.downloadSpeed ?? 0)}/s 上传:${FileSize.getSize(model.globalStat?.uploadSpeed ?? 0)}/s", + style: const TextStyle(fontSize: 12), + ) + ], + ), + ), + ), ], )); } diff --git a/lib/ui/home/downloads/downloads_ui_model.dart b/lib/ui/home/downloads/downloads_ui_model.dart index 388d9d0..554ccf2 100644 --- a/lib/ui/home/downloads/downloads_ui_model.dart +++ b/lib/ui/home/downloads/downloads_ui_model.dart @@ -39,11 +39,12 @@ class DownloadsUIModel extends BaseUIModel { case "pause_all": if (!Aria2cManager.isAvailable) return; await Aria2cManager.getClient().pauseAll(); + await Aria2cManager.getClient().saveSession(); return; case "resume_all": if (!Aria2cManager.isAvailable) return; - await Aria2cManager.getClient().unpauseAll(); + await Aria2cManager.getClient().saveSession(); return; case "cancel_all": final userOK = await showConfirmDialogs( @@ -54,6 +55,7 @@ class DownloadsUIModel extends BaseUIModel { for (var value in [...tasks, ...waitingTasks]) { await Aria2cManager.getClient().remove(value.gid!); } + await Aria2cManager.getClient().saveSession(); } catch (e) { dPrint("DownloadsUIModel cancel_all Error: $e"); } @@ -241,6 +243,7 @@ class DownloadsUIModel extends BaseUIModel { if (r != null) { await box.put('downloader_up_limit', upCtrl.text.trim()); await box.put('downloader_down_limit', downCtrl.text.trim()); + notifyListeners(); } } }