update 3.32

CarGuo · CarGuo · commit 263497b5f78a · 2025-05-23T16:07:25.000+08:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -25,7 +25,7 @@ jobs:
           java-version: 21
       - uses: subosito/flutter-action@v1
         with:
-          flutter-version: '3.29.2'
+          flutter-version: '3.32.0'
       - uses: finnp/create-file-action@master
         env:
           FILE_NAME: lib/common/config/ignoreConfig.dart
@@ -47,7 +47,7 @@ jobs:
           java-version: 21
       - uses: subosito/flutter-action@v1
         with:
-          flutter-version: '3.29.2'
+          flutter-version: '3.32.0'
       - uses: finnp/create-file-action@master
         env:
           FILE_NAME: lib/common/config/ignoreConfig.dart
diff --git a/README.md b/README.md
@@ -76,7 +76,7 @@
 
 ## 编译运行流程
 
-1、配置好Flutter开发环境(目前Flutter SDK 版本 **3.29**)，可参阅 [【搭建环境】](https://flutterchina.club)。
+1、配置好Flutter开发环境(目前Flutter SDK 版本 **3.32**)，可参阅 [【搭建环境】](https://flutterchina.club)。
 
 2、clone代码，执行`Packages get`安装第三方包。(因为某些不可抗力原因，国内可能需要设置代理: [代理环境变量](https://flutterchina.club/setup-windows/))
 
@@ -100,7 +100,7 @@
 
 ### 5、运行之前请注意下
 
->### 1、本地 Flutter SDK 版本 3.29 ； 2、是否执行过 `flutter pub get`；3、 网络等问题参考: [如果出现登陆失败或者请求失败 ](https://github.com/CarGuo/gsy_github_app_flutter/issues/643)
+>### 1、本地 Flutter SDK 版本 3.32 ； 2、是否执行过 `flutter pub get`；3、 网络等问题参考: [如果出现登陆失败或者请求失败 ](https://github.com/CarGuo/gsy_github_app_flutter/issues/643)
 
 
 ### 下载
@@ -144,7 +144,7 @@
 
 ### 框架
 
->当前 Flutter SDK 版本 3.29
+>当前 Flutter SDK 版本 3.32
 
 ```
 用户交互 → UI层(Widget/Page) → 状态层(Redux/Provider/Riverpod) → 服务层(Repositories) 
diff --git a/README_EN.md b/README_EN.md
@@ -74,7 +74,7 @@
 
 ## Compilation and Running Process
 
-1. Set up the Flutter development environment (current Flutter SDK version **3.29**), see [Setting up the environment](https://flutterchina.club).
+1. Set up the Flutter development environment (current Flutter SDK version **3.32**), see [Setting up the environment](https://flutterchina.club).
 
 2. Clone the code, run `Packages get` to install third-party packages. (Due to certain reasons beyond control, you may need to set up a proxy in China: [Proxy environment variables](https://flutterchina.club/setup-windows/))
 
@@ -98,7 +98,7 @@
 
 ### 5. Please note before running
 
->### 1. Local Flutter SDK version 3.29; 2. Have you executed `flutter pub get`; 3. For network and other issues, refer to: [If login fails or requests fail](https://github.com/CarGuo/gsy_github_app_flutter/issues/643)
+>### 1. Local Flutter SDK version 3.32; 2. Have you executed `flutter pub get`; 3. For network and other issues, refer to: [If login fails or requests fail](https://github.com/CarGuo/gsy_github_app_flutter/issues/643)
 
 
 ### Download
@@ -142,7 +142,7 @@
 
 ### Framework
 
->Current Flutter SDK version 3.29
+>Current Flutter SDK version 3.32
 
 ```
 User Interaction → UI Layer(Widget/Page) → State Layer(Redux/Provider/Riverpod/Signals) → Service Layer(Repositories) 
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -98,3 +98,117 @@ flutter {
 }
 
 dependencies {}
+
+
+// 在你的模块级别 build.gradle 文件中添加此任务
+// 例如: app/build.gradle
+
+task findSoFileOrigins {
+    description = "扫描项目依赖的 AAR 文件，找出 .so 文件的来源。"
+    group = "reporting" // 将任务归类到 "reporting" 组下
+
+    doLast {
+        // 用于存储 AAR 标识符及其包含的 .so 文件路径
+        // 键 (Key): AAR 的字符串标识符 (例如："project :gsyVideoPlayer", "com.example.library:core:1.0.0")
+        // 值 (Value): 一个 Set 集合，包含该 AAR 内所有 .so 文件的路径 (字符串)
+        def aarSoFilesMap = [:]
+
+        def variants = null
+        if (project.plugins.hasPlugin('com.android.application')) {
+            variants = project.android.applicationVariants
+        } else if (project.plugins.hasPlugin('com.android.library')) {
+            variants = project.android.libraryVariants
+        } else {
+            project.logger.warn("警告: findSoFileOrigins 任务需要 Android 应用插件 (com.android.application) 或库插件 (com.android.library)。")
+            return
+        }
+
+        if (variants == null || variants.isEmpty()) {
+            project.logger.warn("警告: 未找到任何变体 (variants) 来处理。")
+            return
+        }
+
+        variants.all { variant ->
+            project.logger.lifecycle("正在扫描变体 '${variant.name}' 中的 AAR 依赖以查找 .so 文件...")
+
+            // 获取该变体的运行时配置 (runtime configuration)
+            def configuration = variant.getRuntimeConfiguration()
+
+            try {
+                // 配置一个构件视图 (artifact view) 来精确请求 AAR 类型的构件
+                def resolvedArtifactsView = configuration.incoming.artifactView { view ->
+                    view.attributes { attributes ->
+                        // 明确指定我们只对 artifactType 为 'aar' 的构件感兴趣
+                        // AGP 也常用 "android-aar"，如果 "aar" 效果不佳，可以尝试替换
+                        attributes.attribute(Attribute.of("artifactType", String.class), "aar")
+                    }
+                    // lenient(false) 是默认行为。如果设为 true，它会尝试跳过无法解析的构件而不是让整个视图失败。
+                    // 但如果像之前那样，是组件级别的变体选择失败 (如 gsyVideoPlayer)，lenient 可能也无法解决。
+                    // view.lenient(false)
+                }.artifacts // 获取 ResolvedArtifactSet
+
+                project.logger.info("对于变体 '${variant.name}'，从配置 '${configuration.name}' 解析到 ${resolvedArtifactsView.artifacts.size()} 个 AAR 类型的构件。")
+
+                resolvedArtifactsView.each { resolvedArtifactResult ->
+                    // resolvedArtifactResult 是 ResolvedArtifactResult 类型的对象
+                    File aarFile = resolvedArtifactResult.file
+                    // 获取组件的标识符，这能告诉我们依赖的来源
+                    // 例如："project :gsyVideoPlayer" 或 "com.google.android.material:material:1.7.0"
+                    String aarIdentifier = resolvedArtifactResult.id.componentIdentifier.displayName
+
+                    aarSoFilesMap.putIfAbsent(aarIdentifier, new HashSet<String>())
+
+                    if (aarFile.exists() && aarFile.name.endsWith('.aar')) {
+                        // project.logger.info("正在检查 AAR: ${aarIdentifier} (文件: ${aarFile.name})")
+                        try {
+                            project.zipTree(aarFile).matching {
+                                include '**/*.so' // 匹配 AAR 中的所有 .so 文件
+                            }.each { File soFileInZip ->
+                                aarSoFilesMap[aarIdentifier].add(soFileInZip.path)
+                            }
+                        } catch (Exception e) {
+                            project.logger.error("错误: 无法检查 AAR 文件 '${aarIdentifier}' (路径: ${aarFile.absolutePath})。原因: ${e.message}")
+                        }
+                    } else {
+                        if (!aarFile.name.endsWith('.aar')) {
+                            project.logger.debug("跳过非 AAR 文件 '${aarFile.name}' (来自: ${aarIdentifier})，其构件类型被解析为 AAR。")
+                        } else {
+                            project.logger.warn("警告: 来自 '${aarIdentifier}' 的 AAR 文件不存在: ${aarFile.absolutePath}")
+                        }
+                    }
+                }
+
+            } catch (Exception e) {
+                // 这个 catch 块会捕获解析构件视图时发生的错误
+                // 这可能仍然包括之前遇到的 "Could not resolve all artifacts for configuration" 错误，
+                // 如果问题非常根本，即使是特定的构件视图也无法克服。
+                project.logger.error("错误: 无法为配置 '${configuration.name}' 解析 AAR 类型的构件。" +
+                        "这通常表明您的项目设置中存在依赖变体匹配问题，" +
+                        "特别是对于像 ':gsyVideoPlayer' 这样的项目依赖。 " +
+                        "详细信息: ${e.message}", e) // 打印异常堆栈以获取更多信息
+                project.logger.error("建议: 请检查项目依赖（尤其是本地子项目如 ':gsyVideoPlayer'）的构建配置，" +
+                        "确保它们能正确地发布带有标准 Android 库属性（如组件类别、构建类型，以及适用的 Kotlin 平台类型等）的变体。")
+                // 如果希望任务在此处停止而不是尝试其他变体，可以取消下一行的注释
+                // throw e
+            }
+        }
+
+        // 打印结果
+        if (aarSoFilesMap.isEmpty()) {
+            project.logger.lifecycle("\n在所有已处理变体的可解析 AAR 依赖中均未找到 .so 文件，或者依赖解析失败。")
+        } else {
+            println "\n--- AAR 依赖中的 .so 文件来源 ---"
+            // 按 AAR 标识符排序以获得一致的输出
+            aarSoFilesMap.sort { it.key }.each { aarId, soFileList ->
+                if (!soFileList.isEmpty()) {
+                    println "${aarId}:" // 例如：project :gsyVideoPlayer: 或 com.some.library:core:1.0:
+                    soFileList.sort().each { soPath -> // 对 .so 文件路径排序
+                        println "  - ${soPath}"     // 例如：  - jni/armeabi-v7a/libexample.so
+                    }
+                }
+            }
+            println "----------------------------------"
+        }
+        project.logger.lifecycle("任务执行完毕。要再次运行此任务，请执行: ./gradlew ${project.name}:${name}")
+    }
+}
diff --git a/devtools_options.yaml b/devtools_options.yaml
@@ -0,0 +1,3 @@
+description: This file stores settings for Dart & Flutter DevTools.
+documentation: https://docs.flutter.dev/tools/devtools/extensions#configure-extension-enablement-states
+extensions:
diff --git a/lib/common/localization/l10n/app_localizations.dart b/lib/common/localization/l10n/app_localizations.dart
@@ -64,15 +64,17 @@ import 'app_localizations_zh.dart';
 /// be consistent with the languages listed in the AppLocalizations.supportedLocales
 /// property.
 abstract class AppLocalizations {
-  AppLocalizations(String locale) : localeName = intl.Intl.canonicalizedLocale(locale.toString());
+  AppLocalizations(String locale)
+      : localeName = intl.Intl.canonicalizedLocale(locale.toString());
 
   final String localeName;
 
   static AppLocalizations? of(BuildContext context) {
     return Localizations.of<AppLocalizations>(context, AppLocalizations);
   }
 
-  static const LocalizationsDelegate<AppLocalizations> delegate = _AppLocalizationsDelegate();
+  static const LocalizationsDelegate<AppLocalizations> delegate =
+      _AppLocalizationsDelegate();
 
   /// A list of this localizations delegate along with the default localizations
   /// delegates.
@@ -84,7 +86,8 @@ abstract class AppLocalizations {
   /// Additional delegates can be added by appending to this list in
   /// MaterialApp. This list does not have to be used at all if a custom list
   /// of delegates is preferred or required.
-  static const List<LocalizationsDelegate<dynamic>> localizationsDelegates = <LocalizationsDelegate<dynamic>>[
+  static const List<LocalizationsDelegate<dynamic>> localizationsDelegates =
+      <LocalizationsDelegate<dynamic>>[
     delegate,
     GlobalMaterialLocalizations.delegate,
     GlobalCupertinoLocalizations.delegate,
@@ -916,7 +919,8 @@ abstract class AppLocalizations {
   String get feed_back_tip;
 }
 
-class _AppLocalizationsDelegate extends LocalizationsDelegate<AppLocalizations> {
+class _AppLocalizationsDelegate
+    extends LocalizationsDelegate<AppLocalizations> {
   const _AppLocalizationsDelegate();
 
   @override
@@ -925,27 +929,29 @@ class _AppLocalizationsDelegate extends LocalizationsDelegate<AppLocalizations>
   }
 
   @override
-  bool isSupported(Locale locale) => <String>['en', 'ja', 'ko', 'zh'].contains(locale.languageCode);
+  bool isSupported(Locale locale) =>
+      <String>['en', 'ja', 'ko', 'zh'].contains(locale.languageCode);
 
   @override
   bool shouldReload(_AppLocalizationsDelegate old) => false;
 }
 
 AppLocalizations lookupAppLocalizations(Locale locale) {
-
-
   // Lookup logic when only language code is specified.
   switch (locale.languageCode) {
-    case 'en': return AppLocalizationsEn();
-    case 'ja': return AppLocalizationsJa();
-    case 'ko': return AppLocalizationsKo();
-    case 'zh': return AppLocalizationsZh();
+    case 'en':
+      return AppLocalizationsEn();
+    case 'ja':
+      return AppLocalizationsJa();
+    case 'ko':
+      return AppLocalizationsKo();
+    case 'zh':
+      return AppLocalizationsZh();
   }
 
   throw FlutterError(
-    'AppLocalizations.delegate failed to load unsupported locale "$locale". This is likely '
-    'an issue with the localizations generation tool. Please file an issue '
-    'on GitHub with a reproducible sample app and the gen-l10n configuration '
-    'that was used.'
-  );
+      'AppLocalizations.delegate failed to load unsupported locale "$locale". This is likely '
+      'an issue with the localizations generation tool. Please file an issue '
+      'on GitHub with a reproducible sample app and the gen-l10n configuration '
+      'that was used.');
 }
diff --git a/lib/common/localization/l10n/app_localizations_en.dart b/lib/common/localization/l10n/app_localizations_en.dart
@@ -75,7 +75,8 @@ class AppLocalizationsEn extends AppLocalizations {
   String get login_out => 'Logout';
 
   @override
-  String get login_deprecated => 'The API via password authentication will remove on November 13, 2020 by Github';
+  String get login_deprecated =>
+      'The API via password authentication will remove on November 13, 2020 by Github';
 
   @override
   String get home_reply => 'Feedback';
@@ -159,7 +160,8 @@ class AppLocalizationsEn extends AppLocalizations {
   String get network_error_404 => 'Http 404';
 
   @override
-  String get network_error_422 => 'Request Body Error, Please check Github ClientId or Account/PW';
+  String get network_error_422 =>
+      'Request Body Error, Please check Github ClientId or Account/PW';
 
   @override
   String get network_error_timeout => 'Http timeout';
@@ -171,7 +173,8 @@ class AppLocalizationsEn extends AppLocalizations {
   String get network_error => 'Network error';
 
   @override
-  String get github_refused => 'Github Api error[OS Error: Connection refused]. Please switch networks or try again later';
+  String get github_refused =>
+      'Github Api error[OS Error: Connection refused]. Please switch networks or try again later';
 
   @override
   String get load_more_not => 'Nothing';
@@ -414,5 +417,6 @@ class AppLocalizationsEn extends AppLocalizations {
   String get search_language => 'Language';
 
   @override
-  String get feed_back_tip => 'Your feedback will be sent to Github as a public issue';
+  String get feed_back_tip =>
+      'Your feedback will be sent to Github as a public issue';
 }
diff --git a/lib/common/localization/l10n/app_localizations_ja.dart b/lib/common/localization/l10n/app_localizations_ja.dart
@@ -159,7 +159,8 @@ class AppLocalizationsJa extends AppLocalizations {
   String get network_error_404 => 'Http 404';
 
   @override
-  String get network_error_422 => 'リクエストボディエラー、Github ClientIdまたはアカウント/パスワードを確認してください';
+  String get network_error_422 =>
+      'リクエストボディエラー、Github ClientIdまたはアカウント/パスワードを確認してください';
 
   @override
   String get network_error_timeout => 'Http タイムアウト';
@@ -171,7 +172,8 @@ class AppLocalizationsJa extends AppLocalizations {
   String get network_error => 'ネットワークエラー';
 
   @override
-  String get github_refused => 'Github APIエラー[OSエラー: 接続拒否]。ネットワークを切り替えるか、後でもう一度お試しください';
+  String get github_refused =>
+      'Github APIエラー[OSエラー: 接続拒否]。ネットワークを切り替えるか、後でもう一度お試しください';
 
   @override
   String get load_more_not => 'これ以上ありません';
diff --git a/lib/common/localization/l10n/app_localizations_ko.dart b/lib/common/localization/l10n/app_localizations_ko.dart
@@ -171,7 +171,8 @@ class AppLocalizationsKo extends AppLocalizations {
   String get network_error => '네트워크 오류';
 
   @override
-  String get github_refused => 'Github API 오류[OS 오류: 연결 거부]. 네트워크를 전환하거나 나중에 다시 시도하세요';
+  String get github_refused =>
+      'Github API 오류[OS 오류: 연결 거부]. 네트워크를 전환하거나 나중에 다시 시도하세요';
 
   @override
   String get load_more_not => '더 이상 없음';
diff --git a/lib/common/localization/l10n/app_localizations_zh.dart b/lib/common/localization/l10n/app_localizations_zh.dart
@@ -171,7 +171,8 @@ class AppLocalizationsZh extends AppLocalizations {
   String get network_error => '网络错误';
 
   @override
-  String get github_refused => 'Github Api 出现异常[Connection refused]，建议换个网络环境或者稍后再试';
+  String get github_refused =>
+      'Github Api 出现异常[Connection refused]，建议换个网络环境或者稍后再试';
 
   @override
   String get load_more_not => '没有更多数据';
diff --git a/pubspec.lock b/pubspec.lock
@@ -642,10 +642,10 @@ packages:
     dependency: "direct main"
     description:
       name: intl
-      sha256: d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf
+      sha256: "3df61194eb431efc39c4ceba583b95633a403f46c9fd341e550ce0bfa50e9aa5"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "0.19.0"
+    version: "0.20.2"
   io:
     dependency: transitive
     description:

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+description: This file stores settings for Dart & Flutter DevTools.`
	`2`	`+documentation: https://docs.flutter.dev/tools/devtools/extensions#configure-extension-enablement-states`
	`3`	`+extensions:`