diff --git a/lib/main.dart b/lib/main.dart index 94f6fd329..1b660c8c2 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -368,14 +368,12 @@ class MyApp extends StatelessWidget { } class _CustomHttpOverrides extends HttpOverrides { - final badCertificateCallback = kDebugMode || Pref.badCertificateCallback; - @override HttpClient createHttpClient(SecurityContext? context) { final client = super.createHttpClient(context) // ..maxConnectionsPerHost = 32 ..idleTimeout = const Duration(seconds: 15); - if (badCertificateCallback) { + if (kDebugMode || Pref.badCertificateCallback) { client.badCertificateCallback = (cert, host, port) => true; } return client; diff --git a/lib/utils/image_utils.dart b/lib/utils/image_utils.dart index cd9ba0896..733e0e0a5 100644 --- a/lib/utils/image_utils.dart +++ b/lib/utils/image_utils.dart @@ -23,6 +23,7 @@ abstract class ImageUtils { static String get time => DateFormat('yyyy-MM-dd_HH-mm-ss').format(DateTime.now()); static bool silentDownImg = Pref.silentDownImg; + static const _androidRelativePath = 'Pictures/${Constants.appName}'; // 图片分享 static Future onShareImg(String url) async { @@ -201,11 +202,16 @@ abstract class ImageUtils { del: true, ); } else { - return (filePath: file.path, name: name, statusCode: 200, del: false); + return ( + filePath: file.path, + name: name, + statusCode: 200, + del: false, + ); } }); final result = await Future.wait(futures, eagerError: true); - if (Platform.isAndroid) { + if (Utils.isMobile) { final delList = []; final saveList = []; for (var i in result) { @@ -215,7 +221,7 @@ abstract class ImageUtils { SaveFileData( filePath: i.filePath, fileName: i.name, - androidRelativePath: 'Pictures/${Constants.appName}', + androidRelativePath: _androidRelativePath, ), ); } @@ -291,7 +297,7 @@ abstract class ImageUtils { result = await SaverGallery.saveImage( bytes, fileName: fileName, - androidRelativePath: "Pictures/${Constants.appName}", + androidRelativePath: _androidRelativePath, skipIfExists: false, ); SmartDialog.dismiss(); @@ -334,7 +340,7 @@ abstract class ImageUtils { result = await SaverGallery.saveFile( filePath: filePath, fileName: fileName, - androidRelativePath: "Pictures/${Constants.appName}", + androidRelativePath: _androidRelativePath, skipIfExists: false, ); if (del) file.tryDel();