添加装修管理页面

添加电子商务页面
添加测试版打包部署
修改userdetailmodel

lib/constants/application_objects.dart

@@ -1,5 +1,7 @@
 // import 'package:aku_community/widget/bee_scaffold.dart';
 
+import 'package:aku_community/pages/electronic_commerc/electronic_commerc_page.dart';
+import 'package:aku_community/pages/renovation_manage/renovation_manage_page.dart';
 import 'package:flutter/material.dart';
 
 import 'package:equatable/equatable.dart';
@@ -72,11 +74,12 @@ List<AO> appObjects = [
   AO('投诉表扬', R.ASSETS_APPLICATIONS_COMPLAINT_PNG,
       () => AdvicePage(type: AdviceType.COMPLAIN)),
   AO('问卷调查', R.ASSETS_APPLICATIONS_QUESTION_PNG, () => QuestionnairePage()),
-  // AO('装修管理', R.ASSETS_APPLICATIONS_DECORATION_PNG, FitupManagePage()),
+  AO('装修管理', R.ASSETS_APPLICATIONS_DECORATION_PNG, RenovationManagePage()),
   AO('借还管理', R.ASSETS_APPLICATIONS_BORROW_PNG, () => SelectBorrowReturnPage()),
   AO('一键报警', R.ASSETS_APPLICATIONS_POLICE_PNG, () => AlarmPage()),
   AO('设施预约', R.ASSETS_ICONS_TOOL_FACILITY_PNG, () => FacilityAppointmentPage()),
   AO('快递包裹', R.ASSETS_APPLICATIONS_TRANSFER_PNG, () => ExpressPackagePage()),
+   AO('电子商务', R.ASSETS_IMAGES_PLACEHOLDER_WEBP, () => ElectronicCommercPage()),
   // AO(
   //   '小区教育',
   //   R.ASSETS_IMAGES_PLACEHOLDER_WEBP,
@@ -147,11 +150,12 @@ List<String> _smartManagerApp = [
   '物品出门',
   '投诉表扬',
   '问卷调查',
-  // '装修管理',
+  '装修管理',
   '借还管理',
   '一键报警',
   '设施预约',
-  '快递包裹'
+  '快递包裹',
+  '电子商务',
   // '小区教育',
   // '健康运动',
   // '家政服务',

lib/model/user/user_detail_model.dart

@@ -14,7 +14,7 @@ class UserDetailModel {
   int? roomStatus;
   String? nickName;
   List<String>? estateNames;
-
+  int? nowEstateExamineId;
   UserDetailModel(
       {this.id,
       this.name,
@@ -30,7 +30,8 @@ class UserDetailModel {
       this.identity,
       this.roomStatus,
       this.nickName,
-      this.estateNames});
+      this.estateNames,
+      this.nowEstateExamineId});
 
   UserDetailModel.fromJson(Map<String, dynamic> json) {
     id = json['id'];
@@ -54,6 +55,7 @@ class UserDetailModel {
     if (json['estateNames'] == null) {
       estateNames = [];
     }
+    nowEstateExamineId = json['nowEstateExamineId'];
   }
 
   Map<String, dynamic> toJson() {
@@ -73,6 +75,7 @@ class UserDetailModel {
     data['roomStatus'] = this.roomStatus;
     data['nickName'] = this.nickName;
     data['estateNames'] = this.estateNames;
+    data['nowEstateExamineId'] = this.nowEstateExamineId;
     return data;
   }
 }

lib/pages/electronic_commerc/electronic_commerc_card.dart

@@ -0,0 +1,16 @@
+import 'package:flutter/material.dart';
+
+class ElectronicCommercCard extends StatefulWidget {
+  final int index;
+  ElectronicCommercCard({Key? key, required this.index}) : super(key: key);
+
+  @override
+  _ElectronicCommercCardState createState() => _ElectronicCommercCardState();
+}
+
+class _ElectronicCommercCardState extends State<ElectronicCommercCard> {
+  @override
+  Widget build(BuildContext context) {
+    return Container();
+  }
+}

lib/pages/electronic_commerc/electronic_commerc_page.dart

@@ -0,0 +1,62 @@
+import 'package:aku_community/pages/electronic_commerc/electronic_commerc_view.dart';
+import 'package:aku_community/widget/bee_scaffold.dart';
+import 'package:aku_community/widget/tab_bar/bee_tab_bar.dart';
+import 'package:flutter/material.dart';
+
+class ElectronicCommercPage extends StatefulWidget {
+  ElectronicCommercPage({Key? key}) : super(key: key);
+
+  @override
+  _ElectronicCommercPageState createState() => _ElectronicCommercPageState();
+}
+
+class _ElectronicCommercPageState extends State<ElectronicCommercPage>
+    with TickerProviderStateMixin {
+  List<String> _tabs = [
+    '小区教育',
+    '健康运动',
+    '家政服务',
+    '居家养老',
+    '装修服务',
+    '物业租售',
+    '网上商城',
+    '代购代送',
+    '网上询价',
+    '网上采购',
+    '商品退换',
+    '质量投诉'
+  ];
+  late TabController _tabController;
+  @override
+  void initState() {
+    super.initState();
+    _tabController = TabController(length: _tabs.length, vsync: this);
+  }
+
+  @override
+  void dispose() {
+    _tabController.dispose();
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return BeeScaffold(
+      title: '电子商务',
+      appBarBottom: BeeTabBar(
+        controller: _tabController,
+        tabs: _tabs,
+        scrollable: true,
+      ),
+      body: TabBarView(
+        controller: _tabController,
+        children: List.generate(
+          _tabs.length,
+          (index) => ElectronicCommercView(
+            index: index,
+          ),
+        ),
+      ),
+    );
+  }
+}

lib/pages/electronic_commerc/electronic_commerc_view.dart

@@ -0,0 +1,23 @@
+import 'package:aku_community/pages/electronic_commerc/electronic_commerc_card.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_screenutil/flutter_screenutil.dart';
+
+class ElectronicCommercView extends StatefulWidget {
+  final int index;
+  ElectronicCommercView({Key? key, required this.index}) : super(key: key);
+
+  @override
+  _ElectronicCommercViewState createState() => _ElectronicCommercViewState();
+}
+
+class _ElectronicCommercViewState extends State<ElectronicCommercView> {
+  @override
+  Widget build(BuildContext context) {
+    return ListView(
+      padding: EdgeInsets.symmetric(vertical: 24.w,horizontal: 32.w),
+      children: [
+        ElectronicCommercCard(index: widget.index),
+      ],
+    );
+  }
+}

lib/pages/renovation_manage/renovation_manage_card.dart

@@ -0,0 +1,15 @@
+import 'package:flutter/material.dart';
+
+class RenovationManageCard extends StatefulWidget {
+  RenovationManageCard({Key? key}) : super(key: key);
+
+  @override
+  _RenovationManageCardState createState() => _RenovationManageCardState();
+}
+
+class _RenovationManageCardState extends State<RenovationManageCard> {
+  @override
+  Widget build(BuildContext context) {
+    return Container();
+  }
+}

lib/pages/renovation_manage/renovation_manage_page.dart

@@ -0,0 +1,40 @@
+import 'package:aku_community/pages/renovation_manage/renovation_manage_view.dart';
+import 'package:aku_community/widget/bee_scaffold.dart';
+import 'package:aku_community/widget/tab_bar/bee_tab_bar.dart';
+import 'package:flutter/material.dart';
+
+class RenovationManagePage extends StatefulWidget {
+  RenovationManagePage({Key? key}) : super(key: key);
+
+  @override
+  _RenovationManagePageState createState() => _RenovationManagePageState();
+}
+
+class _RenovationManagePageState extends State<RenovationManagePage> with TickerProviderStateMixin {
+  List<String> _tabs = [
+  '待处理',
+  '处理中',
+  '已完成',
+  '全部'
+  ];
+  late TabController _tabController;
+  @override
+  void initState() {
+    super.initState();
+    _tabController = TabController(length: _tabs.length, vsync: this);
+  }
+  @override
+  Widget build(BuildContext context) {
+    return  BeeScaffold(
+      title: '电子商务',
+      appBarBottom: BeeTabBar(controller: _tabController, tabs: _tabs,scrollable: true,),
+      body: TabBarView(
+        controller: _tabController,
+        children: List.generate(
+          _tabs.length,
+          (index) => RenovationManageView(index: index,),
+        ),
+      ),
+    );
+  }
+}

lib/pages/renovation_manage/renovation_manage_view.dart

@@ -0,0 +1,16 @@
+import 'package:flutter/material.dart';
+
+class RenovationManageView extends StatefulWidget {
+  final int index;
+  RenovationManageView({Key? key, required this.index}) : super(key: key);
+
+  @override
+  _RenovationManageViewState createState() => _RenovationManageViewState();
+}
+
+class _RenovationManageViewState extends State<RenovationManageView> {
+  @override
+  Widget build(BuildContext context) {
+    return ListView();
+  }
+}

lib/pages/splash/splash_page.dart

@@ -35,7 +35,7 @@ class _SplashPageState extends State<SplashPage> {
 
     //初始化AMap
     // await AmapLocation.instance.init(iosKey: 'ios key');
-    if (!kIsWeb && !Platform.isMacOS) {
+    if (Platform.isAndroid || Platform.isIOS) {
       await Permission.locationWhenInUse.request();
     }
   }

lib/provider/user_provider.dart

@@ -58,7 +58,10 @@ class UserProvider extends ChangeNotifier {
   }
 
   Future updateUserDetail() async {
-    _userDetailModel = await SignFunc.getUserDetail();
+    UserDetailModel? _model = await SignFunc.getUserDetail();
+    if (_model != null) {
+      _userDetailModel = _model;
+    }
     notifyListeners();
   }
 

tool/_build.dart

@@ -14,6 +14,20 @@ buildApk() async {
   );
 }
 
+@Task('打包Android项目')
+buildApkDev() async {
+  await runAsync(
+    'flutter',
+    arguments: [
+      'build',
+      'apk',
+      '--target-platform=android-arm64',
+      '--dart-define',
+      'BUILD_TYPE=Dev',
+    ],
+  );
+}
+
 @Task('打包iOS项目')
 buildIos() async {
   await runAsync(