From 94602eed474218197934ad5f1fb9316ecd926449 Mon Sep 17 00:00:00 2001 From: liyi Date: Tue, 18 Feb 2025 17:50:55 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E5=A2=9E=E5=8A=A0=E8=BF=9C=E7=A8=8B?= =?UTF-8?q?=E5=BC=80=E9=94=81=E5=8A=9F=E8=83=BD=E5=89=8D=E5=88=A4=E6=96=AD?= =?UTF-8?q?=E6=98=AF=E5=90=A6=E5=8A=9F=E8=83=BD=E6=98=AF=E5=90=A6=E5=90=AF?= =?UTF-8?q?=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lan/lan_en.json | 1 + lan/lan_keys.json | 1 + lan/lan_zh.json | 1 + .../views/talkView/talk_view_logic.dart | 20 +++++++++++++++---- 4 files changed, 19 insertions(+), 4 deletions(-) diff --git a/lan/lan_en.json b/lan/lan_en.json index 5aa1bec1..2be7a6c6 100644 --- a/lan/lan_en.json +++ b/lan/lan_en.json @@ -1128,6 +1128,7 @@ "正在说话...": "Talking now...", "设备不在线": "The device is not online", "设备未配网": "The device is not connected to the network", + "该锁的远程开锁功能未启用": "The remote unlocking function of this lock is not enabled", "下载完成,请到相册查看": "Download completed, please go to the album to view", "重置后，该锁的遥控都将被删除哦，确认要重置吗？": "After reset, the remote control of the lock will be deleted. Do you want to reset it?", "版本说明": "Version description", diff --git a/lan/lan_keys.json b/lan/lan_keys.json index 133a5adf..865c5a68 100755 --- a/lan/lan_keys.json +++ b/lan/lan_keys.json @@ -1129,6 +1129,7 @@ "正在说话...": "正在说话...", "设备不在线": "设备不在线", "设备未配网": "设备未配网", + "该锁的远程开锁功能未启用": "该锁的远程开锁功能未启用", "下载完成,请到相册查看": "下载完成,请到相册查看", "重置后，该锁的遥控都将被删除哦，确认要重置吗？": "重置后，该锁的遥控都将被删除哦，确认要重置吗？", "版本说明": "版本说明" diff --git a/lan/lan_zh.json b/lan/lan_zh.json index da23c938..aaf5096f 100755 --- a/lan/lan_zh.json +++ b/lan/lan_zh.json @@ -1129,6 +1129,7 @@ "正在说话...": "正在说话...", "设备不在线": "设备不在线", "设备未配网": "设备未配网", + "该锁的远程开锁功能未启用": "该锁的远程开锁功能未启用", "下载完成,请到相册查看": "下载完成,请到相册查看", "重置后，该锁的遥控都将被删除哦，确认要重置吗？": "重置后，该锁的遥控都将被删除哦，确认要重置吗？", "版本说明": "版本说明" diff --git a/lib/talk/starChart/views/talkView/talk_view_logic.dart b/lib/talk/starChart/views/talkView/talk_view_logic.dart index bbc980c7..5dd7108b 100644 --- a/lib/talk/starChart/views/talkView/talk_view_logic.dart +++ b/lib/talk/starChart/views/talkView/talk_view_logic.dart @@ -25,6 +25,8 @@ import 'package:star_lock/login/login/entity/LoginEntity.dart'; import 'package:star_lock/main/lockDetail/lockDetail/lockDetail_logic.dart'; import 'package:star_lock/main/lockDetail/lockDetail/lockDetail_state.dart'; import 'package:star_lock/main/lockDetail/lockDetail/lockNetToken_entity.dart'; +import 'package:star_lock/main/lockDetail/lockSet/lockSet/lockSet_logic.dart'; +import 'package:star_lock/main/lockDetail/lockSet/lockSet/lockSet_state.dart'; import 'package:star_lock/main/lockMian/entity/lockListInfo_entity.dart'; import 'package:star_lock/main/lockMian/lockList/lockList_logic.dart'; import 'package:star_lock/network/api_repository.dart'; @@ -36,12 +38,14 @@ import 'package:star_lock/talk/starChart/proto/talk_expect.pb.dart'; 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/tools/bugly/bugly_tool.dart'; +import 'package:star_lock/tools/commonDataManage.dart'; import 'package:star_lock/tools/storage.dart'; import '../../../../tools/baseGetXController.dart'; class TalkViewLogic extends BaseGetXController { final TalkViewState state = TalkViewState(); + final LockDetailState lockDetailState = Get.put(LockDetailLogic()).state; Timer? _syncTimer; // 音视频播放刷新率定时器 Timer? _audioTimer; // 音视频播放刷新率定时器 @@ -122,10 +126,12 @@ class TalkViewLogic extends BaseGetXController { state.oneMinuteTimeTimer?.cancel(); // 取消旧定时器 state.oneMinuteTimeTimer ??= Timer.periodic(const Duration(seconds: 1), (Timer t) { - state.oneMinuteTime.value++; - if (state.oneMinuteTime.value >= 60) { - t.cancel(); // 取消定时器 - state.oneMinuteTime.value = 0; + if (state.listData.value.length > 0) { + state.oneMinuteTime.value++; + if (state.oneMinuteTime.value >= 60) { + t.cancel(); // 取消定时器 + state.oneMinuteTime.value = 0; + } } }); break; @@ -499,6 +505,12 @@ class TalkViewLogic extends BaseGetXController { // 远程开锁 Future remoteOpenLock() async { + final remoteUnlock = + CommonDataManage().currentKeyInfo.lockSetting!.remoteUnlock; + if (remoteUnlock == 0) { + showToast('该锁的远程开锁功能未启用'.tr); + } + final lockPeerId = StartChartManage().lockPeerId; final lockListPeerId = StartChartManage().lockListPeerId; int lockId = 0;