goods、order、home、login迁移完成

lib/demo/demo_page.dart

@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
 import 'package:flutter_deer/demo/focus/focus_demo_page.dart';
 import 'package:flutter_deer/demo/lottie/lottie_demo.dart';
 import 'package:flutter_deer/demo/navigator/books_main.dart';
@@ -20,6 +21,16 @@ class DemoPage extends StatefulWidget {
 }
 
 class _DemoPageState extends State<DemoPage> {
+
+  @override
+  void initState() {
+    super.initState();
+    WidgetsBinding.instance!.addPostFrameCallback((_) {
+      /// 显示状态栏和导航栏(使用QuickActions进入demo页)
+      SystemChrome.setEnabledSystemUIOverlays([SystemUiOverlay.top, SystemUiOverlay.bottom]);
+    });
+  }
+
   @override
   Widget build(BuildContext context) {
     return Scaffold(

lib/generated/json/base/json_convert_content.dart

@@ -9,6 +9,8 @@ import 'package:flutter_deer/shop/models/user_entity.dart';
 import 'package:flutter_deer/generated/json/user_entity_helper.dart';
 import 'package:flutter_deer/account/models/city_entity.dart';
 import 'package:flutter_deer/generated/json/city_entity_helper.dart';
+import 'package:flutter_deer/goods/models/goods_sort_entity.dart';
+import 'package:flutter_deer/generated/json/goods_sort_entity_helper.dart';
 import 'package:flutter_deer/order/models/search_entity.dart';
 import 'package:flutter_deer/generated/json/search_entity_helper.dart';
 
@@ -29,6 +31,8 @@ class JsonConvert<T> {
 				return userEntityFromJson(data as UserEntity, json) as T;
 			case CityEntity:
 				return cityEntityFromJson(data as CityEntity, json) as T;
+			case GoodsSortEntity:
+				return goodsSortEntityFromJson(data as GoodsSortEntity, json) as T;
 			case SearchEntity:
 				return searchEntityFromJson(data as SearchEntity, json) as T;
 			case SearchItems:
@@ -48,6 +52,8 @@ class JsonConvert<T> {
 				return userEntityToJson(data as UserEntity);
 			case CityEntity:
 				return cityEntityToJson(data as CityEntity);
+			case GoodsSortEntity:
+				return goodsSortEntityToJson(data as GoodsSortEntity);
 			case SearchEntity:
 				return searchEntityToJson(data as SearchEntity);
 			case SearchItems:
@@ -68,6 +74,8 @@ class JsonConvert<T> {
 			return UserEntity().fromJson(json);
 		}	else if(type == (CityEntity).toString()){
 			return CityEntity().fromJson(json);
+		}	else if(type == (GoodsSortEntity).toString()){
+			return GoodsSortEntity().fromJson(json);
 		}	else if(type == (SearchEntity).toString()){
 			return SearchEntity().fromJson(json);
 		}	else if(type == (SearchItems).toString()){
@@ -88,6 +96,8 @@ class JsonConvert<T> {
 			return data.map<UserEntity>((e) => UserEntity().fromJson(e)).toList() as M;
 		}	else if(<CityEntity>[] is M){
 			return data.map<CityEntity>((e) => CityEntity().fromJson(e)).toList() as M;
+		}	else if(<GoodsSortEntity>[] is M){
+			return data.map<GoodsSortEntity>((e) => GoodsSortEntity().fromJson(e)).toList() as M;
 		}	else if(<SearchEntity>[] is M){
 			return data.map<SearchEntity>((e) => SearchEntity().fromJson(e)).toList() as M;
 		}	else if(<SearchItems>[] is M){

lib/generated/json/goods_sort_entity_helper.dart

@@ -0,0 +1,18 @@
+import 'package:flutter_deer/goods/models/goods_sort_entity.dart';
+
+goodsSortEntityFromJson(GoodsSortEntity data, Map<String, dynamic> json) {
+	if (json['id'] != null) {
+		data.id = json['id'].toString();
+	}
+	if (json['name'] != null) {
+		data.name = json['name'].toString();
+	}
+	return data;
+}
+
+Map<String, dynamic> goodsSortEntityToJson(GoodsSortEntity entity) {
+	final Map<String, dynamic> data = new Map<String, dynamic>();
+	data['id'] = entity.id;
+	data['name'] = entity.name;
+	return data;
+}

lib/goods/goods_router.dart

@@ -1,4 +1,4 @@
-// @dart=2.9
+
 import 'package:common_utils/common_utils.dart';
 import 'package:fluro/fluro.dart';
 import 'package:flutter_deer/goods/page/qr_code_scanner_page.dart';
@@ -10,7 +10,6 @@ import 'page/goods_search_page.dart';
 import 'page/goods_size_edit_page.dart';
 import 'page/goods_size_page.dart';
 
-
 class GoodsRouter implements IRouterProvider{
 
   static String goodsPage = '/goods';

lib/goods/models/goods_sort_entity.dart

@@ -0,0 +1,6 @@
+import 'package:flutter_deer/generated/json/base/json_convert_content.dart';
+
+class GoodsSortEntity with JsonConvert<GoodsSortEntity> {
+	late String id;
+	late String name;
+}

lib/goods/page/goods_edit_page.dart

@@ -1,4 +1,3 @@
-// @dart=2.9
 import 'package:flutter/material.dart';
 import 'package:flutter_deer/goods/provider/goods_sort_provider.dart';
 import 'package:flutter_deer/goods/widgets/goods_sort_bottom_sheet.dart';
@@ -21,7 +20,7 @@ import '../goods_router.dart';
 class GoodsEditPage extends StatefulWidget {
 
   const GoodsEditPage({
-    Key key,
+    Key? key,
     this.isAdd = true,
     this.isScan = false,
     this.heroTag,
@@ -30,22 +29,22 @@ class GoodsEditPage extends StatefulWidget {
 
   final bool isAdd;
   final bool isScan;
-  final String heroTag;
-  final String goodsImageUrl;
+  final String? heroTag;
+  final String? goodsImageUrl;
 
   @override
   _GoodsEditPageState createState() => _GoodsEditPageState();
 }
 
 class _GoodsEditPageState extends State<GoodsEditPage> {
 
-  String _goodsSortName;
+  String? _goodsSortName;
   final TextEditingController _codeController = TextEditingController();
 
   @override
   void initState() {
     super.initState();
-    WidgetsBinding.instance.addPostFrameCallback((_) {
+    WidgetsBinding.instance!.addPostFrameCallback((_) {
       if (widget.isScan) {
         _scan();
       }
@@ -92,7 +91,7 @@ class _GoodsEditPageState extends State<GoodsEditPage> {
           Center(
             child: Text(
               '点击添加商品图片',
-              style: Theme.of(context).textTheme.subtitle2.copyWith(fontSize: Dimens.font_sp14),
+              style: Theme.of(context).textTheme.subtitle2?.copyWith(fontSize: Dimens.font_sp14),
             ),
           ),
           Gaps.vGap16,

lib/goods/page/goods_list_page.dart

@@ -1,5 +1,3 @@
-// @dart=2.9
-
 import 'package:common_utils/common_utils.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_deer/goods/models/goods_item_entity.dart';
@@ -17,8 +15,8 @@ import '../widgets/goods_item.dart';
 class GoodsListPage extends StatefulWidget {
 
   const GoodsListPage({
-    Key key,
-    @required this.index
+    Key? key,
+    required this.index
   }): super(key: key);
 
   final int index;
@@ -30,8 +28,8 @@ class GoodsListPage extends StatefulWidget {
 class _GoodsListPageState extends State<GoodsListPage> with AutomaticKeepAliveClientMixin<GoodsListPage>, SingleTickerProviderStateMixin {
 
   int _selectIndex = -1;
-  Animation<double> _animation;
-  AnimationController _controller;
+  late Animation<double> _animation;
+  late AnimationController _controller;
   List<GoodsItemEntity> _list = [];
   AnimationStatus _animationStatus = AnimationStatus.dismissed;
 
@@ -96,7 +94,7 @@ class _GoodsListPageState extends State<GoodsListPage> with AutomaticKeepAliveCl
   }
 
   int _page = 1;
-  int _maxPage;
+  late int _maxPage;
   StateType _stateType = StateType.loading;
 
   @override

lib/goods/page/goods_page.dart

@@ -1,4 +1,3 @@
-// @dart=2.9
 import 'package:flutter/material.dart';
 import 'package:flutter_deer/goods/goods_router.dart';
 import 'package:flutter_deer/goods/page/goods_list_page.dart';
@@ -17,7 +16,7 @@ import 'package:provider/provider.dart';
 /// design/4商品/index.html
 class GoodsPage extends StatefulWidget {
 
-  const GoodsPage({Key key}) : super(key: key);
+  const GoodsPage({Key? key}) : super(key: key);
 
   @override
   _GoodsPageState createState() => _GoodsPageState();
@@ -26,7 +25,7 @@ class GoodsPage extends StatefulWidget {
 class _GoodsPageState extends State<GoodsPage> with SingleTickerProviderStateMixin, AutomaticKeepAliveClientMixin {
 
   final List<String> _sortList = ['全部商品', '个人护理', '饮料', '沐浴洗护', '厨房用具', '休闲食品', '生鲜水果', '酒水', '家庭清洁'];
-  TabController _tabController;
+  TabController? _tabController;
   final PageController _pageController = PageController(initialPage: 0);
 
   final GlobalKey _addKey = GlobalKey();
@@ -43,14 +42,14 @@ class _GoodsPageState extends State<GoodsPage> with SingleTickerProviderStateMix
 
   @override
   void dispose() {
-    _tabController.dispose();
+    _tabController?.dispose();
     super.dispose();
   }
 
   @override
   Widget build(BuildContext context) {
     super.build(context);
-    final Color _iconColor = ThemeUtils.getIconColor(context);
+    final Color? _iconColor = ThemeUtils.getIconColor(context);
     return ChangeNotifierProvider<GoodsPageProvider>(
       create: (_) => provider,
       child: Scaffold(
@@ -158,15 +157,15 @@ class _GoodsPageState extends State<GoodsPage> with SingleTickerProviderStateMix
   }
 
   void _onPageChange(int index) {
-    _tabController.animateTo(index);
+    _tabController?.animateTo(index);
     provider.setIndex(index);
   }
 
   /// design/4商品/index.html#artboard3
   void _showSortMenu() {
     // 获取点击控件的坐标
-    final RenderBox button = _buttonKey.currentContext.findRenderObject() as RenderBox;
-    final RenderBox body = _bodyKey.currentContext.findRenderObject() as RenderBox;
+    final RenderBox button = _buttonKey.currentContext!.findRenderObject()! as RenderBox;
+    final RenderBox body = _bodyKey.currentContext!.findRenderObject()! as RenderBox;
 
     showPopupWindow<void>(
       context: context,
@@ -187,7 +186,7 @@ class _GoodsPageState extends State<GoodsPage> with SingleTickerProviderStateMix
 
   /// design/4商品/index.html#artboard4
   void _showAddMenu() {
-    final RenderBox button = _addKey.currentContext.findRenderObject() as RenderBox;
+    final RenderBox button = _addKey.currentContext!.findRenderObject()! as RenderBox;
 
     showPopupWindow<void>(
       context: context,

lib/goods/page/goods_search_page.dart

@@ -1,12 +1,11 @@
-// @dart=2.9
 
 import 'package:flutter/material.dart';
 import 'package:flutter_deer/util/toast_utils.dart';
 import 'package:flutter_deer/widgets/search_bar.dart';
 
 class GoodsSearchPage extends StatefulWidget {
 
-  const GoodsSearchPage({Key key}) : super(key: key);
+  const GoodsSearchPage({Key? key}) : super(key: key);
 
   @override
   _GoodsSearchPageState createState() => _GoodsSearchPageState();

lib/goods/page/goods_size_edit_page.dart

@@ -1,4 +1,3 @@
-// @dart=2.9
 import 'package:flutter/material.dart';
 import 'package:flutter_deer/routers/fluro_navigator.dart';
 import 'package:flutter_deer/widgets/my_button.dart';
@@ -11,7 +10,7 @@ import 'package:flutter_deer/widgets/my_app_bar.dart';
 /// design/4商品/index.html#artboard14
 class GoodsSizeEditPage extends StatefulWidget {
 
-  const GoodsSizeEditPage({Key key}) : super(key: key);
+  const GoodsSizeEditPage({Key? key}) : super(key: key);
 
   @override
   _GoodsSizeEditPageState createState() => _GoodsSizeEditPageState();
@@ -43,7 +42,7 @@ class _GoodsSizeEditPageState extends State<GoodsSizeEditPage> {
           Center(
             child: Text(
               '点击添加分类图片',
-              style: Theme.of(context).textTheme.subtitle2.copyWith(fontSize: Dimens.font_sp14),
+              style: Theme.of(context).textTheme.subtitle2?.copyWith(fontSize: Dimens.font_sp14),
             ),
           ),
           Gaps.vGap16,

lib/goods/page/goods_size_page.dart

@@ -1,4 +1,3 @@
-// @dart=2.9
 import 'package:flutter/material.dart';
 import 'package:flutter_deer/goods/models/goods_size_model.dart';
 import 'package:flutter_deer/goods/widgets/goods_size_dialog.dart';
@@ -19,7 +18,7 @@ import '../goods_router.dart';
 /// design/4商品/index.html#artboard9
 class GoodsSizePage extends StatefulWidget {
 
-  const GoodsSizePage({Key key}) : super(key: key);
+  const GoodsSizePage({Key? key}) : super(key: key);
 
   @override
   _GoodsSizePageState createState() => _GoodsSizePageState();
@@ -48,14 +47,14 @@ class _GoodsSizePageState extends State<GoodsSizePage> {
     _goodsSizeList.add(GoodsSizeModel('goods/goods_size_1', '黑色3', 10, '50.0', 2, '2', '2.5', ''));
 
     // 获取Build完成状态监听
-    WidgetsBinding.instance.addPostFrameCallback((_) {
+    WidgetsBinding.instance!.addPostFrameCallback((_) {
       _showHint();
     });
   }
 
   /// design/4商品/index.html#artboard18
   void _showHint() {
-    final RenderBox hint = _hintKey.currentContext.findRenderObject() as RenderBox;
+    final RenderBox hint = _hintKey.currentContext!.findRenderObject()! as RenderBox;
     showPopupWindow<void>(
       context: context,
       isShowBg: true,
@@ -125,7 +124,7 @@ class _GoodsSizePageState extends State<GoodsSizePage> {
                   key: const Key('name_edit'),
                   text: TextSpan(
                     text: '先对名称进行',
-                    style: Theme.of(context).textTheme.subtitle2.copyWith(fontSize: Dimens.font_sp14),
+                    style: Theme.of(context).textTheme.subtitle2?.copyWith(fontSize: Dimens.font_sp14),
                     children: <TextSpan>[
                       TextSpan(text: '编辑', style: TextStyle(color: Theme.of(context).primaryColor)),
                     ],
@@ -226,7 +225,7 @@ class _GoodsSizePageState extends State<GoodsSizePage> {
       onTap: () {
         /// 如果侧滑菜单打开，关闭侧滑菜单。否则跳转
         if (_slidableController.activeState != null) {
-          _slidableController.activeState.close();
+          _slidableController.activeState!.close();
         } else {
           NavigatorUtils.push(context, GoodsRouter.goodsSizeEditPage);
         }