From 136b9e2fc48249a5ff89874f1080ba94130e7a9e Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期二, 19 五月 2020 11:12:29 +0800
Subject: [PATCH] Merge branch 'dev-tzy' into dev-2020xm
---
ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceListMainForm.cs | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceListMainForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceListMainForm.cs
index 8f904cd..fefadb2 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceListMainForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceListMainForm.cs
@@ -481,7 +481,7 @@
{
//鏂规偊闈㈡澘鐨勫姛鑳介厤缃�
var form = new DevicePanel.PanelFangyueFunctionSettionForm();
- form.AddForm(device);
+ form.AddForm(device, deviceEnumInfo);
}
else
{
@@ -789,13 +789,12 @@
if (localDevice != null)
{
//鍦ㄧ嚎鐘舵�佷竴鏍风殑璇濓紝涓嶉渶瑕佸埛鏂�
- if (localDevice.IsOnline == device.IsOnline)
+ if (localDevice.IsOnline != device.IsOnline)
{
- return;
+ //淇濆瓨鐘舵��
+ localDevice.IsOnline = device.IsOnline;
+ localDevice.ReSave();
}
- //淇濆瓨鐘舵��
- localDevice.IsOnline = device.IsOnline;
- localDevice.ReSave();
}
rowInfo.MenuRow.IsOnline = Common.LocalDevice.Current.CheckDeviceIsOnline(device);
--
Gitblit v1.8.0