merge & fix conflicts

lib/app_config.dart

+import 'package:flutter/material.dart';
+import 'package:hybrid_stack_manager/hybrid_stack_manager_plugin.dart';
+import 'opinion.dart';
+
+
+class ALRoute {
+  ALRoute._();
+  static const String Flutter_Hybrid = 'hrd://';
+  static const String Opinion = 'opinion';
+}
+
+String fullRouteUrl(route) {
+  return ALRoute.Flutter_Hybrid + route;
+}
+
+class AppConfig {
+  static final AppConfig _singleton = new AppConfig._internal();
+  static final GlobalKey gHomeItemPageWidgetKey =
+      new GlobalKey(debugLabel: "[KWLM]");
+  static AppConfig sharedInstance() {
+    Router.sharedInstance().globalKeyForRouter = gHomeItemPageWidgetKey;
+    Router.sharedInstance().routerWidgetHandler =
+        ({RouterOption routeOption, Key key}) {
+      print('Route----${fullRouteUrl(ALRoute.Opinion)}');
+      // 意见与反馈
+      if (routeOption.url == fullRouteUrl(ALRoute.Opinion)) {
+        return new Opinion(routeOption, key: key);
+      }
+      return null;
+    };
+    return _singleton;
+  }
+
+  AppConfig._internal() {}
+}

lib/macros/ALColors.dart

+// Copyright 2019 All rights reserved.
+// Authors: Mikasa Authors.
+
+import 'dart:ui' show Color;
+
+import 'package:flutter/painting.dart';
+
+
+// 关于颜色的定义
+// Color(0xFF323232);
+// FF 表示透明度 323232 表示RGB颜色值
+
+class ALColors {
+  ALColors._();
+  static const Color Color323232 = Color(0xFF323232);
+  static const Color Color464646 = Color(0xFF464646);
+  static const Color Color999999 = Color(0xFF999999);
+  static const Color ColorFFFFFF = Color(0xFFffffff);
+  static const Color Color8E8E8E = Color(0xFF8e8e8e);
+  static const Color ColorC4C4C4 = Color(0xFFc4c4c4);
+  static const Color ColorF8F8F8 = Color(0xFFf8f8f8);
+  static const Color ColorE4E4E4 = Color(0xFFe4e4e4);
+  static const Color ColorF4F3F8 = Color(0xFFf4f3f8);
+  static const Color Color282828 = Color(0xFF282828);
+  static const Color ColorE5E5E5 = Color(0xFFe5e5e5);
+}
\ No newline at end of file

lib/macros/ALCommon.dart

+//
+//  ALCommon
+//
+//  gmalpha_flutter
+//  Created by lxrent on 2019/2/19.
+//  Copyright © 2019 Gengmei. All rights reserved.
+//
+
+import 'package:flutter/material.dart';
+import 'ALColors.dart';
+
+class ALAlphaButton extends FlatButton {
+//  factory ALAlphaButton
+  /// Create a simple text button.
+  const ALAlphaButton({
+    Key key,
+    @required VoidCallback onPressed,
+    ValueChanged<bool> onHighlightChanged,
+    ButtonTextTheme textTheme,
+    Color textColor,
+    Color disabledTextColor,
+    Color color,
+    Color disabledColor,
+    Color highlightColor,
+    Color splashColor,
+    double minWidth,
+    Brightness colorBrightness,
+    EdgeInsetsGeometry padding,
+    ShapeBorder shape,
+    Clip clipBehavior = Clip.none,
+    MaterialTapTargetSize materialTapTargetSize,
+    @required Widget child,
+  }) : super(
+          key: key,
+          onPressed: onPressed,
+          onHighlightChanged: onHighlightChanged,
+          textTheme: textTheme,
+          textColor: textColor,
+          disabledTextColor: disabledTextColor,
+          color: color,
+          disabledColor: disabledColor,
+          highlightColor: highlightColor,
+          splashColor: splashColor,
+          colorBrightness: colorBrightness,
+          padding: padding,
+          shape: shape,
+          clipBehavior: clipBehavior,
+          materialTapTargetSize: materialTapTargetSize,
+          child: child,
+        );
+
+  @override
+  Widget build(BuildContext context) {
+    // TODO: implement build
+    return FlatButton(
+      textTheme:textTheme,
+      padding: padding,
+      child: child,
+      onPressed: onPressed,
+      textColor: ALColors.Color323232,
+      highlightColor:ALColors.Color323232,
+      color: ALColors.ColorFFFFFF,
+      shape: OutlineInputBorder(
+          borderRadius: BorderRadius.all(Radius.circular(0)),
+          borderSide: BorderSide(color: ALColors.Color323232)),
+    );
+  }
+}

lib/macros/ALDevice.dart

+//
+//  ALDevice
+//
+//  gm_alpha_flutter
+//  Created by lxrent on 2019/1/30.
+//  Copyright © 2019 Gengmei. All rights reserved.
+//
+import 'dart:ui';
+
+class ALDevice {
+  ALDevice._();
+  static bool debug = !const bool.fromEnvironment("dart.vm.product");
+  static double width = window.physicalSize.width;
+  static double height = window.physicalSize.height;
+
+}
\ No newline at end of file

lib/macros/ALFont.dart

+//
+//  ALFont
+//
+//  gmalpha_flutter
+//  Created by lxrent on 2019/2/19.
+//  Copyright © 2019 Gengmei. All rights reserved.
+//
+

lib/main.dart

 import 'package:flutter/material.dart';
+<<<<<<< HEAD
 import 'battery.dart';
 import 'assetsChannel.dart';
 import 'layoutTest.dart';
@@ -26,6 +27,31 @@ class MyApp extends StatelessWidget {
 
   Widget batteryChannelPage(BuildContext context) {
     return PlatformChannel();
+=======
+import 'package:hybrid_stack_manager/router.dart';
+import 'package:hybrid_stack_manager/hybrid_stack_manager.dart';
+import 'package:hybrid_stack_manager/router_option.dart';
+import 'app_config.dart';
+import 'my_app.dart';
+
+//void main() {
+//  debugPaintSizeEnabled = false; //打开视觉调试开关
+//  return runApp(_widgetForRoute(window.defaultRouteName));
+//
+//}
+
+void main() async {
+  AppConfig.sharedInstance();
+  HybridStackManagerPlugin plugin =
+      HybridStackManagerPlugin.hybridStackManagerPlugin;
+  Map args = await plugin.getMainEntryParams();
+  runApp(new MyApp());
+  if (args != null && args["url"] != null) {
+    RouterOption routeOption = new RouterOption(
+        url: args["url"], query: args["query"], params: args["params"]);
+    Router.sharedInstance().pushPageWithOptionsFromFlutter(
+        routeOption: routeOption, animated: false);
+>>>>>>> dev
   }
 
   Widget assetsChannelPage(BuildContext context) {
@@ -41,6 +67,7 @@ class MyApp extends StatelessWidget {
   }
 }
 
+<<<<<<< HEAD
 class MyHomePage extends StatefulWidget {
   MyHomePage({Key key, this.title}) : super(key: key);
 
@@ -107,3 +134,6 @@ class _MyHomePageState extends State<MyHomePage> {
     );
   }
 }
+=======
+
+>>>>>>> dev

lib/my_app.dart

+import 'package:flutter/material.dart';
+
+import 'app_config.dart';
+
+class MyApp extends StatefulWidget {
+  MyApp();
+  State<StatefulWidget> createState() {
+    return new MyAppState();
+  }
+}
+
+class MyAppState extends State<MyApp> {
+  @override
+  void initState() {
+    // TODO: implement initState
+    super.initState();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    ThemeData themeData = new ThemeData(
+      primarySwatch: Colors.blue,
+    );
+    return new MaterialApp(
+      debugShowCheckedModeBanner: false,
+
+      title: '混合栈Demo',
+      theme: themeData,
+      home: new MyHomeWidget(key: AppConfig.gHomeItemPageWidgetKey),
+    );
+  }
+}
+
+class MyHomeWidget extends StatefulWidget {
+  MyHomeWidget({Key key}) : super(key: key);
+
+  @override
+  State<StatefulWidget> createState() {
+    return new MyHomeWidgetState();
+  }
+}
+
+class MyHomeWidgetState extends State<MyHomeWidget> {
+  @override
+  Widget build(BuildContext context) {
+    return new Container(
+      color: Colors.white,
+    );
+  }
+}

lib/opinion.dart

+//
+//  opinion
+//
+//  gmalpha_flutter
+//  Created by Mikasa on 2019/2/19.
+//  Copyright © 2019 Gengmei. All rights reserved.
+//
+
+import 'package:flutter/material.dart';
+import 'macros/ALColors.dart';
+import 'macros/ALDevice.dart';
+import 'macros/ALCommon.dart';
+import 'package:hybrid_stack_manager/hybrid_stack_manager_plugin.dart';
+
+class Opinion extends StatelessWidget {
+
+  RouterOption routeOption;
+  Opinion(RouterOption option, {Key key}) : super(key: key) {
+    routeOption = option;
+  }
+
+  Widget build(BuildContext context) {
+
+//    Map m = Utils.parseUniquePageName(routeOption.userInfo);
+    return MaterialApp(
+      debugShowCheckedModeBanner: false,
+      title: '意见与建议',
+      color: ALColors.Color323232,
+      theme: ThemeData(
+        splashColor: Colors.white10
+        ,//水波纹的颜色
+      ),
+      home: OpinionPage(title: '意见和建议'),
+    );
+  }
+}
+
+class OpinionPage extends StatefulWidget {
+  OpinionPage({Key key, this.title}) : super(key: key);
+
+  final String title;
+
+  @override
+  _OpinionPageState createState() => _OpinionPageState();
+}
+
+class _OpinionPageState extends State<OpinionPage> {
+  TextEditingController opinionCtrl = TextEditingController();
+  TextEditingController telCtrl = TextEditingController();
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+        appBar: AppBar(
+//          backgroundColor: ALColors.ColorFFFFFF,
+          backgroundColor: Colors.white10,
+
+          leading: new GestureDetector(
+              child: new Icon(Icons.keyboard_backspace),
+              onTap: () {
+                HybridStackManagerPlugin.hybridStackManagerPlugin.popCurPage();
+              }),
+          title: new Text("意见与建议",style: TextStyle(color: ALColors.Color323232,fontSize: 16,fontWeight: FontWeight.bold),),
+        ),
+        body: Container(
+          height: ALDevice.height,
+          width: ALDevice.width,
+          child: Center(
+            child: Column(
+              mainAxisAlignment: MainAxisAlignment.spaceBetween,
+              children: <Widget>[
+                Container(
+                  alignment: Alignment.topCenter,
+                  margin:
+                      EdgeInsets.only(left: 30, top: 42, right: 30, bottom: 0),
+                  height: 215,
+                  width: ALDevice.width,
+                  decoration: BoxDecoration(
+                    border: Border.all(color: ALColors.ColorC4C4C4, width: 1),
+                  ),
+                  child: TextField(
+                    maxLines: 10,
+                    controller: opinionCtrl,
+                    decoration: InputDecoration(
+                      border: InputBorder.none,
+                      contentPadding: EdgeInsets.all(10),
+                      hintText: '意见与建议',
+                      hintStyle: TextStyle(
+                        color: ALColors.ColorC4C4C4,
+                        fontSize: 14,
+                      ),
+                      labelStyle:
+                          TextStyle(color: ALColors.Color323232, fontSize: 19),
+                    ),
+                  ),
+                ),
+                Container(
+                  height: 40,
+                  margin: EdgeInsets.only(left: 30, right: 30,top: 30),
+                  padding: EdgeInsets.only(bottom: 10),
+                  decoration: BoxDecoration(
+                      border: Border(
+                    bottom: BorderSide(color: ALColors.ColorC4C4C4),
+                  )),
+                  alignment: Alignment.centerLeft,
+                  child: TextField(
+                    controller: telCtrl,
+                    decoration: InputDecoration(
+                      border: InputBorder.none,
+                      contentPadding: EdgeInsets.all(10),
+                      hintText: '联系方式',
+                      hintStyle: TextStyle(
+                        color: ALColors.ColorC4C4C4,
+                        fontSize: 14,
+                      ),
+                      labelStyle:
+                          TextStyle(color: ALColors.Color323232, fontSize: 19),
+                    ),
+                  ),
+                ),
+                Container(
+                  decoration: BoxDecoration(
+                      border:
+                          Border.all(color: ALColors.Color323232, width: 1.5)),
+                  margin: EdgeInsets.all(30),
+                  padding: EdgeInsets.all(0),
+                  constraints:
+                      BoxConstraints(minWidth: ALDevice.width, minHeight: 45),
+                  alignment: Alignment.center,
+                  child: FlatButton(
+                    onPressed: confirmClick,
+                    child: Text(
+                      '提交',
+                      style:
+                          TextStyle(fontSize: 14, color: ALColors.Color323232),
+                    ),
+                  ),
+                ),
+              ],
+            ),
+          ),
+        ));
+  }
+}
+
+void confirmClick() {
+
+  // 提交信息 && 回到上一级页面
+  HybridStackManagerPlugin.hybridStackManagerPlugin.popCurPage();
+
+  print('confirmClick');
+}
+

lib/services/ALNetClient.dart

+//
+//  ALNetClient
+//
+//  gm_alpha_flutter
+//  Created by lxrent on 2019/1/31.
+//  Copyright © 2019 Gengmei. All rights reserved.
+//
+
+import 'dart:convert';
+import 'dart:async';
+import 'ALServers.dart';
+import 'package:dio/dio.dart';
+import 'dart:io';
+import 'package:shared_preferences/shared_preferences.dart';
+
+
+class ALResponse {
+  const ALResponse(
+      {this.isSuccess,
+        this.data,
+        this.error,
+        this.errorCode,
+        this.message});
+
+  final bool isSuccess;
+  final dynamic data;
+  final int error;
+  final String errorCode;
+  final String message;
+
+  factory ALResponse.fromResponse(Response response) {
+    if(response.statusCode == 403) return null;
+
+    var data = jsonDecode(response.toString());
+
+    print('${response.request.path}\n${data}\n${response.request.cookies}');
+    return new ALResponse(
+      isSuccess: data['error'] == 0?true:false,
+      data: data,
+      error: data['error'],
+      errorCode: data['errorCode'],
+      message: data['message'],
+    );
+  }
+}
+
+// 通用参数
+String urlCommonParameters() {
+  return 'platform=iPhone&os_version=12.1.2&version=1.3.0&model=iPhone%20XS%20Max&release=0&idfa=EE10F836-B882-4AB8-9AB1-8E116BD48DEE&idfv=178AB378-66BF-46B3-BD12-C10FAA35C74C&device_id=EE10F836-B882-4AB8-9AB1-8E116BD48DEE&channel=(null)&app_name=gengmeiios&current_city_id=worldwide&lat=0&lng=0&is_WiFi=(null)&phone_id=iPhone11,6&count=10&page=1&type=1';
+}
+
+// 全链接
+String fullAPI(api) {
+  return apiHost() + api + '?' + urlCommonParameters();
+}
+
+// request请求
+Options requestOptions(type) {
+
+  Options options = new Options(
+      baseUrl: '',
+      contentType: new ContentType('application', 'x-www-form-urlencoded',charset: 'utf-8'),
+      headers: {'User-Agent':'Mozilla/5.0 (iPhone; CPU iPhone OS 10_10_1 like Mac OS X) AppleWebKit/600.1.4 (KHTML, like Gecko) Mobile/12B411 GMAlpha/1.2.1'},
+      connectTimeout: ALServers.ConnetTimeOut,
+      receiveTimeout: ALServers.ReceiveTimeOut,
+      method: type,
+  );
+  return options;
+}
+
+Future<ALResponse> excuteGet(url, params) async {
+
+  Dio dio = new Dio();
+  SharedPreferences pre = await SharedPreferences.getInstance();
+  Options options = requestOptions('GET');
+  options.cookies = createGMTokenCookie(pre.get(apiHost()));
+
+  var response = await dio
+      .request(fullAPI(url), data: params, options: options);
+  return await ALResponse.fromResponse(response);
+
+}
+
+List<Cookie> createGMTokenCookie(List<String> cookieString) {
+
+  List<Cookie> cookieList = List();
+  for(String value in cookieString) {
+
+    Cookie cookie = Cookie.fromSetCookieValue(value);
+    cookieList.add(cookie);
+  }
+  Cookie gm_token = Cookie.fromSetCookieValue('_gm_token=decf991549869501');
+  cookieList.add(gm_token);
+  return cookieList;
+}
+
+Future<ALResponse> excutePost(url, params) async {
+
+
+  Dio dio = new Dio();
+  SharedPreferences pre = await SharedPreferences.getInstance();
+  Options options = requestOptions('POST');
+  options.cookies = createGMTokenCookie(pre.get(apiHost()));
+  var response = await dio
+      .request(fullAPI(url), data: params, options: options);
+  if(response.headers['Set-Cookie'] != null) {
+    // 保存cookie
+    List cookie = response.headers[HttpHeaders.setCookieHeader];
+    pre.setStringList(apiHost(), cookie);
+  }
+  return await ALResponse.fromResponse(response);
+}

lib/services/ALServers.dart

+//
+//  ALServers
+//
+//  gm_alpha_flutter
+//  Created by Mikasa on 2019/1/30.
+//  Copyright © 2019 Gengmei. All rights reserved.
+//
+
+import '../macros/ALDevice.dart';
+
+// API
+class ALServers {
+  ALServers._();
+  static const int ConnetTimeOut = 5000; // 连接超时
+  static const int ReceiveTimeOut = 3000; // 接收超时
+
+
+  static const String API_SETTING_COUNTRYLIST = '/api/v1/countries';//国家列表
+  static const String API_LOGOUT = '/api/account/logout'; // 注销
+  static const String API_ACCOUNT_LOGIN_PWD ='/api/account/login_pwd';// 账号密码登录
+  static const String API_V1_INDEX = '/api/v1/index'; // 首页
+  static const String API_ACCOUNT_REGISTER = '/api/account/register';// 用户注册
+  static const String API_ACCOUNT_GETVFC = '/api/account/get_vfc';// 获取验证码
+  static const String API_ACCOUNT_THIRDPART = '/api/account/thirdparty_login'; // 三方账户登录
+
+
+  // HOST
+}
+// HOST
+ String apiHost() {
+  if (ALDevice.debug) {
+    return 'http://earth.alpha.newdev';
+  } else {
+    return 'https://earth.iyanzhi.com';
+  }
+}
+
+

pubspec.lock

 # Generated by pub
 # See https://www.dartlang.org/tools/pub/glossary#lockfile
 packages:
+  archive:
+    dependency: transitive
+    description:
+      name: archive
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "2.0.8"
+  args:
+    dependency: transitive
+    description:
+      name: args
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "1.5.1"
   async:
     dependency: transitive
     description:
       name: async
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.0.8"
   boolean_selector:
     dependency: transitive
     description:
       name: boolean_selector
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.0.4"
   charcode:
     dependency: transitive
     description:
       name: charcode
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.1.2"
   collection:
     dependency: transitive
     description:
       name: collection
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.14.11"
+  convert:
+    dependency: transitive
+    description:
+      name: convert
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "2.1.1"
+  cookie_jar:
+    dependency: transitive
+    description:
+      name: cookie_jar
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "1.0.0"
+  crypto:
+    dependency: transitive
+    description:
+      name: crypto
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "2.0.6"
   cupertino_icons:
     dependency: "direct main"
     description:
       name: cupertino_icons
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "0.1.2"
+<<<<<<< HEAD
   event_bus:
     dependency: "direct main"
     description:
@@ -50,6 +86,15 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.4.0"
+=======
+  dio:
+    dependency: "direct main"
+    description:
+      name: dio
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "2.0.10"
+>>>>>>> dev
   flutter:
     dependency: "direct main"
     description: flutter
@@ -60,34 +105,76 @@ packages:
     description: flutter
     source: sdk
     version: "0.0.0"
+  hybrid_stack_manager:
+    dependency: "direct main"
+    description:
+      name: hybrid_stack_manager
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "0.1.1"
+  image:
+    dependency: transitive
+    description:
+      name: image
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "2.0.7"
+  json_annotation:
+    dependency: "direct main"
+    description:
+      name: json_annotation
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "2.0.0"
   matcher:
     dependency: transitive
     description:
       name: matcher
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "0.12.3+1"
   meta:
     dependency: transitive
     description:
       name: meta
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.1.6"
   path:
     dependency: transitive
     description:
       name: path
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.6.2"
+  path_provider:
+    dependency: transitive
+    description:
+      name: path_provider
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "0.4.1"
+  petitparser:
+    dependency: transitive
+    description:
+      name: petitparser
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "2.1.1"
   quiver:
     dependency: transitive
     description:
       name: quiver
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.0.1"
+  shared_preferences:
+    dependency: "direct main"
+    description:
+      name: shared_preferences
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "0.4.3"
   sky_engine:
     dependency: transitive
     description: flutter
@@ -97,57 +184,65 @@ packages:
     dependency: transitive
     description:
       name: source_span
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.4.1"
   stack_trace:
     dependency: transitive
     description:
       name: stack_trace
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.9.3"
   stream_channel:
     dependency: transitive
     description:
       name: stream_channel
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.6.8"
   string_scanner:
     dependency: transitive
     description:
       name: string_scanner
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.0.4"
   term_glyph:
     dependency: transitive
     description:
       name: term_glyph
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.0.1"
   test_api:
     dependency: transitive
     description:
       name: test_api
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "0.2.1"
   typed_data:
     dependency: transitive
     description:
       name: typed_data
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.1.6"
   vector_math:
     dependency: transitive
     description:
       name: vector_math
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.0.8"
+  xml:
+    dependency: transitive
+    description:
+      name: xml
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "3.3.1"
 sdks:
   dart: ">=2.0.0 <3.0.0"
+  flutter: ">=0.3.1 <2.0.0"

pubspec.yaml

@@ -23,8 +23,17 @@ dependencies:
   # The following adds the Cupertino Icons font to your application.
   # Use with the CupertinoIcons class for iOS style icons.
   cupertino_icons: ^0.1.2
+<<<<<<< HEAD
   event_bus: ^1.0.1
   fluro: ^1.3.4
+=======
+  hybrid_stack_manager: 0.1.1
+  json_annotation: ^2.0.0
+  #  网络
+  dio: ^2.0.0
+  # 数据存储
+  shared_preferences: ^0.4.2
+>>>>>>> dev
 
 dev_dependencies:
   flutter_test:

test/widget_test.dart

-// This is a basic Flutter widget test.
-//
-// To perform an interaction with a widget in your test, use the WidgetTester
-// utility that Flutter provides. For example, you can send tap and scroll
-// gestures. You can also use WidgetTester to find child widgets in the widget
-// tree, read text, and verify that the values of widget properties are correct.
-
-import 'package:flutter/material.dart';
-import 'package:flutter_test/flutter_test.dart';
-
-import 'package:my_flutter/main.dart';
-
-void main() {
-  testWidgets('Counter increments smoke test', (WidgetTester tester) async {
-    // Build our app and trigger a frame.
-    await tester.pumpWidget(MyApp());
-
-    // Verify that our counter starts at 0.
-    expect(find.text('0'), findsOneWidget);
-    expect(find.text('1'), findsNothing);
-
-    // Tap the '+' icon and trigger a frame.
-    await tester.tap(find.byIcon(Icons.add));
-    await tester.pump();
-
-    // Verify that our counter has incremented.
-    expect(find.text('0'), findsNothing);
-    expect(find.text('1'), findsOneWidget);
-  });
-}