Merge branch 'master' of https://gitee.com/starlock-cn/app-starlock

star_lock/lib/tools/appFirstEnterHandle.dart

@@ -54,68 +54,72 @@ class AppFirstEnterHandle {
     showCupertinoDialog(
       context: widgetContext,
       builder: (context) {
-        return CupertinoAlertDialog(
-          title: const Text('用户协议和隐私政策概要\n'),
-          content: Text.rich(
-            TextSpan(
-              text: '感谢您使用本应用。我们非常重视您的个人信息和隐私保护，在使用本产品之前，请认真阅读',
-              style: const TextStyle(fontSize: 16.0),
-              children: [
+        return PopScope(
+            canPop: false,
+            child: CupertinoAlertDialog(
+              title: const Text('用户协议和隐私政策概要\n'),
+              content: Text.rich(
                 TextSpan(
-                  text: '《用户协议》',
-                  style: const TextStyle(
-                      color: Colors.blue, decoration: TextDecoration.underline),
-                  recognizer: TapGestureRecognizer()
-                    ..onTap = () {
-                      // 处理用户协议点击事件
-                      Get.toNamed(Routers.webviewShowPage, arguments: {
-                        "url": XSConstantMacro.userAgreementURL,
-                        "title": '用户协议'
-                      });
-                    },
+                  text: '感谢您使用本应用。我们非常重视您的个人信息和隐私保护，在使用本产品之前，请认真阅读',
+                  style: const TextStyle(fontSize: 16.0),
+                  children: [
+                    TextSpan(
+                      text: '《用户协议》',
+                      style: const TextStyle(
+                          color: Colors.blue,
+                          decoration: TextDecoration.underline),
+                      recognizer: TapGestureRecognizer()
+                        ..onTap = () {
+                          // 处理用户协议点击事件
+                          Get.toNamed(Routers.webviewShowPage, arguments: {
+                            "url": XSConstantMacro.userAgreementURL,
+                            "title": '用户协议'
+                          });
+                        },
+                    ),
+                    const TextSpan(text: '和'),
+                    TextSpan(
+                      text: '《隐私政策》',
+                      style: const TextStyle(
+                          color: Colors.blue,
+                          decoration: TextDecoration.underline),
+                      recognizer: TapGestureRecognizer()
+                        ..onTap = () {
+                          // 处理隐私政策点击事件
+                          Get.toNamed(Routers.webviewShowPage, arguments: {
+                            "url": XSConstantMacro.privacyPolicyURL,
+                            "title": '隐私政策'
+                          });
+                        },
+                    ),
+                    const TextSpan(
+                        text:
+                            '的全部内容。点击“同意”即表示您同意并接受全部条款。若选择不同意，将无法使用我们的产品和服务，并会退出应用。'),
+                  ],
                 ),
-                const TextSpan(text: '和'),
-                TextSpan(
-                  text: '《隐私政策》',
-                  style: const TextStyle(
-                      color: Colors.blue, decoration: TextDecoration.underline),
-                  recognizer: TapGestureRecognizer()
-                    ..onTap = () {
-                      // 处理隐私政策点击事件
-                      Get.toNamed(Routers.webviewShowPage, arguments: {
-                        "url": XSConstantMacro.privacyPolicyURL,
-                        "title": '隐私政策'
-                      });
-                    },
+              ),
+              actions: [
+                CupertinoDialogAction(
+                  child: const Text(
+                    '不同意',
+                    style: TextStyle(color: Colors.black),
+                  ),
+                  onPressed: () {
+                    _exitApp();
+                  },
+                ),
+                CupertinoDialogAction(
+                  child: const Text(
+                    '同意',
+                    style: TextStyle(color: Colors.blue),
+                  ),
+                  onPressed: () {
+                    Storage.setString(isAgreePrivacy, isAgreePrivacy);
+                    Navigator.of(context).pop();
+                  },
                 ),
-                const TextSpan(
-                    text:
-                        '的全部内容。点击“同意”即表示您同意并接受全部条款。若选择不同意，将无法使用我们的产品和服务，并会退出应用。'),
               ],
-            ),
-          ),
-          actions: [
-            CupertinoDialogAction(
-              child: const Text(
-                '不同意',
-                style: TextStyle(color: Colors.black),
-              ),
-              onPressed: () {
-                _exitApp();
-              },
-            ),
-            CupertinoDialogAction(
-              child: const Text(
-                '同意',
-                style: TextStyle(color: Colors.blue),
-              ),
-              onPressed: () {
-                Storage.setString(isAgreePrivacy, isAgreePrivacy);
-                Navigator.of(context).pop();
-              },
-            ),
-          ],
-        );
+            ));
       },
     );
   }
@@ -125,25 +129,27 @@ class AppFirstEnterHandle {
     showCupertinoDialog(
       context: widgetContext,
       builder: (context) {
-        return CupertinoAlertDialog(
-          title: const Text('位置权限'),
-          content: const Text('请开启位置权限，应用需要位置权限才可以完成智能锁和网关的蓝牙操作'),
-          actions: [
-            CupertinoDialogAction(
-              child: const Text('取消'),
-              onPressed: () {
-                Navigator.of(context).pop();
-              },
-            ),
-            CupertinoDialogAction(
-              child: const Text('确定'),
-              onPressed: () {
-                Storage.setString(isAgreePosition, isAgreePosition);
-                Navigator.of(context).pop();
-              },
-            ),
-          ],
-        );
+        return PopScope(
+            canPop: false,
+            child: CupertinoAlertDialog(
+              title: const Text('位置权限'),
+              content: const Text('请开启位置权限，应用需要位置权限才可以完成智能锁和网关的蓝牙操作'),
+              actions: [
+                CupertinoDialogAction(
+                  child: const Text('取消'),
+                  onPressed: () {
+                    Navigator.of(context).pop();
+                  },
+                ),
+                CupertinoDialogAction(
+                  child: const Text('确定'),
+                  onPressed: () {
+                    Storage.setString(isAgreePosition, isAgreePosition);
+                    Navigator.of(context).pop();
+                  },
+                ),
+              ],
+            ));
       },
     );
   }
@@ -153,25 +159,27 @@ class AppFirstEnterHandle {
     showCupertinoDialog(
       context: widgetContext,
       builder: (context) {
-        return CupertinoAlertDialog(
-          title: const Text('相机/相册权限'),
-          content: const Text('请开启本地存储权限，允许应用读写设备上的照片及文件'),
-          actions: [
-            CupertinoDialogAction(
-              child: const Text('取消'),
-              onPressed: () {
-                Navigator.of(context).pop();
-              },
-            ),
-            CupertinoDialogAction(
-              child: const Text('确定'),
-              onPressed: () {
-                Storage.setString(isAgreeCamera, isAgreeCamera);
-                Navigator.of(context).pop();
-              },
-            ),
-          ],
-        );
+        return PopScope(
+            canPop: false,
+            child: CupertinoAlertDialog(
+              title: const Text('相机/相册权限'),
+              content: const Text('请开启本地存储权限，允许应用读写设备上的照片及文件'),
+              actions: [
+                CupertinoDialogAction(
+                  child: const Text('取消'),
+                  onPressed: () {
+                    Navigator.of(context).pop();
+                  },
+                ),
+                CupertinoDialogAction(
+                  child: const Text('确定'),
+                  onPressed: () {
+                    Storage.setString(isAgreeCamera, isAgreeCamera);
+                    Navigator.of(context).pop();
+                  },
+                ),
+              ],
+            ));
       },
     );
   }