diff --git a/lan/lan_en.json b/lan/lan_en.json index e72ecdae..5aa1bec1 100644 --- a/lan/lan_en.json +++ b/lan/lan_en.json @@ -1127,6 +1127,7 @@ "已挂断": "Hanging up", "正在说话...": "Talking now...", "设备不在线": "The device is not online", + "设备未配网": "The device is not connected to the network", "下载完成,请到相册查看": "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 9a3145af..133a5adf 100755 --- a/lan/lan_keys.json +++ b/lan/lan_keys.json @@ -1128,6 +1128,7 @@ "已挂断": "已挂断", "正在说话...": "正在说话...", "设备不在线": "设备不在线", + "设备未配网": "设备未配网", "下载完成,请到相册查看": "下载完成,请到相册查看", "重置后,该锁的遥控都将被删除哦,确认要重置吗?": "重置后,该锁的遥控都将被删除哦,确认要重置吗?", "版本说明": "版本说明" diff --git a/lan/lan_zh.json b/lan/lan_zh.json index 1b455063..da23c938 100755 --- a/lan/lan_zh.json +++ b/lan/lan_zh.json @@ -1128,6 +1128,7 @@ "已挂断": "已挂断", "正在说话...": "正在说话...", "设备不在线": "设备不在线", + "设备未配网": "设备未配网", "下载完成,请到相册查看": "下载完成,请到相册查看", "重置后,该锁的遥控都将被删除哦,确认要重置吗?": "重置后,该锁的遥控都将被删除哦,确认要重置吗?", "版本说明": "版本说明" diff --git a/lib/main/lockDetail/lockDetail/lockDetail_logic.dart b/lib/main/lockDetail/lockDetail/lockDetail_logic.dart index edf17bc0..66096a79 100755 --- a/lib/main/lockDetail/lockDetail/lockDetail_logic.dart +++ b/lib/main/lockDetail/lockDetail/lockDetail_logic.dart @@ -765,11 +765,19 @@ class LockDetailLogic extends BaseGetXController { } // 设置锁的peerID StartChartManage().lockPeerId = peerId; + StartChartManage().lockNetworkInfo = + deviceNetworkInfo.data ?? DeviceNetworkInfo(); } } /// 发送监控消息 void sendMonitorMessage() { + + if (StartChartManage().lockNetworkInfo.wifiName == null || + StartChartManage().lockNetworkInfo.wifiName == '') { + showToast('设备未配网'); + return; + } // 发送监控id StartChartManage().startCallRequestMessageTimer( ToPeerId: StartChartManage().lockPeerId ?? ''); diff --git a/lib/main/lockDetail/lockDetail/lockDetail_page.dart b/lib/main/lockDetail/lockDetail/lockDetail_page.dart index 421d0762..4a118b1f 100755 --- a/lib/main/lockDetail/lockDetail/lockDetail_page.dart +++ b/lib/main/lockDetail/lockDetail/lockDetail_page.dart @@ -1170,10 +1170,6 @@ class _LockDetailPageState extends State showWidgetArr.add( bottomItem('images/main/icon_catEyes.png', '监控'.tr, state.bottomBtnisEable.value, () async { - if (state.keyInfos.value.network?.isOnline == 0) { - logic.showToast('设备不在线'.tr); - return; - } logic.sendMonitorMessage(); }), ); diff --git a/lib/talk/starChart/star_chart_manage.dart b/lib/talk/starChart/star_chart_manage.dart index 9fc24737..a658cedd 100644 --- a/lib/talk/starChart/star_chart_manage.dart +++ b/lib/talk/starChart/star_chart_manage.dart @@ -12,6 +12,7 @@ import 'package:star_lock/app_settings/app_settings.dart'; import 'package:star_lock/flavors.dart'; import 'package:star_lock/login/login/entity/LoginData.dart'; import 'package:star_lock/login/login/entity/LoginEntity.dart'; +import 'package:star_lock/main/lockDetail/lockDetail/device_network_info.dart'; import 'package:star_lock/main/lockMian/entity/lockListInfo_entity.dart'; import 'package:star_lock/network/api_repository.dart'; import 'package:star_lock/network/start_chart_api.dart'; @@ -81,6 +82,7 @@ class StartChartManage { String ToPeerId = ''; // 对端ID String FromPeerId = ''; // 我的ID String lockPeerId = ''; // 锁peerId + DeviceNetworkInfo lockNetworkInfo = DeviceNetworkInfo(); // 锁网络信息 List lockListPeerId = []; // 锁列表peerId // echo测试peer对端