Skip to content

Commit 22d73eb

Browse files
committed
修复语言跟随系统
1 parent 92306ad commit 22d73eb

File tree

3 files changed

+14
-11
lines changed

3 files changed

+14
-11
lines changed

lib/common/dao/user_dao.dart

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import 'package:gsy_github_app_flutter/common/model/User.dart';
1515
import 'package:gsy_github_app_flutter/common/model/UserOrg.dart';
1616
import 'package:gsy_github_app_flutter/common/net/address.dart';
1717
import 'package:gsy_github_app_flutter/common/net/api.dart';
18+
import 'package:gsy_github_app_flutter/common/redux/locale_redux.dart';
1819
import 'package:gsy_github_app_flutter/common/redux/user_redux.dart';
1920
import 'package:gsy_github_app_flutter/common/utils/common_utils.dart';
2021
import 'package:redux/redux.dart';
@@ -71,6 +72,8 @@ class UserDao {
7172
String localeIndex = await LocalStorage.get(Config.LOCALE);
7273
if (localeIndex != null && localeIndex.length != 0) {
7374
CommonUtils.changeLocale(store, int.parse(localeIndex));
75+
} else {
76+
store.dispatch(RefreshLocaleAction(store.state.platformLocale));
7477
}
7578

7679
return new DataResult(res.data, (res.result && (token != null)));

lib/main.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ class FlutterReduxApp extends StatelessWidget {
6868
theme: store.state.themeData,
6969
routes: {
7070
WelcomePage.sName: (context) {
71-
store.state.platformLocale = Localizations.localeOf(context);
71+
store.state.platformLocale = WidgetsBinding.instance.window.locale;
7272
return WelcomePage();
7373
},
7474
HomePage.sName: (context) {

pubspec.lock

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ packages:
1414
name: analyzer
1515
url: "https://pub.flutter-io.cn"
1616
source: hosted
17-
version: "0.36.4"
17+
version: "0.37.0"
1818
android_intent:
1919
dependency: "direct main"
2020
description:
@@ -35,7 +35,7 @@ packages:
3535
name: async
3636
url: "https://pub.flutter-io.cn"
3737
source: hosted
38-
version: "2.2.0"
38+
version: "2.3.0"
3939
bezier:
4040
dependency: "direct main"
4141
description:
@@ -126,7 +126,7 @@ packages:
126126
name: connectivity
127127
url: "https://pub.flutter-io.cn"
128128
source: hosted
129-
version: "0.4.3+5"
129+
version: "0.4.3+6"
130130
convert:
131131
dependency: transitive
132132
description:
@@ -296,7 +296,7 @@ packages:
296296
name: front_end
297297
url: "https://pub.flutter-io.cn"
298298
source: hosted
299-
version: "0.1.19"
299+
version: "0.1.20"
300300
glob:
301301
dependency: transitive
302302
description:
@@ -373,14 +373,14 @@ packages:
373373
name: json_serializable
374374
url: "https://pub.flutter-io.cn"
375375
source: hosted
376-
version: "3.0.0"
376+
version: "3.1.0"
377377
kernel:
378378
dependency: transitive
379379
description:
380380
name: kernel
381381
url: "https://pub.flutter-io.cn"
382382
source: hosted
383-
version: "0.3.19"
383+
version: "0.3.20"
384384
logging:
385385
dependency: transitive
386386
description:
@@ -564,7 +564,7 @@ packages:
564564
name: share
565565
url: "https://pub.flutter-io.cn"
566566
source: hosted
567-
version: "0.6.2"
567+
version: "0.6.2+1"
568568
shared_preferences:
569569
dependency: "direct main"
570570
description:
@@ -597,7 +597,7 @@ packages:
597597
name: source_gen
598598
url: "https://pub.flutter-io.cn"
599599
source: hosted
600-
version: "0.9.4+2"
600+
version: "0.9.4+3"
601601
source_span:
602602
dependency: transitive
603603
description:
@@ -611,7 +611,7 @@ packages:
611611
name: sqflite
612612
url: "https://pub.flutter-io.cn"
613613
source: hosted
614-
version: "1.1.6+1"
614+
version: "1.1.6+2"
615615
stack_trace:
616616
dependency: transitive
617617
description:
@@ -726,4 +726,4 @@ packages:
726726
version: "2.1.16"
727727
sdks:
728728
dart: ">=2.4.0 <3.0.0"
729-
flutter: ">=1.5.9-pre.94 <2.0.0"
729+
flutter: ">=1.6.0 <2.0.0"

0 commit comments

Comments
 (0)