From 9f326f4000847e6167d8166fa2f6a66f53cb3734 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 17 十二月 2020 09:07:13 +0800
Subject: [PATCH] 新云端Ver1.3
---
ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelSimpleMutilfunctionTargetsForm.cs | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelSimpleMutilfunctionTargetsForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelSimpleMutilfunctionTargetsForm.cs
index 043f611..d9b1c8c 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 = LocalDevice.Current.GetDevice(bindObj.BindMacAddr, bindObj.BindEpoint);
+ var device = HdlDeviceCommonLogic.Current.GetDevice(bindObj.BindMacAddr, bindObj.BindEpoint);
switch (curBindType)
{
case 1:
@@ -483,7 +483,7 @@
if (device != null)
{
//璁惧鍚嶅瓧
- btnBindNameText = Common.LocalDevice.Current.GetDeviceEpointName(device);
+ btnBindNameText = HdlDeviceCommonLogic.Current.GetDeviceEpointName(device);
//鑾峰彇璁惧鎵�灞炴埧闂�
var tempDevRoom = HdlRoomLogic.Current.GetRoomByDevice(device);
@@ -571,7 +571,7 @@
localDeviceList.Clear();
scList.Clear();
//璁惧
- foreach (var dev in Shared.Common.LocalDevice.Current.listAllDevice)
+ foreach (var dev in HdlDeviceCommonLogic.Current.listAllDevice)
{
localDeviceList.Add(dev);
}
@@ -623,7 +623,6 @@
curD.BindScenesId = dev.BindScenesId;
curD.BindMacAddr = dev.BindMacAddr;
curD.BindEpoint = dev.BindEpoint;
- curD.ESName = dev.ESName;
curD.BindType = dev.BindType;
bList.Add(curD);
}
@@ -716,7 +715,7 @@
switch (curBindType)
{
case 3:
- var device = LocalDevice.Current.GetDevice(bindDevice.BindMacAddr, bindDevice.BindEpoint);
+ var device = HdlDeviceCommonLogic.Current.GetDevice(bindDevice.BindMacAddr, bindDevice.BindEpoint);
if (device != null)
{
if (device.Type == DeviceType.DimmableLight)
--
Gitblit v1.8.0