From 7867af0f854c1ed76237fbf4b3933b312d1e2a0c Mon Sep 17 00:00:00 2001
From: guozhigq <guozhigq@outlook.com>
Date: Tue, 12 Sep 2023 00:11:16 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=9B=BE=E7=89=87=E4=BF=9D=E5=AD=98?=
 =?UTF-8?q?=E5=88=B0PiliPala=E7=9B=AE=E5=BD=95(Android)=20issues=20#94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/utils/download.dart | 43 ++++++++++++++++++++++++-----------------
 pubspec.lock            | 16 +++++++--------
 pubspec.yaml            |  2 +-
 3 files changed, 34 insertions(+), 27 deletions(-)

diff --git a/lib/utils/download.dart b/lib/utils/download.dart
index ae89ef04..ad008f6d 100644
--- a/lib/utils/download.dart
+++ b/lib/utils/download.dart
@@ -2,8 +2,8 @@ import 'dart:typed_data';
 
 import 'package:dio/dio.dart';
 import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
-import 'package:image_gallery_saver/image_gallery_saver.dart';
 import 'package:permission_handler/permission_handler.dart';
+import 'package:saver_gallery/saver_gallery.dart';
 
 class DownloadUtils {
   // 获取存储权限
@@ -15,25 +15,32 @@ class DownloadUtils {
     statuses[Permission.storage].toString();
   }
 
-  static Future<bool> downloadImg(String imgUrl) async {
-    await requestStoragePer();
-    SmartDialog.showLoading(msg: '保存中');
-    var response = await Dio()
-        .get(imgUrl, options: Options(responseType: ResponseType.bytes));
-    String picName =
-        "plpl_cover_${DateTime.now().toString().split('-').join()}.png";
-    final result = await ImageGallerySaver.saveImage(
-      Uint8List.fromList(response.data),
-      quality: 100,
-      name: picName,
-    );
-    SmartDialog.dismiss();
-    if (result != null) {
-      if (result['isSuccess']) {
-        // ignore: avoid_print
+  static Future<bool> downloadImg(String imgUrl,
+      {String imgType = 'cover'}) async {
+    try {
+      await requestStoragePer();
+      SmartDialog.showLoading(msg: '保存中');
+      var response = await Dio()
+          .get(imgUrl, options: Options(responseType: ResponseType.bytes));
+      String picName =
+          "plpl_${imgType}_${DateTime.now().toString().split('-').join()}";
+      final SaveResult result = await SaverGallery.saveImage(
+        Uint8List.fromList(response.data),
+        quality: 60,
+        name: picName,
+        // 保存到 PiliPala文件夹
+        androidRelativePath: "Pictures/PiliPala",
+        androidExistNotSave: false,
+      );
+      SmartDialog.dismiss();
+      if (result.isSuccess) {
         await SmartDialog.showToast('「$picName」已保存 ');
       }
+      return true;
+    } catch (err) {
+      SmartDialog.dismiss();
+      SmartDialog.showToast(err.toString());
+      return true;
     }
-    return true;
   }
 }
diff --git a/pubspec.lock b/pubspec.lock
index 834bb054..8d24387b 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -653,14 +653,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "4.0.17"
-  image_gallery_saver:
-    dependency: "direct main"
-    description:
-      name: image_gallery_saver
-      sha256: "0aba74216a4d9b0561510cb968015d56b701ba1bd94aace26aacdd8ae5761816"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.0.3"
   intl:
     dependency: transitive
     description:
@@ -1078,6 +1070,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.0.2"
+  saver_gallery:
+    dependency: "direct main"
+    description:
+      name: saver_gallery
+      sha256: "3131bba4257f69901437c0f1ebd692201ca5f34512d42667513a3802f1c171d1"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.1"
   screen_brightness:
     dependency: "direct main"
     description:
diff --git a/pubspec.yaml b/pubspec.yaml
index 2672cf63..464e5b46 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -49,7 +49,7 @@ dependencies:
   # 图片
   cached_network_image: ^3.2.3
   extended_image: ^8.0.2
-  image_gallery_saver: ^2.0.3
+  saver_gallery: ^2.0.1
   
   # 存储
   path_provider: ^2.0.14