From e90209beae6a4e822cecb18e6889f8bda23f630e Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 14 十二月 2020 11:16:06 +0800
Subject: [PATCH] 合并了晾衣架(非新云端)
---
ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelSimpleMutilfunctionTargetsForm.cs | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelSimpleMutilfunctionTargetsForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelSimpleMutilfunctionTargetsForm.cs
index d9b1c8c..cd8a5ec 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelSimpleMutilfunctionTargetsForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelSimpleMutilfunctionTargetsForm.cs
@@ -443,7 +443,7 @@
{
//琚粦瀹氳澶囧浘鐗囥�愬彲鑳藉拰澶栭潰璁惧绛夊浘鐗囦笉鍚岋紝鍥犱负杩欓噷鏄互鍔熻兘鏉ョ粦瀹氱殑銆�
//devicePic.UnSelectedImagePath = tempDev.IconPath;
- var device = HdlDeviceCommonLogic.Current.GetDevice(bindObj.BindMacAddr, bindObj.BindEpoint);
+ var device = LocalDevice.Current.GetDevice(bindObj.BindMacAddr, bindObj.BindEpoint);
switch (curBindType)
{
case 1:
@@ -483,7 +483,7 @@
if (device != null)
{
//璁惧鍚嶅瓧
- btnBindNameText = HdlDeviceCommonLogic.Current.GetDeviceEpointName(device);
+ btnBindNameText = Common.LocalDevice.Current.GetDeviceEpointName(device);
//鑾峰彇璁惧鎵�灞炴埧闂�
var tempDevRoom = HdlRoomLogic.Current.GetRoomByDevice(device);
@@ -571,7 +571,7 @@
localDeviceList.Clear();
scList.Clear();
//璁惧
- foreach (var dev in HdlDeviceCommonLogic.Current.listAllDevice)
+ foreach (var dev in Shared.Common.LocalDevice.Current.listAllDevice)
{
localDeviceList.Add(dev);
}
@@ -715,7 +715,7 @@
switch (curBindType)
{
case 3:
- var device = HdlDeviceCommonLogic.Current.GetDevice(bindDevice.BindMacAddr, bindDevice.BindEpoint);
+ var device = LocalDevice.Current.GetDevice(bindDevice.BindMacAddr, bindDevice.BindEpoint);
if (device != null)
{
if (device.Type == DeviceType.DimmableLight)
--
Gitblit v1.8.0