屏幕适配库升级

高德隐私合规设置

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.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,7 +47,11 @@ class _OtherLoginPageState extends State<OtherLoginPage> {
 
   @override
   Widget build(BuildContext context) {
-    return AkuScaffold(
+    return WillPopScope(
+      onWillPop: () async {
+        return false;
+      },
+      child: AkuScaffold(
         title: '',
         backgroundColor: Colors.white,
         body: Column(
@@ -73,6 +77,7 @@ class _OtherLoginPageState extends State<OtherLoginPage> {
             BottomTip(),
           ],
         ),
+      ),
     );
   }
 

lib/new_ui/auth/set_psd_page.dart

@@ -44,7 +44,11 @@ class _SetPsdPageState extends State<SetPsdPage> {
 
   @override
   Widget build(BuildContext context) {
-    return AkuScaffold(
+    return WillPopScope(
+      onWillPop: () async {
+        return false;
+      },
+      child: AkuScaffold(
         title: '',
         backgroundColor: Colors.white,
         body: Column(
@@ -78,7 +82,8 @@ class _SetPsdPageState extends State<SetPsdPage> {
             144.w.heightBox,
             PsdTextField(controller: _psdController, hintText: '请输入密码'),
             24.w.heightBox,
-          PsdTextField(controller: _confirmPsdController, hintText: '请再次输入密码'),
+            PsdTextField(
+                controller: _confirmPsdController, hintText: '请再次输入密码'),
             16.w.heightBox,
             PsdVerify.checkString(psdCheck)
                 .text
@@ -100,6 +105,7 @@ class _SetPsdPageState extends State<SetPsdPage> {
                 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
   #路由