Merge branch 'test'

Author: wanwusangzhi

lib/components/widgetComp.dart

@@ -100,7 +100,7 @@ class IndexState extends State<Index> {
     // 加载页面
     if (this.model.config.state.isPro) {
       FluroRouter.router.navigateTo(context,
-          '/webview?url=${Uri.encodeComponent(this.model.config.state.env.GithubAssetOrigin + url.replaceAll(RegExp('/index.md'), ''))}');
+          '/webview?url=${Uri.encodeComponent(this.model.config.state.env.githubAssetOrigin + url.replaceAll(RegExp('/index.md'), ''))}');
     } else {
       // 加载本地
       String mdStr = await FileUtils.readLocaleFile(url);
@@ -147,7 +147,7 @@ class IndexState extends State<Index> {
         icon: Icon(Icons.share),
         onPressed: () {
           final String msg =
-              this.model.config.state.env.GithubAssetOrigin + this.mdUrl;
+              this.model.config.state.env.githubAssetOrigin + this.mdUrl;
           AppShare.shareText(msg);
         },
       ),

lib/config/development.dart

@@ -1,5 +1,6 @@
 class Config {
   String versionUrl = 'https://raw.githubusercontent.com/efoxTeam/flutter-ui/master/assets/config.json';
+  String githubWeb = 'https://efoxteam.github.io/flutter-ui/';
   String githubAssetOrigin =
       'https://github.com/efoxTeam/flutter-ui/blob/master/';
   String githubMarkdownOrigin =

lib/config/production.dart

@@ -1,5 +1,6 @@
 class Config {
   String versionUrl = 'https://raw.githubusercontent.com/efoxTeam/flutter-ui/master/assets/config.json';
+  String githubWeb = 'https://efoxteam.github.io/flutter-ui/';
   String githubAssetOrigin =
       'https://github.com/efoxTeam/flutter-ui/blob/master/';
   String githubMarkdownOrigin =

lib/lang/index.dart

@@ -24,6 +24,7 @@ class AppLocalizations {
   static void setProxy(Function setState, AppLocalizationsDelegate delegate) async {
     _setState = setState;
     _delegate = delegate;
+    print("_delegate = $_delegate");
   }
 
   static get languageCode => _inst._locale.languageCode;

lib/main.dart

@@ -50,13 +50,13 @@ class MainAppState extends State<MainApp> {
               'deviceLocale=$deviceLocale supportedLocales=$supportedLocales');
           Locale _locale = supportedLocales.contains(deviceLocale)
               ? deviceLocale
-              : Locale('en');
+              : Locale('zh');
           return _locale;
         },
         onGenerateTitle: (context) {
           // 设置多语言代理
           AppLocalizations.setProxy(setState, _delegate);
-          return '-';
+          return 'flutter';
         },
         localizationsDelegates: [
           GlobalMaterialLocalizations.delegate,

lib/page/mine/index.dart

@@ -1,17 +1,17 @@
 import 'package:flutter/material.dart';
 import 'package:efox_flutter/lang/index.dart' show AppLocalizations;
+import 'package:efox_flutter/router/index.dart' show FluroRouter;
 
 class _IndexState extends State<Index> {
   static String _version = '';
 
   @override
   void initState() {
     super.initState();
-    print('-------init');
     _version = widget.model.config.state.version;
   }
 
-  List<dynamic> _getList () {
+  List<dynamic> _getList() {
     return [
       {
         'name': AppLocalizations.$t('common.changeLanguage'),
@@ -24,9 +24,14 @@ class _IndexState extends State<Index> {
       {
         'name': AppLocalizations.$t('common.changeEnvironment'),
         'icon': 57539, // import_export
+      },
+      {
+        'name': AppLocalizations.$t('common.compProgress'),
+        'icon': 57709, // low_priority
       }
     ];
   }
+
   actionsEvent(int index) {
     switch (index) {
       case 0:
@@ -40,6 +45,12 @@ class _IndexState extends State<Index> {
       case 2:
         widget.model.dispatch('config', 'setEnv');
         break;
+      case 3:
+        FluroRouter.router.navigateTo(
+          context,
+          '/webview?url=${Uri.encodeComponent(widget.model.config.state.env.githubWeb)}',
+        );
+        break;
     }
   }
 

lib/widget/animate/animationcontroller/demo.dart

@@ -27,7 +27,6 @@ class _AnimationDemoState extends State<AnimationDemo>
 
   @override
     void initState() {
-      // TODO: implement initState
       super.initState();
       animationDemoController = AnimationController(
         // value: 32,
@@ -54,7 +53,6 @@ class _AnimationDemoState extends State<AnimationDemo>
 
     @override
       void dispose() {
-        // TODO: implement dispose
         super.dispose();
         animationDemoController.dispose();
       }

lib/widget/bulletbox/bottomsheet/demo.dart

@@ -37,7 +37,7 @@ class _IndexState extends State<Index> {
   }
 
   Future _openShowBottomSheet () async {
-    final optionBs = await showBottomSheet(
+    await showBottomSheet(
       context: context,
       builder: (BuildContext context) {
         return new Container(

lib/widget/bulletbox/expansionPanel/demo.dart

@@ -20,7 +20,6 @@ class _IndexState extends State<Index> {
   List<ExpansionPanelItem> _expansionPanelItems;
   @override
     void initState() {
-      // TODO: implement initState
       super.initState();
       _expansionPanelItems = <ExpansionPanelItem>[
         ExpansionPanelItem(

lib/widget/common/container/index.dart

@@ -1,10 +1,10 @@
 import 'package:flutter/material.dart';
 import 'package:efox_flutter/components/widgetComp.dart' as WidgetComp;
-// import 'demo.dart' as Demo;
+ import 'package:efox_flutter/widget/regular/container/demo.dart' as Demo;
 
 class Index extends StatefulWidget {
   static String title = 'Container';
-  static String mdUrl = 'docs/widget/common/container/index.md';
+  static String mdUrl = 'docs/widget/regular/container/index.md';
   static String originCodeUrl = 'https://docs.flutter.io/flutter/widgets/Container-class.html';
 
   @override
@@ -19,7 +19,7 @@ class _IndexState extends State<Index> {
       originCodeUrl: Index.originCodeUrl,
       mdUrl: Index.mdUrl,
       demoChild: [
-        // Demo.Index(),
+         Demo.Index(),
       ],
     );
   }