Skip to content

Commit 7fe8b4a

Browse files
committed
chore: bump Flutter to 3.41.7, packages
1 parent 2fc8dda commit 7fe8b4a

8 files changed

Lines changed: 141 additions & 106 deletions

File tree

.github/workflows/runnable.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ on:
2020
- '**.md'
2121

2222
env:
23-
FLUTTER_VERSION: '3.41.5'
23+
FLUTTER_VERSION: '3.41.7'
2424

2525
jobs:
2626
code-analysis:

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# 1.9.12 (Unreleased)
2-
- [升级] Flutter 3.41.5,Package 升级及适配
2+
- [升级] Flutter 3.41.7,Package 升级及适配
33
- [升级] UniMPSDK 4.85 (Android)
44

55
# 1.9.11

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111

1212
<p align="center">
1313
<a href="/CHANGELOG.md"><img alt="Mood-Example v1.9.12" src="https://img.shields.io/badge/Mood--Example-v1.9.12-3e4663"/></a>
14-
<a href="https://flutter.dev/"><img alt="Flutter v3.41.5" src="https://img.shields.io/badge/Flutter-v3.41.5-0468D7"/></a>
15-
<a href="https://dart.dev/"><img alt="Dart v3.11.3" src="https://img.shields.io/badge/Dart-v3.11.3-04599C"/></a>
14+
<a href="https://flutter.dev/"><img alt="Flutter v3.41.7" src="https://img.shields.io/badge/Flutter-v3.41.7-0468D7"/></a>
15+
<a href="https://dart.dev/"><img alt="Dart v3.11.5" src="https://img.shields.io/badge/Dart-v3.11.5-04599C"/></a>
1616
<a href="https://github.com/AmosHuKe/Mood-Example/blob/main/LICENSE"><img alt="BSD-3-Clause License" src="https://img.shields.io/badge/License-BSD--3--Clause-green"/></a>
1717
</p>
1818

@@ -98,13 +98,13 @@
9898

9999
Windows:
100100
```
101-
[√] Flutter (Channel stable, 3.41.5, on Microsoft Windows)
101+
[√] Flutter (Channel stable, 3.41.7, on Microsoft Windows)
102102
[√] Android toolchain - develop for Android devices (Android SDK version 36.1.0)
103103
```
104104

105105
macOS:
106106
```
107-
[✓] Flutter (Channel stable, 3.41.5, on macOS)
107+
[✓] Flutter (Channel stable, 3.41.7, on macOS)
108108
[✓] Android toolchain - develop for Android devices (Android SDK version 36.0.0)
109109
```
110110

lib/features/settings/providers/setting_database_provider.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -276,10 +276,10 @@ class SettingDatabaseProvider extends ChangeNotifier {
276276
Future<Result<({ImportState importState, String errorFilePath})>> importMoodData() async {
277277
try {
278278
/// 清除选择文件的缓存
279-
await FilePicker.platform.clearTemporaryFiles();
279+
await FilePicker.clearTemporaryFiles();
280280

281281
/// 选择文件
282-
final pickedFile = await FilePicker.platform.pickFiles(
282+
final pickedFile = await FilePicker.pickFiles(
283283
type: .custom,
284284
allowedExtensions: ['xlsx'],
285285
allowMultiple: false,

lib/features/settings/widgets/setting_key.dart

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,13 +54,15 @@ class KeyBody extends StatefulWidget {
5454

5555
class _KeyBodyState extends State<KeyBody> {
5656
static const double titleIconSize = 18;
57+
bool localAuthSupporteded = false;
5758
List<BiometricType> localAuthList = [];
5859
IconData? localAuthIcon;
5960
String localAuthText = '';
6061

6162
Future<void> init(BuildContext context) async {
6263
final securityKeyProvider = context.read<SecurityKeyProvider>();
6364
final localAuthUtils = await LocalAuthUtils();
65+
localAuthSupporteded = await localAuthUtils.localAuthSupported();
6466
localAuthList = await localAuthUtils.localAuthList();
6567

6668
setState(() {
@@ -100,7 +102,7 @@ class _KeyBodyState extends State<KeyBody> {
100102
final keyBiometric = data.keyBiometric;
101103

102104
Widget biometricsAuth = const SizedBox();
103-
if (keyPassword != '' && localAuthText != '') {
105+
if (keyPassword != '' && localAuthSupporteded) {
104106
biometricsAuth = ListTile(
105107
leading: Icon(
106108
localAuthIcon,

lib/shared/utils/local_auth_utils.dart

Lines changed: 24 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -32,34 +32,31 @@ class LocalAuthUtils {
3232
Future<bool> localAuthBiometric(BuildContext context) async {
3333
final appL10n = AppL10n.of(context);
3434
final canAuthenticate = await localAuthSupported();
35-
final canAuthenticateBiometrics = await canLocalAuthBiometrics();
3635
if (!canAuthenticate) return false;
37-
if (canAuthenticateBiometrics) {
38-
try {
39-
final didAuthenticate = await auth.authenticate(
40-
localizedReason: appL10n.app_setting_security_localauth_localizedreason,
41-
biometricOnly: true,
42-
sensitiveTransaction: true,
43-
persistAcrossBackgrounding: true,
44-
authMessages: <AuthMessages>[
45-
AndroidAuthMessages(
46-
signInTitle: appL10n.app_setting_security_localauth_signIntitle,
47-
signInHint: '',
48-
cancelButton: appL10n.app_setting_security_localauth_cancel,
49-
),
50-
IOSAuthMessages(cancelButton: appL10n.app_setting_security_localauth_cancel),
51-
],
52-
);
53-
return didAuthenticate;
54-
} on PlatformException catch (e) {
55-
Log.instance.error('LocalAuthUtils localAuthBiometric error: ${e.toString()}');
56-
if (e.code == 'LockedOut') {
57-
SmartDialog.showToast(appL10n.app_setting_security_localauth_error_1);
58-
}
59-
return false;
36+
37+
try {
38+
final didAuthenticate = await auth.authenticate(
39+
localizedReason: appL10n.app_setting_security_localauth_localizedreason,
40+
biometricOnly: true,
41+
sensitiveTransaction: true,
42+
persistAcrossBackgrounding: true,
43+
authMessages: <AuthMessages>[
44+
AndroidAuthMessages(
45+
signInTitle: appL10n.app_setting_security_localauth_signIntitle,
46+
signInHint: '',
47+
cancelButton: appL10n.app_setting_security_localauth_cancel,
48+
),
49+
IOSAuthMessages(cancelButton: appL10n.app_setting_security_localauth_cancel),
50+
],
51+
);
52+
return didAuthenticate;
53+
} on PlatformException catch (e) {
54+
Log.instance.error('LocalAuthUtils localAuthBiometric error: ${e.toString()}');
55+
if (e.code == 'LockedOut') {
56+
SmartDialog.showToast(appL10n.app_setting_security_localauth_error_1);
6057
}
58+
return false;
6159
}
62-
return false;
6360
}
6461

6562
/// 识别图标
@@ -70,7 +67,7 @@ class LocalAuthUtils {
7067
[.iris, ...] => Remix.eye_line,
7168
[.face, ...] => Remix.body_scan_line,
7269
[.fingerprint, ...] => Remix.fingerprint_line,
73-
[] => null,
70+
[] => Remix.body_scan_line,
7471
};
7572
return authIcon;
7673
}
@@ -84,7 +81,7 @@ class LocalAuthUtils {
8481
[.iris, ...] => appL10n.app_setting_security_biometric_iris,
8582
[.face, ...] => appL10n.app_setting_security_biometric_face,
8683
[.fingerprint, ...] => appL10n.app_setting_security_biometric_fingerprint,
87-
[] => '',
84+
[] => appL10n.app_setting_security_biometric_weak,
8885
};
8986
return authText;
9087
}

0 commit comments

Comments
 (0)