Merge branch 'develop' into main

BFWXKJGS · Jul 4, 2023 · be898ab · be898ab
2 parents 764c815 + c82cbab
commit be898ab
Show file tree

Hide file tree

Showing 19 changed files with 722 additions and 243 deletions.
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
@@ -2,6 +2,8 @@ PODS:
   - AliPlayerSDK_iOS (5.4.9.1-26507944):
     - AliPlayerSDK_iOS/AliPlayerSDK (= 5.4.9.1-26507944)
   - AliPlayerSDK_iOS/AliPlayerSDK (5.4.9.1-26507944)
+  - audioplayers_darwin (0.0.1):
+    - Flutter
   - Flutter (1.0.0)
   - flutter_aliplayer (0.0.1):
     - AliPlayerSDK_iOS (= 5.4.9.1-26507944)
@@ -22,7 +24,7 @@ PODS:
   - path_provider_foundation (0.0.1):
     - Flutter
     - FlutterMacOS
-  - permission_handler_apple (9.1.0):
+  - permission_handler_apple (9.1.1):
     - Flutter
   - screen_brightness_ios (0.1.0):
     - Flutter
@@ -42,6 +44,7 @@ PODS:
     - Flutter
 
 DEPENDENCIES:
+  - audioplayers_darwin (from `.symlinks/plugins/audioplayers_darwin/ios`)
   - Flutter (from `Flutter`)
   - flutter_aliplayer (from `.symlinks/plugins/flutter_aliplayer/ios`)
   - flutter_pdfview (from `.symlinks/plugins/flutter_pdfview/ios`)
@@ -65,6 +68,8 @@ SPEC REPOS:
     - MJExtension
 
 EXTERNAL SOURCES:
+  audioplayers_darwin:
+    :path: ".symlinks/plugins/audioplayers_darwin/ios"
   Flutter:
     :path: Flutter
   flutter_aliplayer:
@@ -98,6 +103,7 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   AliPlayerSDK_iOS: e6a135eea616e85e4aea6fde5aaa7c6afa258229
+  audioplayers_darwin: 877d9a4d06331c5c374595e46e16453ac7eafa40
   Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
   flutter_aliplayer: ade3b95c37b64e61b2f23a590937d8e61fe47bdc
   flutter_pdfview: 25f53dd6097661e6395b17de506e6060585946bd
@@ -107,9 +113,9 @@ SPEC CHECKSUMS:
   open_file: 02eb5cb6b21264bd3a696876f5afbfb7ca4f4b7d
   package_info_plus: 6c92f08e1f853dc01228d6f553146438dafcd14e
   path_provider_foundation: eaf5b3e458fc0e5fbb9940fb09980e853fe058b8
-  permission_handler_apple: 8f116445eff3c0e7c65ad60f5fef5490aa94b4e4
+  permission_handler_apple: e76247795d700c14ea09e3a2d8855d41ee80a2e6
   screen_brightness_ios: 715ca807df953bf676d339f11464e438143ee625
-  shared_preferences_foundation: e2dae3258e06f44cc55f49d42024fd8dd03c590c
+  shared_preferences_foundation: 5b919d13b803cadd15ed2dc053125c68730e5126
   sqflite: 31f7eba61e3074736dff8807a9b41581e4f7f15a
   url_launcher_ios: 08a3dfac5fb39e8759aeb0abbd5d9480f30fc8b4
   volume_controller: 531ddf792994285c9b17f9d8a7e4dcdd29b3eae9

diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj
@@ -398,6 +398,9 @@
 				INFOPLIST_FILE = Runner/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = ALClient;
 				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.utilities";
+				INFOPLIST_KEY_NSCameraUsageDescription = "拍照/拍视频上传功能需要您授予相机权限";
+				INFOPLIST_KEY_NSMicrophoneUsageDescription = "录视频/录音上传功能需要您授予麦克风权限";
+				INFOPLIST_KEY_NSPhotoLibraryUsageDescription = "上传图片/视频功能需要您授予相册访问权限";
 				INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
 				INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen;
 				INFOPLIST_KEY_UIMainStoryboardFile = Main;
@@ -538,6 +541,9 @@
 				INFOPLIST_FILE = Runner/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = ALClient;
 				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.utilities";
+				INFOPLIST_KEY_NSCameraUsageDescription = "拍照/拍视频上传功能需要您授予相机权限";
+				INFOPLIST_KEY_NSMicrophoneUsageDescription = "录视频/录音上传功能需要您授予麦克风权限";
+				INFOPLIST_KEY_NSPhotoLibraryUsageDescription = "上传图片/视频功能需要您授予相册访问权限";
 				INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
 				INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen;
 				INFOPLIST_KEY_UIMainStoryboardFile = Main;
@@ -570,6 +576,9 @@
 				INFOPLIST_FILE = Runner/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = ALClient;
 				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.utilities";
+				INFOPLIST_KEY_NSCameraUsageDescription = "拍照/拍视频上传功能需要您授予相机权限";
+				INFOPLIST_KEY_NSMicrophoneUsageDescription = "录视频/录音上传功能需要您授予麦克风权限";
+				INFOPLIST_KEY_NSPhotoLibraryUsageDescription = "上传图片/视频功能需要您授予相册访问权限";
 				INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
 				INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen;
 				INFOPLIST_KEY_UIMainStoryboardFile = Main;

diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist
@@ -23,11 +23,9 @@
 	<true/>
 	<key>UIApplicationSupportsIndirectInputEvents</key>
 	<true/>
-	<key>NSPhotoLibraryUsageDescription</key>
-	<string>上传图片/视频功能需要您授予相册访问权限</string>
-	<key>NSCameraUsageDescription</key>
-    <string>拍照/拍视频上传功能需要您授予相机权限</string>
-    <key>NSMicrophoneUsageDescription</key>
-    <string>录视频/录音上传功能需要您授予麦克风权限</string>
+	<key>UIBackgroundModes</key>
+    <array>
+        <string>audio</string>
+    </array>
 </dict>
 </plist>
diff --git a/lib/l10n/intl_en_us.dart b/lib/l10n/intl_en_us.dart
@@ -129,4 +129,9 @@ const translationsEnUS = {
   "uploadingFileScreen_status_waiting": "Waiting",
   "uploadingFileScreen_status_completed": "Completed",
   "splashScreen_loading": "Loading...",
+  "audioPlayListDialog_title": "Playlist",
+  "audioPlayListDialog_tips_deleteTheLast": "Unable to delete the last audio.",
+  "audioPlayerScreen_btn_sequence": "Sequential play",
+  "audioPlayerScreen_btn_repeatOne": "Single cycle",
+  "audioPlayerScreen_btn_shuffle": "Shuffle play",
 };
diff --git a/lib/l10n/intl_keys.dart b/lib/l10n/intl_keys.dart
@@ -123,4 +123,9 @@ class Intl {
   static const String uploadingFileScreen_status_waiting = "uploadingFileScreen_status_waiting";
   static const String uploadingFileScreen_status_completed = "uploadingFileScreen_status_completed";
   static const String splashScreen_loading = "splashScreen_loading";
+  static const String audioPlayListDialog_title = "audioPlayListDialog_title";
+  static const String audioPlayListDialog_tips_deleteTheLast = "audioPlayListDialog_tips_deleteTheLast";
+  static const String audioPlayerScreen_btn_sequence = "audioPlayerScreen_btn_sequence";
+  static const String audioPlayerScreen_btn_repeatOne = "audioPlayerScreen_btn_repeatOne";
+  static const String audioPlayerScreen_btn_shuffle = "audioPlayerScreen_btn_shuffle";
 }
diff --git a/lib/l10n/intl_zh_cn.dart b/lib/l10n/intl_zh_cn.dart
@@ -125,4 +125,9 @@ const translationsZhCN = {
   "uploadingFileScreen_status_waiting": "等待中",
   "uploadingFileScreen_status_completed": "上传完成",
   "splashScreen_loading": "加载中...",
+  "audioPlayListDialog_title": "播放列表",
+  "audioPlayListDialog_tips_deleteTheLast": "无法删除最后一个音频",
+  "audioPlayerScreen_btn_sequence": "顺序播放",
+  "audioPlayerScreen_btn_repeatOne": "单曲循环",
+  "audioPlayerScreen_btn_shuffle": "随机播放",
 };
diff --git a/lib/net/dio_utils.dart b/lib/net/dio_utils.dart
@@ -292,7 +292,7 @@ class DioUtils {
   }
 
   void _cancelLogPrint(dynamic e, String url) {
-    if (e is DioError && CancelToken.isCancel(e)) {
+    if (e is DioException && CancelToken.isCancel(e)) {
       Log.e('request cancel： $url');
     }
   }

diff --git a/lib/router.dart b/lib/router.dart
@@ -29,7 +29,7 @@ class AlistRouter {
     GetPage(
         name: NamedRouter.videoPlayer, page: () => const VideoPlayerScreen()),
     GetPage(
-        name: NamedRouter.audioPlayer, page: () => const AudioPlayerScreen()),
+        name: NamedRouter.audioPlayer, page: () => AudioPlayerScreen()),
     GetPage(name: NamedRouter.donate, page: () => const DonateScreen()),
     GetPage(name: NamedRouter.about, page: () => const AboutScreen()),
     GetPage(name: NamedRouter.gallery, page: () => GalleryScreen()),