Merge branch 'ysz' into test

Author: yangshangzhi

lib/components/widgetComp.dart

@@ -5,6 +5,7 @@ import 'package:efox_flutter/lang/app_translations.dart' show AppTranslations;
 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;
+import 'package:efox_flutter/utils/loadAsset.dart' as LoadAssetUtils;
 import 'package:efox_flutter/router/index.dart' show FluroRouter;
 
 class Index extends StatefulWidget {
@@ -92,9 +93,9 @@ class IndexState extends State<Index> {
 
   openPage(context, model, String url) async {
     // 加载页面
-    if (model.configInfo.isPro) {
+    if (model.config.state.isPro) {
       FluroRouter.router.navigateTo(context,
-          '/webview?url=${Uri.encodeComponent(this.model.configInfo.config['GitHubAssetOrigin'] + url)}');
+          '/webview?url=${Uri.encodeComponent(model.config.state.env.GithubAssetOrigin + url)}');
     } else {
       // 加载本地
       String mdStr = await FileUtils.readLocaleFile(url);
@@ -112,7 +113,7 @@ class IndexState extends State<Index> {
   }
 
   Future getMdFile(url) async {
-    String mdStr = await FileUtils.readLocaleFile(url);
+    String mdStr = await LoadAssetUtils.loadMarkdownAssets(url);
     return mdStr;
   }
 

lib/config/development.dart

@@ -1,3 +1,6 @@
-Map<String ,dynamic> Config  = {
- 'GitHubAssetOrigin': 'https://github.com/efoxTeam/flutter-ui/blob/master/'
-};
+class Config {
+  String GithubAssetOrigin =
+      'https://github.com/efoxTeam/flutter-ui/blob/master/';
+  String GithubMarkdownOrigin =
+      'https://raw.githubusercontent.com/efoxTeam/flutter-ui/master/';
+}

lib/config/index.dart

@@ -3,4 +3,4 @@ import 'production.dart' as Production;
 
 const bool isPro = false;
 
-Map<String, dynamic> env = isPro ? Production.Config : Development.Config;
+Object env = isPro ? Production.Config() : Development.Config();

lib/config/production.dart

@@ -1,3 +1,6 @@
-Map<String ,dynamic> Config  = {
- 'GitHubAssetOrigin': 'https://github.com/efoxTeam/flutter-ui/blob/master/'
-};
+class Config {
+  String GithubAssetOrigin =
+      'https://github.com/efoxTeam/flutter-ui/blob/master/';
+  String GithubMarkdownOrigin =
+      'https://raw.githubusercontent.com/efoxTeam/flutter-ui/master/';
+}

lib/main.dart

@@ -4,7 +4,7 @@ import 'package:flutter_localizations/flutter_localizations.dart';
 import 'package:efox_flutter/lang/application.dart';
 import 'package:efox_flutter/lang/app_translations_delegate.dart';
 //引用Store 层
-import 'package:efox_flutter/store/store.dart';
+import 'package:efox_flutter/store/store.dart' show model, STORE;
 //路由
 import 'package:efox_flutter/router/index.dart';
 void main() => runApp(MainApp());
@@ -18,8 +18,6 @@ class MainApp extends StatefulWidget {
 }
 
 class MainAppState extends State<MainApp> {
-  //实例化 model
-  final model = MainStateModel();
   // 定义全局 语言代理
   AppTranslationsDelegate _newLocaleDelegate;
 

lib/page/mine/index.dart

@@ -1,16 +1,19 @@
 import 'package:flutter/material.dart';
-import 'package:efox_flutter/store/models/main_state_model.dart';
-
 
 class Index extends StatelessWidget {
-  final MainStateModel model;
+  final dynamic model;
   Index({Key key, this.model}):super(key: key);
 
   @override
   Widget build (BuildContext context) {
     return Container(
       child: Center(
-        child: Text('a'),
+        child: RaisedButton(
+          child: Text('当前为${model.config.state.isPro ? '线上' : '线下'}环境，点击进行切换'),
+          onPressed: () {
+            model.dispatch('config', 'setEnv');
+          },
+        ),
       ),
     );
   }

lib/store/STORE.dart

@@ -2,12 +2,17 @@ import 'package:scoped_model/scoped_model.dart';
 import './models/main_state_model.dart';
 export './models/main_state_model.dart';
 
+/**
+ * import 'package:efox_flutter/store/STORE.dart' as Store;
+ * Store.model.config.state.isPro
+ */
 class STORE {
   static init({model, child}) {
     return ScopedModel<MainStateModel>(model: model, child: child);
   }
 
   static get(context) => ScopedModel.of<MainStateModel>(context);
+  
   static connect({
     builder,
     child,

lib/store/http.dart

@@ -1,35 +1,6 @@
 import 'package:dio/dio.dart';
 
-class RestApi {
-  RestApi();
-  static Dio _dio;
-  static getDio([options]) {
-    if (RestApi._dio != null) {
-      return RestApi._dio;
-    }
-    Dio dio = new Dio(options);
-    RestApi._dio = dio;
-    return dio;
-  }
+request() async {
+  Dio dio = new Dio(); // with default Options
 
-  static request({method, url, data}) async {
-    Response<dynamic> response;
-    if (method == 'get') {
-      response = await RestApi.getDio().get(url, data: data);
-    } else {
-      response = await RestApi.getDio().post(url, data: data);
-    }
-    return response.data;
-  }
-
-  // dio.post('/test', data: {id:'123'})
-  static Future post(url, [data]) async{
-    return await RestApi.getDio().post(url, data: data);
-  }
-
-  // dio.get('/test', {data: {}})
-  // dio.get('/test?id=123')
-  static Future get(url, [data]) async {
-    return await RestApi.getDio().get(url, data: data);
-  }
 }

lib/store/models/config_state_model.dart

@@ -1,11 +1,22 @@
-import 'package:scoped_model/scoped_model.dart';
 import 'package:efox_flutter/config/index.dart' as Config;
 
 class ConfigInfo {
   bool isPro = Config.isPro;
-  dynamic config = Config.env;
+  dynamic env = Config.env;
+}
+
+ConfigInfo _appConfigInfo = new ConfigInfo();
+
+class ConfigModel {
+  get state => _appConfigInfo;
+
+  methods(name, payload) {
+    print('payload= $payload');
+
+    switch (name) {
+      case 'setEnv':
+        _appConfigInfo.isPro = !_appConfigInfo.isPro;
+        break;
+    }
+  }
 }
-mixin ConfigModel on Model {
-  ConfigInfo _appConfigInfo = new ConfigInfo();
-  get configInfo => _appConfigInfo;
-}

lib/store/models/main_state_model.dart

@@ -3,9 +3,33 @@ import 'user_model.dart' show UserModel;
 import 'theme_model.dart' show AppThemeModel;
 import 'config_state_model.dart' show ConfigModel;
 
+/**
+ * get state: model.modelName.state.xxx
+ * dispatch method: model.dispatch('modelName', 'methodsName', payload)
+ * 
+ * import 'package:efox_flutter/store/STORE.dart' as Store;
+ * Store.model.config.state.isPro
+ */
+
 ///主数据模型，需要全局使用的数据在这里添加模型
-class MainStateModel extends Model with UserModel, AppThemeModel, ConfigModel {
+class MainStateModel extends Model with UserModel, AppThemeModel {
+  Map<String, dynamic> state = {};
+  ConfigModel config = ConfigModel();
+
   MainStateModel() {
     // 初始化实例数据
+    // order for dispatch to get destination model's methods
+    this.state = {
+      'config': config,
+    };
+  }
+  /**
+   * dispatch method: model.dispatch('modelName', 'methodsName', payload)
+   */
+  dispatch(nameSpace, method, [payload]) async {
+    this.state[nameSpace].methods(method, payload);
+    notifyListeners();
   }
 }
+
+MainStateModel model = MainStateModel();