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

修复开锁是否联网bug

Browse Source
This commit is contained in:
魏少阳 2024-03-01 14:16:23 +08:00
parent 4a377f380e
commit 3fecd06371
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
star_lock/lib/flavors.dart
View File

@ -36,6 +36,8 @@ class F {
switch (appFlavor) { switch (appFlavor) {
case Flavor.dev: case Flavor.dev:
return 'https://dev.lock.star-lock.cn'; return 'https://dev.lock.star-lock.cn';
// return "http://192.168.1.15:8022"; //谢总本地
// "https://ge.lock.star-lock.cn"; //葛工开发环境地址
case Flavor.pre: case Flavor.pre:
return 'https://pre.lock.star-lock.cn'; return 'https://pre.lock.star-lock.cn';
case Flavor.sky: case Flavor.sky:

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

@ -609,6 +609,7 @@ class LockDetailLogic extends BaseGetXController {
// 电子钥匙lockUserNo为0 要先添加用户 // 电子钥匙lockUserNo为0 要先添加用户
addUserConnectBlue(); addUserConnectBlue();
} else { } else {
print("state.isOpenLockNeedOnline.value:${state.isOpenLockNeedOnline.value}");
if (state.isOpenLockNeedOnline.value == 0) { if (state.isOpenLockNeedOnline.value == 0) {
// 不需要联网 // 不需要联网
openDoorAction(1); openDoorAction(1);
@ -740,19 +741,17 @@ class LockDetailLogic extends BaseGetXController {
_lockSetOpenOrCloseCheckInRefreshLockDetailWithAttendanceEvent; _lockSetOpenOrCloseCheckInRefreshLockDetailWithAttendanceEvent;
void _initLockSetOpenOrCloseCheckInRefreshLockDetailWithAttendanceAction() { void _initLockSetOpenOrCloseCheckInRefreshLockDetailWithAttendanceAction() {
// 蓝牙协议通知传输跟蓝牙之外的数据传输类不一样 eventBus // 蓝牙协议通知传输跟蓝牙之外的数据传输类不一样 eventBus
_lockSetOpenOrCloseCheckInRefreshLockDetailWithAttendanceEvent = eventBus _lockSetOpenOrCloseCheckInRefreshLockDetailWithAttendanceEvent = eventBus.on<LockSetChangeSetRefreshLockDetailWithType>().listen((event) {
.on<LockSetChangeSetRefreshLockDetailWithType>()
.listen((event) {
if (event.type == 0) { if (event.type == 0) {
// 0考勤 // 0考勤
state.isAttendance.value = int.parse(event.setResult); state.isAttendance.value = int.parse(event.setResult);
state.keyInfos.value.lockSetting!.attendance = state.keyInfos.value.lockSetting!.attendance = int.parse(event.setResult);
int.parse(event.setResult);
} else if (event.type == 1) { } else if (event.type == 1) {
// 1 开锁时是否需联网 // 1 开锁时是否需联网
state.isOpenLockNeedOnline.value = int.parse(event.setResult); state.isOpenLockNeedOnline.value = int.parse(event.setResult);
state.keyInfos.value.lockSetting!.appUnlockOnline = state.keyInfos.value.lockSetting!.appUnlockOnline =
int.parse(event.setResult); int.parse(event.setResult);
print("state.isOpenLockNeedOnline.value:${state.isOpenLockNeedOnline.value}");
} else if (event.type == 2) { } else if (event.type == 2) {
// 2 常开模式 // 2 常开模式
state.isOpenPassageMode.value = int.parse(event.setResult); state.isOpenPassageMode.value = int.parse(event.setResult);

2
star_lock/lib/main/lockDetail/lockSet/lockSet/lockSet_logic.dart
View File

@ -668,8 +668,8 @@ class LockSetLogic extends BaseGetXController {
state.isOpenLockNeedOnline.value = (state.isOpenLockNeedOnline.value == 1 ? 0 : 1); state.isOpenLockNeedOnline.value = (state.isOpenLockNeedOnline.value == 1 ? 0 : 1);
state.lockSettingInfo.value.appUnlockOnline = state.isOpenLockNeedOnline.value; state.lockSettingInfo.value.appUnlockOnline = state.isOpenLockNeedOnline.value;
eventBus.fire(LockSetChangeSetRefreshLockDetailWithType(0, state.lockSettingInfo.value.appUnlockOnline!.toString()));
showToast("设置成功",something: (){ showToast("设置成功",something: (){
eventBus.fire(LockSetChangeSetRefreshLockDetailWithType(1, state.lockSettingInfo.value.appUnlockOnline!.toString()));
eventBus.fire(RefreshLockListInfoDataEvent()); eventBus.fire(RefreshLockListInfoDataEvent());
print("state.lockSettingInfo.value.appUnlockOnline:${state.lockSettingInfo.value.appUnlockOnline}"); print("state.lockSettingInfo.value.appUnlockOnline:${state.lockSettingInfo.value.appUnlockOnline}");
}); });