From fe3b2466c68b5db70d38e78039703add3b8b1dfe Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 31 十二月 2020 19:29:43 +0800
Subject: [PATCH] 合并了代码
---
ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueEnvironmentTargetForm.cs | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueEnvironmentTargetForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueEnvironmentTargetForm.cs
index 1cd89a4..506c793 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueEnvironmentTargetForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueEnvironmentTargetForm.cs
@@ -221,7 +221,7 @@
var listDevice = this.dicShowDevice[roomId];
for (int i = 0; i < listDevice.Count; i++)
{
- string mainKey = HdlDeviceCommonLogic.Current.GetDeviceMainKeys(listDevice[i]);
+ string mainKey = Common.LocalDevice.Current.GetDeviceMainKeys(listDevice[i]);
var contr = new DeviceSimpleSelectControl(listDevice[i], false, this.listView.rowSpace / 2);
listView.AddChidren(contr);
contr.InitControl();
@@ -290,7 +290,7 @@
foreach (var deviceKeys in room.ListDevice)
{
- var device = HdlDeviceCommonLogic.Current.GetDevice(deviceKeys);
+ var device = Common.LocalDevice.Current.GetDevice(deviceKeys);
if (device != null)
{
canShow = true;
--
Gitblit v1.8.0