From f1611d1d15a6cbe392f8d6cacbeae8f6c911c5a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AD=8F=E5=B0=91=E9=98=B3?= <786612630@qq.com>
Date: Sat, 21 Oct 2023 14:27:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BC=80=E9=94=81=E5=A4=B1?=
 =?UTF-8?q?=E8=B4=A5=E5=90=8E=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 star_lock/ios/Runner.xcodeproj/project.pbxproj       | 12 ++++++------
 .../xcshareddata/xcschemes/Runner.xcscheme           |  2 +-
 .../main/lockDetail/lockDetail/lockDetail_logic.dart |  9 +++++----
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/star_lock/ios/Runner.xcodeproj/project.pbxproj b/star_lock/ios/Runner.xcodeproj/project.pbxproj
index 309498e3..a90477c9 100644
--- a/star_lock/ios/Runner.xcodeproj/project.pbxproj
+++ b/star_lock/ios/Runner.xcodeproj/project.pbxproj
@@ -393,7 +393,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
-				DEVELOPMENT_TEAM = ZJ29NYHTV5;
+				DEVELOPMENT_TEAM = DWNXC92BQ6;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
@@ -401,7 +401,7 @@
 					"@executable_path/Frameworks",
 				);
 				MARKETING_VERSION = 1.0.0;
-				PRODUCT_BUNDLE_IDENTIFIER = "cn.star-lock.lock";
+				PRODUCT_BUNDLE_IDENTIFIER = "cn.star-lock.lock20231021";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
@@ -528,7 +528,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
-				DEVELOPMENT_TEAM = ZJ29NYHTV5;
+				DEVELOPMENT_TEAM = DWNXC92BQ6;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
@@ -536,7 +536,7 @@
 					"@executable_path/Frameworks",
 				);
 				MARKETING_VERSION = 1.0.0;
-				PRODUCT_BUNDLE_IDENTIFIER = "cn.star-lock.lock";
+				PRODUCT_BUNDLE_IDENTIFIER = "cn.star-lock.lock20231021";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
@@ -557,7 +557,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
-				DEVELOPMENT_TEAM = ZJ29NYHTV5;
+				DEVELOPMENT_TEAM = DWNXC92BQ6;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
@@ -565,7 +565,7 @@
 					"@executable_path/Frameworks",
 				);
 				MARKETING_VERSION = 1.0.0;
-				PRODUCT_BUNDLE_IDENTIFIER = "cn.star-lock.lock";
+				PRODUCT_BUNDLE_IDENTIFIER = "cn.star-lock.lock20231021";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
diff --git a/star_lock/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/star_lock/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
index f3d88ace..c87d15a3 100644
--- a/star_lock/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
+++ b/star_lock/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
@@ -40,7 +40,7 @@
       </Testables>
    </TestAction>
    <LaunchAction
-      buildConfiguration = "Release"
+      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"
diff --git a/star_lock/lib/main/lockDetail/lockDetail/lockDetail_logic.dart b/star_lock/lib/main/lockDetail/lockDetail/lockDetail_logic.dart
index c4ebb6dc..a675eaf7 100644
--- a/star_lock/lib/main/lockDetail/lockDetail/lockDetail_logic.dart
+++ b/star_lock/lib/main/lockDetail/lockDetail/lockDetail_logic.dart
@@ -337,10 +337,10 @@ class LockDetailLogic extends BaseGetXController{
 
   // 点击开门事件
   Future<void> openDoorAction() async {
-    if(BlueManage().connectDeviceMacAddress.isEmpty){
-      Toast.show(msg: "正在连接设备，请稍等。");
-      return;
-    }
+    // if(BlueManage().connectDeviceMacAddress.isEmpty){
+    //   Toast.show(msg: "正在连接设备，请稍等。");
+    //   return;
+    // }
     BlueManage().judgeReconnect(BlueManage().connectDeviceMacAddress, state.keyInfos.value.bluetooth!.bluetoothDeviceName!, (DeviceConnectionState state) async {
       if (state == DeviceConnectionState.connected){
         var privateKey = await Storage.getStringList(saveBluePrivateKey);
@@ -455,6 +455,7 @@ class LockDetailLogic extends BaseGetXController{
       if(state.lockState.value == 1){
         stopConnect();
         state.lockState.value = 4;
+        Toast.show(msg: "连接设备失败，请确保在设备附近，设备未被连接，设备已打开");
         state.animationController.reset();
         state.animationController.forward();
       }