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

fix:调整远程开锁获取lockId逻辑

Browse Source
This commit is contained in:
liyi 2025-05-15 16:46:14 +08:00
parent e754d008c5
commit 069ef1b592
2 changed files with 66 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
lib/talk/starChart/views/imageTransmission/image_transmission_logic.dart
View File

@ -32,6 +32,8 @@ import 'package:star_lock/talk/starChart/views/imageTransmission/image_transmiss
import 'package:star_lock/talk/starChart/views/talkView/talk_view_state.dart'; import 'package:star_lock/talk/starChart/views/talkView/talk_view_state.dart';
import 'package:star_lock/tools/G711Tool.dart'; import 'package:star_lock/tools/G711Tool.dart';
import 'package:star_lock/tools/bugly/bugly_tool.dart'; import 'package:star_lock/tools/bugly/bugly_tool.dart';
import 'package:star_lock/tools/commonDataManage.dart';
import 'package:star_lock/tools/storage.dart';
import '../../../../tools/baseGetXController.dart'; import '../../../../tools/baseGetXController.dart';
@ -517,25 +519,32 @@ class ImageTransmissionLogic extends BaseGetXController {
// 远程开锁 // 远程开锁
Future<void> remoteOpenLock() async { Future<void> remoteOpenLock() async {
final lockPeerId = StartChartManage().lockPeerId; final LockListInfoItemEntity currentKeyInfo =
final lockListPeerId = StartChartManage().lockListPeerId; CommonDataManage().currentKeyInfo;
int lockId = lockDetailState.keyInfos.value.lockId ?? 0;
// 如果锁列表获取到peerId，代表有多个锁，使用锁列表的peerId var lockId = currentKeyInfo.lockId ?? 0;
// 从列表中遍历出对应的peerId var remoteUnlock = currentKeyInfo.lockSetting?.remoteUnlock ?? 0;
lockListPeerId.forEach((element) {
if (element.network?.peerId == lockPeerId) { final lockPeerId = StartChartManage().lockPeerId;
lockId = element.lockId ?? 0; final LockListInfoGroupEntity? lockListInfoGroupEntity =
await Storage.getLockMainListData();
if (lockListInfoGroupEntity != null) {
lockListInfoGroupEntity!.groupList?.forEach((element) {
final lockList = element.lockList;
if (lockList != null && lockList.length != 0) {
for (var lockInfo in lockList) {
final peerId = lockInfo.network?.peerId;
if (peerId != null && peerId != '') {
if (peerId == lockPeerId) {
lockId = lockInfo.lockId ?? 0;
remoteUnlock = lockInfo.lockSetting?.remoteUnlock ?? 0;
}
}
}
} }
}); });
}
final LockSetInfoEntity lockSetInfoEntity = if (remoteUnlock == 1) {
await ApiRepository.to.getLockSettingInfoData(
lockId: lockId.toString(),
);
if (lockSetInfoEntity.errorCode!.codeIsSuccessful) {
if (lockSetInfoEntity.data?.lockFeature?.remoteUnlock == 1 &&
lockSetInfoEntity.data?.lockSettingInfo?.remoteUnlock == 1) {
final LoginEntity entity = await ApiRepository.to final LoginEntity entity = await ApiRepository.to
.remoteOpenLock(lockId: lockId.toString(), timeOut: 60); .remoteOpenLock(lockId: lockId.toString(), timeOut: 60);
if (entity.errorCode!.codeIsSuccessful) { if (entity.errorCode!.codeIsSuccessful) {
@ -546,7 +555,6 @@ class ImageTransmissionLogic extends BaseGetXController {
showToast('该锁的远程开锁功能未启用'.tr); showToast('该锁的远程开锁功能未启用'.tr);
} }
} }
}
/// 初始化音频录制器 /// 初始化音频录制器
void _initAudioRecorder() { void _initAudioRecorder() {

42
lib/talk/starChart/views/talkView/talk_view_logic.dart
View File

@ -31,6 +31,8 @@ import 'package:star_lock/talk/starChart/star_chart_manage.dart';
import 'package:star_lock/talk/starChart/views/talkView/talk_view_state.dart'; import 'package:star_lock/talk/starChart/views/talkView/talk_view_state.dart';
import 'package:star_lock/tools/G711Tool.dart'; import 'package:star_lock/tools/G711Tool.dart';
import 'package:star_lock/tools/bugly/bugly_tool.dart'; import 'package:star_lock/tools/bugly/bugly_tool.dart';
import 'package:star_lock/tools/commonDataManage.dart';
import 'package:star_lock/tools/storage.dart';
import '../../../../tools/baseGetXController.dart'; import '../../../../tools/baseGetXController.dart';
@ -514,25 +516,32 @@ class TalkViewLogic extends BaseGetXController {
// 远程开锁 // 远程开锁
Future<void> remoteOpenLock() async { Future<void> remoteOpenLock() async {
final lockPeerId = StartChartManage().lockPeerId; final LockListInfoItemEntity currentKeyInfo =
final lockListPeerId = StartChartManage().lockListPeerId; CommonDataManage().currentKeyInfo;
int lockId = lockDetailState.keyInfos.value.lockId ?? 0;
// 如果锁列表获取到peerId，代表有多个锁，使用锁列表的peerId var lockId = currentKeyInfo.lockId ?? 0;
// 从列表中遍历出对应的peerId var remoteUnlock = currentKeyInfo.lockSetting?.remoteUnlock ?? 0;
lockListPeerId.forEach((element) {
if (element.network?.peerId == lockPeerId) { final lockPeerId = StartChartManage().lockPeerId;
lockId = element.lockId ?? 0; final LockListInfoGroupEntity? lockListInfoGroupEntity =
await Storage.getLockMainListData();
if (lockListInfoGroupEntity != null) {
lockListInfoGroupEntity!.groupList?.forEach((element) {
final lockList = element.lockList;
if (lockList != null && lockList.length != 0) {
for (var lockInfo in lockList) {
final peerId = lockInfo.network?.peerId;
if (peerId != null && peerId != '') {
if (peerId == lockPeerId) {
lockId = lockInfo.lockId ?? 0;
remoteUnlock = lockInfo.lockSetting?.remoteUnlock ?? 0;
}
}
}
} }
}); });
}
final LockSetInfoEntity lockSetInfoEntity = if (remoteUnlock == 1) {
await ApiRepository.to.getLockSettingInfoData(
lockId: lockId.toString(),
);
if (lockSetInfoEntity.errorCode!.codeIsSuccessful) {
if (lockSetInfoEntity.data?.lockFeature?.remoteUnlock == 1 &&
lockSetInfoEntity.data?.lockSettingInfo?.remoteUnlock == 1) {
final LoginEntity entity = await ApiRepository.to final LoginEntity entity = await ApiRepository.to
.remoteOpenLock(lockId: lockId.toString(), timeOut: 60); .remoteOpenLock(lockId: lockId.toString(), timeOut: 60);
if (entity.errorCode!.codeIsSuccessful) { if (entity.errorCode!.codeIsSuccessful) {
@ -543,7 +552,6 @@ class TalkViewLogic extends BaseGetXController {
showToast('该锁的远程开锁功能未启用'.tr); showToast('该锁的远程开锁功能未启用'.tr);
} }
} }
}
/// 初始化音频录制器 /// 初始化音频录制器
void _initAudioRecorder() { void _initAudioRecorder() {