屏幕适配库升级

高德隐私合规设置

android/app/proguard-rules.pro

@@ -15,4 +15,12 @@
 ## AMap Location
 -keep class com.amap.api.location.**{*;}
 -keep class com.amap.api.fence.**{*;}
--keep class com.autonavi.aps.amapapi.model.**{*;}
+-keep class com.loc.**{*;}
+-keep class com.autonavi.aps.amapapi.model.**{*;}
+
+##搜索
+-keep   class com.amap.api.services.**{*;}
+
+##2D地图
+-keep class com.amap.api.maps2d.**{*;}
+-keep class com.amap.api.mapcore2d.**{*;}

lib/main.dart

@@ -96,7 +96,15 @@ class MyApp extends StatelessWidget {
                   title: '小蜜蜂管家',
                   theme: AppTheme.theme,
                   home: SplashPage(),
-                  builder: BotToastInit(),
+                  builder: (context, widget) {
+                    ScreenUtil.setContext(context);
+                    return MediaQuery(
+                      //Setting font does not change with system font size
+                      data:
+                          MediaQuery.of(context).copyWith(textScaleFactor: 1.0),
+                      child: BotToastInit().call(context, widget),
+                    );
+                  },
                   navigatorObservers: [
                     BotToastNavigatorObserver(),
                   ],

lib/new_ui/auth/other_login_page.dart

@@ -47,31 +47,36 @@ class _OtherLoginPageState extends State<OtherLoginPage> {
 
   @override
   Widget build(BuildContext context) {
-    return AkuScaffold(
+    return WillPopScope(
-      title: '',
+      onWillPop: () async {
-      backgroundColor: Colors.white,
+        return false;
-      body: Column(
+      },
-        children: [
+      child: AkuScaffold(
-          Row(
+        title: '',
-            children: [
+        backgroundColor: Colors.white,
-              24.w.widthBox,
+        body: Column(
-              ..._tabs
+          children: [
-                  .mapIndexed((e, index) => _tab(e, index, onTap: (value) {
+            Row(
-                        _currentIndex = value;
+              children: [
-                        _controller.jumpToPage(_currentIndex);
+                24.w.widthBox,
-                        setState(() {});
+                ..._tabs
-                      }))
+                    .mapIndexed((e, index) => _tab(e, index, onTap: (value) {
-                  .toList(),
+                          _currentIndex = value;
-            ],
+                          _controller.jumpToPage(_currentIndex);
-          ),
+                          setState(() {});
-          Flexible(
+                        }))
-            child: PageView(
+                    .toList(),
-              controller: _controller,
+              ],
-              children: [_verificationView(), _accountView()],
+            ),
+            Flexible(
+              child: PageView(
+                controller: _controller,
+                children: [_verificationView(), _accountView()],
+              ),
             ),
-          ),
+            BottomTip(),
-          BottomTip(),
+          ],
-        ],
+        ),
       ),
     );
   }

lib/new_ui/auth/set_psd_page.dart

@@ -44,61 +44,67 @@ class _SetPsdPageState extends State<SetPsdPage> {
 
   @override
   Widget build(BuildContext context) {
-    return AkuScaffold(
+    return WillPopScope(
-      title: '',
+      onWillPop: () async {
-      backgroundColor: Colors.white,
+        return false;
-      body: Column(
+      },
-        crossAxisAlignment: CrossAxisAlignment.center,
+      child: AkuScaffold(
-        children: [
+        title: '',
-          24.w.heightBox,
+        backgroundColor: Colors.white,
-          Row(
+        body: Column(
-            children: [
+          crossAxisAlignment: CrossAxisAlignment.center,
-              48.w.widthBox,
+          children: [
-              '首次登陆，请设置账号密码'
+            24.w.heightBox,
-                  .text
+            Row(
-                  .size(36.sp)
+              children: [
-                  .bold
+                48.w.widthBox,
-                  .color(Colors.black.withOpacity(0.65))
+                '首次登陆，请设置账号密码'
-                  .make(),
+                    .text
-              Spacer(),
+                    .size(36.sp)
-            ],
+                    .bold
-          ),
+                    .color(Colors.black.withOpacity(0.65))
-          16.w.heightBox,
+                    .make(),
-          Row(
+                Spacer(),
-            children: [
+              ],
-              48.w.widthBox,
+            ),
-              '密码需由6-20位数字、字母、或符号组成，至少两种'
+            16.w.heightBox,
-                  .text
+            Row(
-                  .size(28.sp)
+              children: [
-                  .color(Colors.black.withOpacity(0.45))
+                48.w.widthBox,
-                  .make(),
+                '密码需由6-20位数字、字母、或符号组成，至少两种'
-              Spacer(),
+                    .text
-            ],
+                    .size(28.sp)
-          ),
+                    .color(Colors.black.withOpacity(0.45))
-          144.w.heightBox,
+                    .make(),
-          PsdTextField(controller: _psdController, hintText: '请输入密码'),
+                Spacer(),
-          24.w.heightBox,
+              ],
-          PsdTextField(controller: _confirmPsdController, hintText: '请再次输入密码'),
+            ),
-          16.w.heightBox,
+            144.w.heightBox,
-          PsdVerify.checkString(psdCheck)
+            PsdTextField(controller: _psdController, hintText: '请输入密码'),
-              .text
+            24.w.heightBox,
-              .size(28.sp)
+            PsdTextField(
-              .color(Color(0xFFCF1322).withOpacity(0.8))
+                controller: _confirmPsdController, hintText: '请再次输入密码'),
-              .make(),
+            16.w.heightBox,
-          37.w.heightBox,
+            PsdVerify.checkString(psdCheck)
-          LoginButtonWidget(
+                .text
-              onTap: psdCheck == PSDVERIFY.correct
+                .size(28.sp)
-                  ? () async {
+                .color(Color(0xFFCF1322).withOpacity(0.8))
-                      var result =
+                .make(),
-                          await SignFunc.settingPsd(_psdController.text);
+            37.w.heightBox,
-                      if (result) {
+            LoginButtonWidget(
-                        await UserTool.userProvider.updateUserInfo();
+                onTap: psdCheck == PSDVERIFY.correct
-                        await SignFunc.checkNameAndAccount();
+                    ? () async {
+                        var result =
+                            await SignFunc.settingPsd(_psdController.text);
+                        if (result) {
+                          await UserTool.userProvider.updateUserInfo();
+                          await SignFunc.checkNameAndAccount();
+                        }
                       }
-                    }
+                    : null,
-                  : null,
+                text: '确认'),
-              text: '确认'),
+          ],
-        ],
+        ),
       ),
     );
   }

lib/ui/manage_pages/inspection_manage/inspection_manage_details_page.dart

@@ -506,6 +506,8 @@ class _InspectionManageDetailsPageState
           height: 343.w,
           child: AMapWidget(
             apiKey: AMapApiKey(androidKey: '0c11d9ba47089d971dc4d889b66593ab'),
+            privacyStatement: AMapPrivacyStatement(
+                hasContains: true, hasShow: true, hasAgree: true),
             rotateGesturesEnabled: false,
             scaleEnabled: false,
             scrollGesturesEnabled: false,

pubspec.yaml

@@ -16,7 +16,7 @@ dependencies:
   intl: ^0.17.0
   cupertino_icons: ^1.0.2
   #屏幕适配
-  flutter_screenutil: ^5.0.0-nullsafety.11
+  flutter_screenutil: ^5.3.1
   #状态管理
   provider: ^5.0.0
   #路由