fix some issues

ios/Podfile.lock

@@ -1,43 +1,43 @@
 PODS:
-  - AMap3DMap (7.9.0):
+  - AMap3DMap (8.0.0):
-    - AMapFoundation (~> 1.6.6)
+    - AMapFoundation (~> 1.6.8)
   - amap_flutter_location (0.0.1):
     - AMapLocation (~> 2.6.7)
     - Flutter
   - amap_flutter_map (0.0.1):
     - AMap3DMap
     - Flutter
-  - AMapFoundation (1.6.6)
+  - AMapFoundation (1.6.8)
-  - AMapLocation (2.6.8):
+  - AMapLocation (2.6.9):
-    - AMapFoundation (~> 1.6.4)
+    - AMapFoundation (~> 1.6.8)
-  - device_info (0.0.1):
+  - device_info_plus (0.0.1):
     - Flutter
-  - Firebase/CoreOnly (7.3.0):
+  - Firebase/CoreOnly (7.11.0):
-    - FirebaseCore (= 7.3.0)
+    - FirebaseCore (= 7.11.0)
-  - Firebase/Crashlytics (7.3.0):
+  - Firebase/Crashlytics (7.11.0):
     - Firebase/CoreOnly
-    - FirebaseCrashlytics (~> 7.3.0)
+    - FirebaseCrashlytics (~> 7.11.0)
-  - firebase_core (1.0.3):
+  - firebase_core (1.1.1):
-    - Firebase/CoreOnly (= 7.3.0)
+    - Firebase/CoreOnly (= 7.11.0)
     - Flutter
-  - firebase_crashlytics (2.0.0):
+  - firebase_crashlytics (2.0.3):
-    - Firebase/Crashlytics (= 7.3.0)
+    - Firebase/Crashlytics (= 7.11.0)
     - firebase_core
     - Flutter
-  - FirebaseCore (7.3.0):
+  - FirebaseCore (7.11.0):
-    - FirebaseCoreDiagnostics (~> 7.0)
+    - FirebaseCoreDiagnostics (~> 7.4)
     - GoogleUtilities/Environment (~> 7.0)
     - GoogleUtilities/Logger (~> 7.0)
-  - FirebaseCoreDiagnostics (7.3.0):
+  - FirebaseCoreDiagnostics (7.11.0):
-    - GoogleDataTransport (~> 8.0)
+    - GoogleDataTransport (~> 8.4)
     - GoogleUtilities/Environment (~> 7.0)
     - GoogleUtilities/Logger (~> 7.0)
-    - nanopb (~> 2.30906.0)
+    - nanopb (~> 2.30908.0)
-  - FirebaseCrashlytics (7.3.0):
+  - FirebaseCrashlytics (7.11.0):
     - FirebaseCore (~> 7.0)
     - FirebaseInstallations (~> 7.0)
-    - GoogleDataTransport (~> 8.0)
+    - GoogleDataTransport (~> 8.4)
-    - nanopb (~> 2.30906.0)
+    - nanopb (~> 2.30908.0)
     - PromisesObjC (~> 1.2)
   - FirebaseInstallations (7.11.0):
     - FirebaseCore (~> 7.0)
@@ -45,13 +45,15 @@ PODS:
     - GoogleUtilities/UserDefaults (~> 7.0)
     - PromisesObjC (~> 1.2)
   - Flutter (1.0.0)
-  - GoogleDataTransport (8.1.0):
+  - GoogleDataTransport (8.4.0):
-    - nanopb (~> 2.30906.0)
+    - GoogleUtilities/Environment (~> 7.2)
-  - GoogleUtilities/Environment (7.4.0):
+    - nanopb (~> 2.30908.0)
     - PromisesObjC (~> 1.2)
-  - GoogleUtilities/Logger (7.4.0):
+  - GoogleUtilities/Environment (7.5.2):
+    - PromisesObjC (< 3.0, >= 1.2)
+  - GoogleUtilities/Logger (7.5.2):
     - GoogleUtilities/Environment
-  - GoogleUtilities/UserDefaults (7.4.0):
+  - GoogleUtilities/UserDefaults (7.5.2):
     - GoogleUtilities/Logger
   - image_picker (0.0.1):
     - Flutter
@@ -63,12 +65,14 @@ PODS:
     - JCore (= 2.4.0)
     - JPush (= 3.4.0)
   - MTBBarcodeScanner (5.0.11)
-  - nanopb (2.30906.0):
+  - nanopb (2.30908.0):
-    - nanopb/decode (= 2.30906.0)
+    - nanopb/decode (= 2.30908.0)
-    - nanopb/encode (= 2.30906.0)
+    - nanopb/encode (= 2.30908.0)
-  - nanopb/decode (2.30906.0)
+  - nanopb/decode (2.30908.0)
-  - nanopb/encode (2.30906.0)
+  - nanopb/encode (2.30908.0)
-  - package_info (0.0.1):
+  - open_file (0.0.1):
+    - Flutter
+  - package_info_plus (0.4.5):
     - Flutter
   - path_provider (0.0.1):
     - Flutter
@@ -84,13 +88,14 @@ PODS:
 DEPENDENCIES:
   - amap_flutter_location (from `.symlinks/plugins/amap_flutter_location/ios`)
   - amap_flutter_map (from `.symlinks/plugins/amap_flutter_map/ios`)
-  - device_info (from `.symlinks/plugins/device_info/ios`)
+  - device_info_plus (from `.symlinks/plugins/device_info_plus/ios`)
   - firebase_core (from `.symlinks/plugins/firebase_core/ios`)
   - firebase_crashlytics (from `.symlinks/plugins/firebase_crashlytics/ios`)
   - Flutter (from `Flutter`)
   - image_picker (from `.symlinks/plugins/image_picker/ios`)
   - jpush_flutter (from `.symlinks/plugins/jpush_flutter/ios`)
-  - package_info (from `.symlinks/plugins/package_info/ios`)
+  - open_file (from `.symlinks/plugins/open_file/ios`)
+  - package_info_plus (from `.symlinks/plugins/package_info_plus/ios`)
   - path_provider (from `.symlinks/plugins/path_provider/ios`)
   - permission_handler (from `.symlinks/plugins/permission_handler/ios`)
   - qr_code_scanner (from `.symlinks/plugins/qr_code_scanner/ios`)
@@ -119,8 +124,8 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/amap_flutter_location/ios"
   amap_flutter_map:
     :path: ".symlinks/plugins/amap_flutter_map/ios"
-  device_info:
+  device_info_plus:
-    :path: ".symlinks/plugins/device_info/ios"
+    :path: ".symlinks/plugins/device_info_plus/ios"
   firebase_core:
     :path: ".symlinks/plugins/firebase_core/ios"
   firebase_crashlytics:
@@ -131,8 +136,10 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/image_picker/ios"
   jpush_flutter:
     :path: ".symlinks/plugins/jpush_flutter/ios"
-  package_info:
+  open_file:
-    :path: ".symlinks/plugins/package_info/ios"
+    :path: ".symlinks/plugins/open_file/ios"
+  package_info_plus:
+    :path: ".symlinks/plugins/package_info_plus/ios"
   path_provider:
     :path: ".symlinks/plugins/path_provider/ios"
   permission_handler:
@@ -143,30 +150,31 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/url_launcher/ios"
 
 SPEC CHECKSUMS:
-  AMap3DMap: 4ff760f011b89aec85edd8b5fcf90d384aae1202
+  AMap3DMap: 89b82eaad00f9246f59d2a6103eff18be5b9dd4f
   amap_flutter_location: 3e33b57f1aad80b0dfb4b399de857a1a9f071e62
   amap_flutter_map: 979e54d227cedac6c7504a2151bfbf3bcf96760a
-  AMapFoundation: 2d012d9aaa7a5c0d387ddb1a8c5f03e1d6df29b8
+  AMapFoundation: 32e9a0264ee62f5aa2aaf82bdafdda7985ce09c7
-  AMapLocation: dad27669c4ca68e395ce7532ff614b7d4d45f7b7
+  AMapLocation: 3ec0e9bf53800b40cceb313cbd047743f75e2483
-  device_info: d7d233b645a32c40dfdc212de5cf646ca482f175
+  device_info_plus: e5c5da33f982a436e103237c0c85f9031142abed
-  Firebase: 26223c695fe322633274198cb19dca8cb7e54416
+  Firebase: c121feb35e4126c0b355e3313fa9b487d47319fd
-  firebase_core: b5d81dfd4fb2d6f700e67de34d9a633ae325c4e9
+  firebase_core: 54856a8a39b8f3e35f34fdd3373f3b92a1daa68b
-  firebase_crashlytics: 3b8018f6c88a59be95f9e2f38f04e5c0f05e0c6a
+  firebase_crashlytics: 1e72fe7a913faa6bc73f75794a5f68947e26623e
-  FirebaseCore: 4d3c72622ce0e2106aaa07bb4b2935ba2c370972
+  FirebaseCore: 907447d8917a4d3eb0cce2829c5a0ad21d90b432
-  FirebaseCoreDiagnostics: d50e11039e5984d92c8a512be2395f13df747350
+  FirebaseCoreDiagnostics: 68ad972f99206cef818230f3f3179d52ccfb7f8c
-  FirebaseCrashlytics: d31325312c92e2cb2f0386d589b9aa44e303d99b
+  FirebaseCrashlytics: 272b675aa9d1e9bae1f9e1449fcc1f2cf6042806
   FirebaseInstallations: a58d4f72ec5861840b84df489f2668d970df558a
   Flutter: 434fef37c0980e73bb6479ef766c45957d4b510c
-  GoogleDataTransport: 116c84c4bdeb76be2a7a46de51244368f9794eab
+  GoogleDataTransport: cd9db2180fcecd8da1b561aea31e3e56cf834aa7
-  GoogleUtilities: 284cddc7fffc14ae1907efb6f78ab95c1fccaedc
+  GoogleUtilities: 8de2a97a17e15b6b98e38e8770e2d129a57c0040
   image_picker: 50e7c7ff960e5f58faa4d1f4af84a771c671bc4a
   JCore: a29e4b0ee54e1301446dc02d8e1c350404108b34
   JPush: defaa108c38806f6efdcfaf4c416854d25fca8e5
   jpush_flutter: 364b245849348e05377d67295d0896ddd664a896
   MTBBarcodeScanner: f453b33c4b7dfe545d8c6484ed744d55671788cb
-  nanopb: 1bf24dd71191072e120b83dd02d08f3da0d65e53
+  nanopb: a0ba3315591a9ae0a16a309ee504766e90db0c96
-  package_info: 873975fc26034f0b863a300ad47e7f1ac6c7ec62
+  open_file: 02eb5cb6b21264bd3a696876f5afbfb7ca4f4b7d
-  path_provider: f96fff6166a8867510d2c25fdcc346327cc4b259
+  package_info_plus: 6c92f08e1f853dc01228d6f553146438dafcd14e
+  path_provider: abfe2b5c733d04e238b0d8691db0cfd63a27a93c
   permission_handler: ccb20a9fad0ee9b1314a52b70b76b473c5f8dab0
   PromisesObjC: 3113f7f76903778cf4a0586bd1ab89329a0b7b97
   qr_code_scanner: bb67d64904c3b9658ada8c402e8b4d406d5d796e
@@ -174,4 +182,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: fe0e1ee7f3d1f7d00b11b474b62dd62134535aea
 
-COCOAPODS: 1.10.1
+COCOAPODS: 1.11.0

ios/Runner.xcodeproj/project.pbxproj

@@ -373,6 +373,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
+				DEVELOPMENT_TEAM = R45ZDS6S92;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
@@ -501,6 +502,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
+				DEVELOPMENT_TEAM = R45ZDS6S92;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (

lib/ui/manage_pages/engineer_repair/engineer_repair_map.dart

@@ -2,9 +2,9 @@ class ERMap {
   static statusString(int status) {
     switch (status) {
       case 1:
-        return '待派单';
+        return '待派单(公司)';
       case 2:
-        return '待派单';
+        return '待派单(人员)';
       case 3:
         return '待接单';
       case 4:

lib/ui/manage_pages/engineer_repair/engineer_repair_view.dart

@@ -35,7 +35,8 @@ class _EngineerRepairViewState extends State<EngineerRepairView> {
           break;
       }
     } else {
-      UserTool.userProvider.infoModel!.engineeringRepairAuthority == ERAUTH.PICK
+      return UserTool.userProvider.infoModel!.engineeringRepairAuthority ==
+              ERAUTH.PICK
           ? widget.index + 2
           : widget.index + 1;
     }
@@ -46,7 +47,7 @@ class _EngineerRepairViewState extends State<EngineerRepairView> {
     return BeeListView(
         path: API.engineerRepair.engineerRepairList,
         extraParams: {
-          'repairStatus': repairEngineeringStatus,
+          'repairEngineeringStatus': repairEngineeringStatus,
         },
         controller: widget.controller,
         convert: (models) {

lib/ui/manage_pages/house_keeping/house_keeping_card.dart

@@ -19,6 +19,7 @@ import 'package:velocity_x/velocity_x.dart';
 class HouseKeepingCard extends StatelessWidget {
   final VoidCallback callRefresh;
   final HouseKeepingListModel model;
+
   const HouseKeepingCard(
       {Key? key, required this.callRefresh, required this.model})
       : super(key: key);
@@ -139,7 +140,18 @@ class HouseKeepingCard extends StatelessWidget {
                         id: model.id,
                         callRefresh: callRefresh,
                       ))
-                  : null;
+                  : () async {
+                      List<HouseKeepingProcessModel> processModels =
+                          await HouseKeepingFunc.getHouseKeepingProcess(
+                        model.id,
+                      );
+                      await Get.to(() => HouseKeepingDetailPage(
+                            model: model,
+                            processModels: processModels,
+                            callRefresh: callRefresh,
+                          ));
+                      callRefresh();
+                    };
             },
             radius: 4,
             color: AppStyle.primaryColor,

lib/ui/manage_pages/house_keeping/house_keeping_department_page.dart

@@ -4,16 +4,17 @@ import 'package:aku_community_manager/ui/manage_pages/house_keeping/house_keepin
 import 'package:aku_community_manager/ui/widgets/common/aku_material_button.dart';
 import 'package:aku_community_manager/ui/widgets/common/aku_scaffold.dart';
 import 'package:aku_community_manager/ui/widgets/inner/aku_bottom_button.dart';
+import 'package:aku_community_manager/utils/extension/list_extension.dart';
 import 'package:expandable/expandable.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_easyrefresh/easy_refresh.dart';
 import 'package:get/get.dart';
 import 'package:velocity_x/velocity_x.dart';
-import 'package:aku_community_manager/utils/extension/list_extension.dart';
 
 class HouseKeepingDepartmentPage extends StatefulWidget {
   final int id;
   final VoidCallback callRefresh;
+
   HouseKeepingDepartmentPage(
       {Key? key, required this.id, required this.callRefresh})
       : super(key: key);
@@ -27,6 +28,7 @@ class _HouseKeepingDepartmentPageState
     extends State<HouseKeepingDepartmentPage> {
   List<HouseKeepingPickStaffModel> _models = [];
   int _selectId = 0;
+
   @override
   Widget build(BuildContext context) {
     return AkuScaffold(
@@ -36,6 +38,7 @@ class _HouseKeepingDepartmentPageState
             header: MaterialHeader(),
             onRefresh: () async {
               _models = await HouseKeepingFunc.newHouseKeepingPickStaffList();
+              setState(() {});
             },
             child: ListView(
                 padding: EdgeInsets.all(32.w),

lib/ui/manage_pages/hygience_manage/hygience_manage_card.dart

@@ -1,29 +1,28 @@
 // Flutter imports:
 import 'package:aku_community_manager/const/api.dart';
 import 'package:aku_community_manager/models/manager/hygience_manage/heygience_list_model.dart';
+// Project imports:
+import 'package:aku_community_manager/style/app_style.dart';
+import 'package:aku_community_manager/tools/aku_divider.dart';
+import 'package:aku_community_manager/tools/extensions/list_extension_tool.dart';
+import 'package:aku_community_manager/tools/widget_tool.dart';
 import 'package:aku_community_manager/ui/manage_pages/hygience_manage/hygience_manage_detail_page.dart';
+import 'package:aku_community_manager/ui/manage_pages/hygience_manage/hygience_manage_map.dart';
 import 'package:aku_community_manager/ui/widgets/common/aku_button.dart';
 import 'package:aku_community_manager/utils/network/base_model.dart';
 import 'package:aku_community_manager/utils/network/net_util.dart';
 import 'package:bot_toast/bot_toast.dart';
 import 'package:flutter/material.dart';
-
 // Package imports:
 import 'package:get/get.dart';
 import 'package:velocity_x/velocity_x.dart';
 
-// Project imports:
-import 'package:aku_community_manager/style/app_style.dart';
-import 'package:aku_community_manager/tools/aku_divider.dart';
-import 'package:aku_community_manager/tools/extensions/list_extension_tool.dart';
-import 'package:aku_community_manager/tools/widget_tool.dart';
-import 'package:aku_community_manager/ui/manage_pages/hygience_manage/hygience_manage_map.dart';
-
 class HyginecManageCard extends StatefulWidget {
   final int index;
   final HygienceListModel model;
   final VoidCallback? callRefresh;
-  HyginecManageCard({Key? key, required this.index, required this.model, this.callRefresh})
+  HyginecManageCard(
+      {Key? key, required this.index, required this.model, this.callRefresh})
       : super(key: key);
 
   @override
@@ -143,7 +142,7 @@ class _HyginecManageCardState extends State<HyginecManageCard> {
             40.w.heightBox,
             Row(
               children: [
-                '请在期限前完成绿化任务'.text.size(24.sp).color(kTextSubColor).make(),
+                '请在期限前完成卫生任务'.text.size(24.sp).color(kTextSubColor).make(),
                 Spacer(),
                 AkuButton(
                   color: kPrimaryColor,

lib/ui/manage_pages/hygience_manage/hygience_manage_map.dart

@@ -7,9 +7,9 @@ class HygienceManageMap {
       case 1:
         return '待处理';
       case 2:
-        return '未完成';
-      case 3:
         return '已完成';
+      case 3:
+        return '未完成';
       default:
         return '未知';
     }
@@ -20,9 +20,9 @@ class HygienceManageMap {
       case 1:
         return Color(0xFFFF8200);
       case 2:
-        return Color(0xFFE60E0E);
-      case 3:
         return Color(0xFF999999);
+      case 3:
+        return Color(0xFFE60E0E);
       default:
         return Colors.black;
     }

lib/ui/manage_pages/hygience_manage/hygience_manage_page.dart

@@ -1,13 +1,11 @@
 // Flutter imports:
-import 'package:flutter/material.dart';
-
-// Package imports:
-import 'package:flutter_screenutil/flutter_screenutil.dart';
-
 // Project imports:
 import 'package:aku_community_manager/ui/manage_pages/hygience_manage/hygience_manage_view.dart';
 import 'package:aku_community_manager/ui/widgets/common/aku_scaffold.dart';
 import 'package:aku_community_manager/ui/widgets/inner/aku_tab_bar.dart';
+import 'package:flutter/material.dart';
+// Package imports:
+import 'package:flutter_screenutil/flutter_screenutil.dart';
 
 class HygienceManagePage extends StatefulWidget {
   HygienceManagePage({Key? key}) : super(key: key);
@@ -18,7 +16,7 @@ class HygienceManagePage extends StatefulWidget {
 
 class _HygienceManagePageState extends State<HygienceManagePage>
     with TickerProviderStateMixin {
-  List<String> _tabs = ['待处理', '未完成', '已完成'];
+  List<String> _tabs = ['待处理', '已完成', '未完成'];
   TabController? _tabController;
 
   @override

lib/ui/settings/settings_page.dart

@@ -1,25 +1,23 @@
 // Flutter imports:
-import 'package:aku_community_manager/ui/agreements/about_page.dart';
-import 'package:aku_community_manager/ui/widgets/common/aku_material_button.dart';
-import 'package:flutter/cupertino.dart';
-import 'package:flutter/material.dart';
-
-// Package imports:
-import 'package:bot_toast/bot_toast.dart';
-import 'package:get/get.dart';
-import 'package:provider/provider.dart';
-
 // Project imports:
 import 'package:aku_community_manager/provider/user_provider.dart';
 import 'package:aku_community_manager/style/app_style.dart';
 import 'package:aku_community_manager/tools/screen_tool.dart';
 import 'package:aku_community_manager/tools/widget_tool.dart';
+import 'package:aku_community_manager/ui/agreements/about_page.dart';
 import 'package:aku_community_manager/ui/agreements/agreement_page.dart';
 import 'package:aku_community_manager/ui/agreements/privacy_page.dart';
 import 'package:aku_community_manager/ui/home/home_page.dart';
 import 'package:aku_community_manager/ui/settings/setting_feedback_page.dart';
+import 'package:aku_community_manager/ui/widgets/common/aku_material_button.dart';
 import 'package:aku_community_manager/ui/widgets/common/aku_scaffold.dart';
 import 'package:aku_community_manager/ui/widgets/common/aku_tile.dart';
+// Package imports:
+import 'package:bot_toast/bot_toast.dart';
+import 'package:flutter/cupertino.dart';
+import 'package:flutter/material.dart';
+import 'package:get/get.dart';
+import 'package:provider/provider.dart';
 
 class SettingsPage extends StatefulWidget {
   SettingsPage({Key? key}) : super(key: key);
@@ -40,18 +38,18 @@ class _SettingsPageState extends State<SettingsPage> {
           vertical: 16.w,
         ),
         children: [
-          AkuTile(
+          // AkuTile(
-            title: Text('是否接受信息通知'),
+          //   title: Text('是否接受信息通知'),
-            arrow: false,
+          //   arrow: false,
-            suffix: CupertinoSwitch(
+          //   suffix: CupertinoSwitch(
-              value: _info,
+          //     value: _info,
-              onChanged: (value) {
+          //     onChanged: (value) {
-                setState(() {
+          //       setState(() {
-                  _info = value;
+          //         _info = value;
-                });
+          //       });
-              },
+          //     },
-            ),
+          //   ),
-          ),
+          // ),
           Divider(height: 1.w),
           AkuTile(
             title: Text('关于我们'),