sky/app-starlock
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitee.com/weishaoyang/star_lock

Browse Source
This commit is contained in:
Daisy 2023-10-21 14:29:53 +08:00
commit dd7a428b1d
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
star_lock/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
View File

@ -40,7 +40,7 @@
</Testables> </Testables>
</TestAction> </TestAction>
<LaunchAction <LaunchAction
buildConfiguration = "Release" buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0" launchStyle = "0"

9
star_lock/lib/main/lockDetail/lockDetail/lockDetail_logic.dart
View File

@ -337,10 +337,10 @@ class LockDetailLogic extends BaseGetXController{
// 点击开门事件 // 点击开门事件
Future<void> openDoorAction() async { Future<void> openDoorAction() async {
if(BlueManage().connectDeviceMacAddress.isEmpty){ // if(BlueManage().connectDeviceMacAddress.isEmpty){
Toast.show(msg: "正在连接设备，请稍等。"); // Toast.show(msg: "正在连接设备，请稍等。");
return; // return;
} // }
BlueManage().judgeReconnect(BlueManage().connectDeviceMacAddress, state.keyInfos.value.bluetooth!.bluetoothDeviceName!, (DeviceConnectionState state) async { BlueManage().judgeReconnect(BlueManage().connectDeviceMacAddress, state.keyInfos.value.bluetooth!.bluetoothDeviceName!, (DeviceConnectionState state) async {
if (state == DeviceConnectionState.connected){ if (state == DeviceConnectionState.connected){
var privateKey = await Storage.getStringList(saveBluePrivateKey); var privateKey = await Storage.getStringList(saveBluePrivateKey);
@ -455,6 +455,7 @@ class LockDetailLogic extends BaseGetXController{
if(state.lockState.value == 1){ if(state.lockState.value == 1){
stopConnect(); stopConnect();
state.lockState.value = 4; state.lockState.value = 4;
Toast.show(msg: "连接设备失败，请确保在设备附近，设备未被连接，设备已打开");
state.animationController.reset(); state.animationController.reset();
state.animationController.forward(); state.animationController.forward();
} }