Merge branch 'ysz' into test

Author: wanwusangzhi

lib/components/widgetComp.dart

@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:efox_flutter/store/index.dart' show Store;
 import 'header.dart' as Header;
 import 'package:efox_flutter/components/markdownComp.dart' as MarkDownComp;
-import 'package:efox_flutter/lang/app_translations.dart' show AppTranslations;
+import 'package:efox_flutter/lang/index.dart' show AppLocalizations;
 import 'package:efox_flutter/components/baseComp.dart' as BaseComp;
 import 'package:efox_flutter/components/exampleComp.dart' as ExampleComp;
 import 'package:efox_flutter/utils/file.dart' as FileUtils;
@@ -184,7 +184,7 @@ class IndexState extends State<Index> {
                   Container(
                     padding: const EdgeInsets.fromLTRB(16.0, 16.0, 16.0, 0),
                     child: Text(
-                      AppTranslations.of(context).t('loading'),
+                      AppLocalizations.$t('loading'),
                       style: TextStyle(
                           color: Color(AppTheme.secondColor), fontSize: 20.0),
                     ),

lib/lang/Application.dart

@@ -0,0 +1,18 @@
+import 'package:flutter/material.dart';
+
+class ConfigLanguage {
+  static List<Locale> supportedLocales = [
+    Locale('zh', 'CH'),
+    Locale('en', 'US'),
+  ];
+
+  static Map<String, dynamic> sopportLanguage = {
+    "zh": {"code": "zh", "country_code": "CH"},
+    "en": {"code": "en", "country_code": "US"}
+  };
+
+  static dynamic defualtLanguage = {
+    "code": "zh",
+    "country_code": "CH"
+  };
+}

lib/lang/app_translations.dart

@@ -0,0 +1,115 @@
+import 'package:flutter/material.dart';
+import 'dart:async';
+import 'dart:convert';
+import 'package:efox_flutter/lang/config.dart' as I18NConfig;
+import 'package:flutter/services.dart' show rootBundle;
+
+class AppLocalizations {
+  Locale _locale; // language
+  static Function _setState; // setState
+  static AppLocalizationsDelegate _delegate;
+  static Map<String, dynamic> jsonLanguage;
+  static AppLocalizations _inst; // inst
+
+  AppLocalizations(this._locale);
+
+  // init localizations
+  static Future<AppLocalizations> init(Locale locale) async {
+    _inst = AppLocalizations(locale);
+    await getLanguageJson();
+    return _inst;
+  }
+
+  // 设置语言切换代理
+  static void setProxy(Function setState, AppLocalizationsDelegate delegate) async {
+    _setState = setState;
+    _delegate = delegate;
+  }
+
+  static get languageCode => _inst._locale.languageCode;
+
+  static void getLanguageJson([Locale locale]) async {
+    Locale _tmpLocale = _inst._locale;
+    print(_tmpLocale.languageCode);
+    String jsonLang;
+    try {
+      jsonLang = await rootBundle
+          .loadString('locale/${_tmpLocale.languageCode}.json');
+    } catch (e) {
+      _inst._locale = Locale(I18NConfig.ConfigLanguage.defualtLanguage.code);
+      jsonLang = await rootBundle
+          .loadString('locale/${I18NConfig.ConfigLanguage.defualtLanguage.code}.json');
+    }
+    json.decode(jsonLang);
+    jsonLanguage = json.decode(jsonLang);
+    print("当前语言： ${_inst._locale}");
+    print("Json数据： ${jsonLanguage}");
+  }
+
+  static void changeLanguage([Locale locale]) {
+    if (locale == null) {
+      locale = AppLocalizations.languageCode == 'zh'
+          ? Locale('en', "US")
+          : Locale("zh", "CH");
+    }
+    _inst._locale = locale;
+    getLanguageJson(); // 根据语言获取对应的国际化文件
+    _setState(() {
+      _delegate = AppLocalizationsDelegate(locale);
+    });
+  }
+
+  // get local language
+  _t(String key) {
+    var _array = key.split('.');
+    var _dict = jsonLanguage;
+    var retValue = '';
+    try {
+      _array.forEach((item) {
+        if (_dict[item].runtimeType == Null) {
+          retValue = key;
+          return;
+        }
+        if (_dict[item].runtimeType != String) {
+          _dict = _dict[item];
+        } else {
+          retValue = _dict[item];
+        }
+      });
+      retValue = retValue.isEmpty ? _dict : retValue;
+    } catch (e) {
+      print('i18n exception');
+      print(e);
+      retValue = key;
+    }
+//    print('key   ${key}                value: ${retValue}');
+    return retValue ?? '';
+  }
+
+  static String $t(String key) {
+    return _inst._t(key);
+  }
+}
+
+class AppLocalizationsDelegate extends LocalizationsDelegate<AppLocalizations> {
+  final Locale locale;
+
+  AppLocalizationsDelegate ([this.locale]);
+
+  @override
+  bool isSupported(Locale locale) {
+    return I18NConfig.ConfigLanguage.sopportLanguage.keys.toList().contains(locale.languageCode);
+  }
+
+  @override
+  Future<AppLocalizations> load(Locale _locale) async {
+    Locale _tmpLocale = locale ?? _locale;
+    return await AppLocalizations.init(_tmpLocale);
+  }
+
+  @override
+  bool shouldReload(LocalizationsDelegate<AppLocalizations> old) {
+    // false时 不执行上述重写函数
+    return false;
+  }
+}

lib/lang/app_translations_delegate.dart

@@ -1,14 +1,20 @@
 import 'package:flutter/material.dart';
+
 //语言包实例化
 import 'package:flutter_localizations/flutter_localizations.dart';
-import 'package:efox_flutter/lang/application.dart';
-import 'package:efox_flutter/lang/app_translations_delegate.dart';
+import 'package:efox_flutter/lang/index.dart'
+    show AppLocalizationsDelegate, AppLocalizations;
+import 'package:efox_flutter/lang/config.dart' show ConfigLanguage;
+
 //引用Store 层
 import 'package:efox_flutter/store/index.dart' show model, Store;
+
 //路由
 import 'package:efox_flutter/router/index.dart' show FluroRouter;
+
 //主题
 import 'package:efox_flutter/config/theme.dart' show AppTheme;
+
 //统计
 import 'package:efox_flutter/utils/analytics.dart' as Analytics;
 
@@ -18,27 +24,20 @@ class MainApp extends StatefulWidget {
   MainApp() {
     FluroRouter.initRouter();
   }
+
   @override
   MainAppState createState() => MainAppState();
 }
 
 class MainAppState extends State<MainApp> {
   // 定义全局 语言代理
-  AppTranslationsDelegate _newLocaleDelegate;
+  AppLocalizationsDelegate _delegate;
 
   @override
   void initState() {
     //实例化多语言
-    _newLocaleDelegate = AppTranslationsDelegate(newLocale: null);
-    application.onLocaleChanged = onLocaleChange;
     super.initState();
-  }
-
-  // 切换语言方法
-  void onLocaleChange(Locale locale) {
-    setState(() {
-      _newLocaleDelegate = AppTranslationsDelegate(newLocale: locale);
-    });
+    _delegate = AppLocalizationsDelegate();
   }
 
   @override
@@ -49,18 +48,23 @@ class MainAppState extends State<MainApp> {
         localeResolutionCallback: (deviceLocale, supportedLocales) {
           print(
               'deviceLocale=$deviceLocale supportedLocales=$supportedLocales');
-          return deviceLocale ?? Locale('en');
+          Locale _locale = supportedLocales.contains(deviceLocale)
+              ? deviceLocale
+              : Locale('en');
+          return _locale;
+        },
+        onGenerateTitle: (context) {
+          // 设置多语言代理
+          AppLocalizations.setProxy(setState, _delegate);
+          return '-';
         },
         localizationsDelegates: [
-          _newLocaleDelegate,
           GlobalMaterialLocalizations.delegate,
           GlobalWidgetsLocalizations.delegate,
+          _delegate,
         ],
-        supportedLocales: [
-          const Locale('en'),
-          const Locale('zh'),
-        ],
-        title: 'Flutter Demo',
+        supportedLocales: ConfigLanguage.supportedLocales,
+//        title: 'Flutter Demo',
         theme: AppTheme.themData,
         onGenerateRoute: FluroRouter.router.generator,
         navigatorObservers: <NavigatorObserver>[Analytics.observer],