From 8f21097d564b897fb4c31b649429d39db1536bf4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AD=8F=E5=B0=91=E9=98=B3?= <786612630@qq.com>
Date: Mon, 22 Apr 2024 16:02:28 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E5=A4=8D=E5=9C=B0=E5=9B=BE?=
 =?UTF-8?q?=E7=AC=AC=E4=BA=8C=E6=AC=A1=E8=BF=9B=E5=85=A5=E6=89=8D=E8=83=BD?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98=E3=80=822=E3=80=81?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=95=BF=E6=8C=89=E9=97=AD=E9=94=81=E8=B7=9F?=
 =?UTF-8?q?=E5=BC=80=E9=94=81=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lockDetail/lockDetail_page.dart           |  4 +-
 .../gaode/lockAddressGaoDe_page.dart          | 44 ++++++++++++++++++-
 2 files changed, 45 insertions(+), 3 deletions(-)

diff --git a/star_lock/lib/main/lockDetail/lockDetail/lockDetail_page.dart b/star_lock/lib/main/lockDetail/lockDetail/lockDetail_page.dart
index 77e4129a..aae63d83 100644
--- a/star_lock/lib/main/lockDetail/lockDetail/lockDetail_page.dart
+++ b/star_lock/lib/main/lockDetail/lockDetail/lockDetail_page.dart
@@ -1219,6 +1219,7 @@ class _LockDetailPageState extends State<LockDetailPage>
     state.openLockBtnState.value = 1;
     // state.animationController!.forward();
 
+    state.openDoorModel = 1;
     if (state.lockUserNo == 0) {
       // 电子钥匙lockUserNo为0 要先添加用户
       logic.addUserConnectBlue();
@@ -1226,7 +1227,6 @@ class _LockDetailPageState extends State<LockDetailPage>
       // print("state.isOpenLockNeedOnline.value:${state.isOpenLockNeedOnline.value}");
       if (state.isOpenLockNeedOnline.value == 0) {
         // 不需要联网
-        state.openDoorModel = 1;
         logic.openDoorAction();
       } else {
         // 需要联网
@@ -1244,12 +1244,12 @@ class _LockDetailPageState extends State<LockDetailPage>
     state.iSClosedUnlockSuccessfulPopup.value = false;
     state.openLockBtnState.value = 1;
     state.animationController!.forward();
+    state.openDoorModel = 32;
 
     if (state.lockUserNo == 0) {
       // 电子钥匙lockUserNo为0 要先添加用户
       logic.addUserConnectBlue();
     } else {
-      state.openDoorModel = 32;
       logic.openDoorAction();
     }
   }
diff --git a/star_lock/lib/mine/addLock/lockAddress/gaode/lockAddressGaoDe_page.dart b/star_lock/lib/mine/addLock/lockAddress/gaode/lockAddressGaoDe_page.dart
index 62596772..31e6f4b4 100644
--- a/star_lock/lib/mine/addLock/lockAddress/gaode/lockAddressGaoDe_page.dart
+++ b/star_lock/lib/mine/addLock/lockAddress/gaode/lockAddressGaoDe_page.dart
@@ -52,12 +52,54 @@ class _LockAddressGaoDePageState extends State<LockAddressGaoDePage>
     AMapFlutterLocation.setApiKey(F.aMapKey.androidKey, F.aMapKey.iosKey);
   }
 
+  // Future<void> requestPermission() async {
+  //   final status = await Permission.location.request();
+  //   print("Permission.location.request()=status:$status");
+  //   permissionStatus = status;
+  //   if(Platform.isIOS){
+  //     _setLocationOption();
+  //     requestIOSLocation();
+  //   }
+  //   switch (status) {
+  //     case PermissionStatus.denied:
+  //     // print("拒绝");
+  //       break;
+  //     case PermissionStatus.granted:
+  //       if(Platform.isIOS){
+  //         // _setLocationOption();
+  //         // requestIOSLocation();
+  //       }else{
+  //         requestAndroidLocation();
+  //         location.startLocation();
+  //       }
+  //       break;
+  //     case PermissionStatus.limited:
+  //     // print("限制");
+  //       break;
+  //     case PermissionStatus.permanentlyDenied:
+  //     // print("永久的否认");
+  //       break;
+  //     case PermissionStatus.provisional:
+  //     // print("临时");
+  //       break;
+  //     default:
+  //     // print("其他状态");
+  //     // requestLocation();
+  //       break;
+  //   }
+  // }
+
   Future<void> requestPermission() async {
     final status = await PermissionDialog.request(Permission.location);
-    if (Platform.isIOS || status) {
+    if(Platform.isIOS){
       _setLocationOption();
       requestIOSLocation();
     }
+
+    if (!Platform.isIOS || status) {
+      requestAndroidLocation();
+      location.startLocation();
+    }
   }
 
   Future<void> requestAndroidLocation() async {