From 0d9f64668fd7350d6a21fd157e32009a96d98134 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期三, 16 十二月 2020 13:09:08 +0800
Subject: [PATCH] 新云端代码Ver1.2
---
ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/MutilfunctionPanelMethod.cs | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/MutilfunctionPanelMethod.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/MutilfunctionPanelMethod.cs
index 288b3c3..aad8d26 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/MutilfunctionPanelMethod.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/MutilfunctionPanelMethod.cs
@@ -74,7 +74,7 @@
}
}
- var device = LocalDevice.Current.GetDevice(bDev.BindMacAddr, bDev.BindEpoint);
+ var device = HdlDeviceCommonLogic.Current.GetDevice(bDev.BindMacAddr, bDev.BindEpoint);
if (device == null)
{
continue;
@@ -190,7 +190,7 @@
var bList = curControlDev.bindTargetsFromMutilfunctionPanelList[key];
foreach (var bDev in bList)
{
- var device = LocalDevice.Current.GetDevice(bDev.BindMacAddr, bDev.BindEpoint);
+ var device = HdlDeviceCommonLogic.Current.GetDevice(bDev.BindMacAddr, bDev.BindEpoint);
if (device == null)
{
continue;
@@ -308,7 +308,7 @@
}
}
- var device = LocalDevice.Current.GetDevice(bDev.BindMacAddr, bDev.BindEpoint);
+ var device = HdlDeviceCommonLogic.Current.GetDevice(bDev.BindMacAddr, bDev.BindEpoint);
if (device == null)
{
continue;
@@ -442,7 +442,7 @@
{
foreach (var de in room.ListDevice)
{
- var device = LocalDevice.Current.GetDevice(de);
+ var device = HdlDeviceCommonLogic.Current.GetDevice(de);
if (device != null)
{
var tempDev = curBindTypeList.Find(obj => obj.BindMacAddr + obj.BindEpoint == device.DeviceAddr + device.DeviceEpoint);
@@ -627,7 +627,7 @@
}
foreach (var deviceKeys in r.ListDevice)
{
- var device = LocalDevice.Current.GetDevice(deviceKeys);
+ var device = HdlDeviceCommonLogic.Current.GetDevice(deviceKeys);
if (device == null)
{
continue;
@@ -760,7 +760,7 @@
List<CommonDevice> UndistributeCommonDeviceListTemp = new List<CommonDevice>();
//鑾峰彇鏈湴璁惧鍒楄〃
- foreach (var tempDev in Shared.Common.LocalDevice.Current.listAllDevice)
+ foreach (var tempDev in HdlDeviceCommonLogic.Current.listAllDevice)
{
//鑾峰彇璁惧鎵�灞炴埧闂�
var tempDevRoom = HdlRoomLogic.Current.GetRoomByDevice(tempDev);
@@ -874,11 +874,11 @@
List<CommonDevice> curRoomDeviceListTemp = new List<CommonDevice>();
foreach (var deviceKeys in curRoom.ListDevice)
{
- var device = LocalDevice.Current.GetDevice(deviceKeys);
+ var device = HdlDeviceCommonLogic.Current.GetDevice(deviceKeys);
if (device != null)
{
//鑾峰彇璁惧绫诲瀷鐨�
- var deviceEnumInfo = Common.LocalDevice.Current.GetMyDeviceEnumInfo(new List<CommonDevice>() { device });
+ var deviceEnumInfo = HdlDeviceCommonLogic.Current.GetMyDeviceEnumInfo(new List<CommonDevice>() { device });
var tempDev = curBindTypeList.Find(obj => obj.BindMacAddr + obj.BindEpoint == device.DeviceAddr + device.DeviceEpoint);
if (tempDev != null)
{
@@ -918,7 +918,7 @@
case 4:
if (device.Type == DeviceType.WindowCoveringDevice)
{
- if (deviceEnumInfo.ConcreteType != Common.DeviceConcreteType.ButtonPanel_SimpleMultifunction)
+ if (deviceEnumInfo.ConcreteType != DeviceConcreteType.ButtonPanel_SimpleMultifunction)
{
curRoomDeviceListTemp.Add(device);
}
--
Gitblit v1.8.0