diff --git a/android/app/build.gradle b/android/app/build.gradle
index a9e6c2c2..33672031 100755
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -328,7 +328,7 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 //    implementation('com.amap.api:location:5.6.0')
 //    implementation('com.amap.api:3dmap:8.1.0')
-    implementation('com.amap.api:3dmap-location-search:latest.integration')
+    // implementation('com.amap.api:3dmap-location-search:latest.integration')
 
     implementation 'cn.jiguang.sdk:jpush:5.2.3'
     // 接入华为厂商
diff --git a/lib/mine/addLock/saveLock/saveLock_logic.dart b/lib/mine/addLock/saveLock/saveLock_logic.dart
index 391ffa4b..6facc933 100755
--- a/lib/mine/addLock/saveLock/saveLock_logic.dart
+++ b/lib/mine/addLock/saveLock/saveLock_logic.dart
@@ -365,15 +365,15 @@ class SaveLockLogic extends BaseGetXController {
   void bindBlueAdmin() async {
     state.lockInfo['adminPwd'] = state.adminPassword;
 
-    final Map<String, dynamic> positionMap = <String, dynamic>{};
-    positionMap['longitude'] = state.addressInfo['longitude'];
-    positionMap['latitude'] = state.addressInfo['latitude'];
-    positionMap['country'] = state.addressInfo['country'];
-    positionMap['province'] = state.addressInfo['province'];
-    positionMap['city'] = state.addressInfo['city'];
-    positionMap['district'] = state.addressInfo['district'];
-    positionMap['township'] = state.addressInfo['street'];
-    positionMap['address'] = state.addressInfo['address'];
+    // final Map<String, dynamic> positionMap = <String, dynamic>{};
+    // positionMap['longitude'] = state.addressInfo['longitude'];
+    // positionMap['latitude'] = state.addressInfo['latitude'];
+    // positionMap['country'] = state.addressInfo['country'];
+    // positionMap['province'] = state.addressInfo['province'];
+    // positionMap['city'] = state.addressInfo['city'];
+    // positionMap['district'] = state.addressInfo['district'];
+    // positionMap['township'] = state.addressInfo['street'];
+    // positionMap['address'] = state.addressInfo['address'];
 
     final Map<String, dynamic> bluetooth = <String, dynamic>{};
     bluetooth['bluetoothDeviceId'] = BlueManage().connectDeviceMacAddress;
@@ -395,7 +395,7 @@ class SaveLockLogic extends BaseGetXController {
 
     final SaveLockEntity entity = await ApiRepository.to.bindingBlueAdmin(
       lockAlias: state.aliName.value,
-      position: positionMap,
+      position: {},
       bluetooth: bluetooth,
       lockInfo: state.lockInfo,
       lockUserNo: state.lockUserNo.toString(),
@@ -505,9 +505,10 @@ class SaveLockLogic extends BaseGetXController {
       } else {
         eventBus.fire(RefreshLockListInfoDataEvent(clearScanDevices: true,isUnShowLoading: true));
         Future<void>.delayed(const Duration(seconds: 1), () {
-          Get.close(state.isFromMap == 1
-              ? (CommonDataManage().seletLockType == 0 ? 4 : 5)
-              : (CommonDataManage().seletLockType == 0 ? 5 : 6));
+          // Get.close(state.isFromMap == 1
+          //     ? (CommonDataManage().seletLockType == 0 ? 4 : 5)
+          //     : (CommonDataManage().seletLockType == 0 ? 5 : 6));
+        Get.until((route) => route.isFirst);
         });
         //刚刚配对完，需要对开锁页锁死 2 秒
         Future<void>.delayed(const Duration(milliseconds: 200), () {
@@ -521,9 +522,10 @@ class SaveLockLogic extends BaseGetXController {
     } else {
       eventBus.fire(RefreshLockListInfoDataEvent(clearScanDevices: true,isUnShowLoading: true));
       Future<void>.delayed(const Duration(seconds: 1), () {
-        Get.close(state.isFromMap == 1
-            ? (CommonDataManage().seletLockType == 0 ? 4 : 5)
-            : (CommonDataManage().seletLockType == 0 ? 5 : 6));
+        // Get.close(state.isFromMap == 1
+        //     ? (CommonDataManage().seletLockType == 0 ? 4 : 5)
+        //     : (CommonDataManage().seletLockType == 0 ? 5 : 6));
+        Get.until((route) => route.isFirst);
       });
       //刚刚配对完，需要对开锁页锁死 2 秒
       Future<void>.delayed(const Duration(milliseconds: 200), () {
diff --git a/lib/mine/addLock/saveLock/saveLock_state.dart b/lib/mine/addLock/saveLock/saveLock_state.dart
index 696c5962..dc929c5b 100755
--- a/lib/mine/addLock/saveLock/saveLock_state.dart
+++ b/lib/mine/addLock/saveLock/saveLock_state.dart
@@ -18,9 +18,9 @@ class SaveLockState {
     if (map['pwdTimestamp']!= null) {
     pwdTimestamp.value = map['pwdTimestamp'];
     }
-    if (map['addressInfo'] != null) {
-    addressInfo.value = map['addressInfo'];
-    }
+    // if (map['addressInfo'] != null) {
+    // addressInfo.value = map['addressInfo'];
+    // }
     if (map['lockInfo'] != null) {
     lockInfo = map['lockInfo'];
     }
@@ -33,13 +33,13 @@ class SaveLockState {
     if (map['featureSettingParams'] != null) {
     featureSettingParams = map['featureSettingParams'];
     }
-    if (map['isFromMap'] != null) {
-    isFromMap = map['isFromMap'];
-    }
+    // if (map['isFromMap'] != null) {
+    // isFromMap = map['isFromMap'];
+    // }
   }
   RxString aliName = ''.obs;
   RxInt pwdTimestamp = 0.obs;
-  RxMap addressInfo = {}.obs;
+  // RxMap addressInfo = {}.obs;
   final Rx<LockSetInfoData> lockSetInfoData = LockSetInfoData().obs;
   TextEditingController aliNameController = TextEditingController();
   FocusNode focusNode = FocusNode();
@@ -49,7 +49,7 @@ class SaveLockState {
   String featureValue = '';
   String featureSettingValue = '';
   List featureSettingParams = [];
-  int isFromMap = 0; // 0:不是从地图界面进入 1:从地图界面进入
+  // int isFromMap = 0; // 0:不是从地图界面进入 1:从地图界面进入
 
   RxBool ifCurrentScreen = true.obs; // 是否是当前界面,用于判断是否需要针对当前界面进行展示
   RxInt sureBtnState = 0.obs; // 0可点击 1 不可点击