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/Bind/BindInfo.cs | 36 ++++++++++++++++++------------------
1 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindInfo.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindInfo.cs
index 5e26485..80f0596 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindInfo.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindInfo.cs
@@ -130,7 +130,7 @@
case BindType.FreshAir:
foreach (var deviceKeys in curRoom.ListDevice)
{
- var device = HdlDeviceCommonLogic.Current.GetDevice(deviceKeys);
+ var device = LocalDevice.Current.GetDevice(deviceKeys);
if (device != null)
{
if (BindInfo.checkRealFreshAirDevice(device) == false)
@@ -151,7 +151,7 @@
curRoomDeviceListTemp = GetMatchHumiditySensorDevice(curRoom);
foreach (var deviceKeys in curRoom.ListDevice)
{
- var device = HdlDeviceCommonLogic.Current.GetDevice(deviceKeys);
+ var device = LocalDevice.Current.GetDevice(deviceKeys);
if (device != null)
{
if (device.Type == DeviceType.FreshAirHumiditySensor)
@@ -164,7 +164,7 @@
case BindType.PM:
foreach (var deviceKeys in curRoom.ListDevice)
{
- var device = HdlDeviceCommonLogic.Current.GetDevice(deviceKeys);
+ var device = LocalDevice.Current.GetDevice(deviceKeys);
if (device != null)
{
if (device.Type == DeviceType.PMSensor)
@@ -177,7 +177,7 @@
case BindType.AC:
foreach (var deviceKeys in curRoom.ListDevice)
{
- var device = HdlDeviceCommonLogic.Current.GetDevice(deviceKeys);
+ var device = LocalDevice.Current.GetDevice(deviceKeys);
if (device != null)
{
if (device.Type == DeviceType.Thermostat)
@@ -204,7 +204,7 @@
List<CommonDevice> roomIncludeMatchTempDevice = new List<CommonDevice>();
foreach (var de in room.ListDevice)
{
- var device = HdlDeviceCommonLogic.Current.GetDevice(de);
+ var device = LocalDevice.Current.GetDevice(de);
if (device != null)
{
//鐢垫睜璁惧涓嶆敮鎸佺粦瀹�
@@ -249,7 +249,7 @@
List<CommonDevice> roomIncludeMatchHumpDevice = new List<CommonDevice>();
foreach (var de in room.ListDevice)
{
- var device = HdlDeviceCommonLogic.Current.GetDevice(de);
+ var device = LocalDevice.Current.GetDevice(de);
if (device != null)
{
//鐢垫睜璁惧涓嶆敮鎸佺粦瀹�
@@ -356,7 +356,7 @@
case BindInfo.BindType.FreshAir:
foreach (var de in room.ListDevice)
{
- var device = HdlDeviceCommonLogic.Current.GetDevice(de);
+ var device = LocalDevice.Current.GetDevice(de);
if (device != null)
{
if (BindInfo.checkRealFreshAirDevice(device) == false)
@@ -377,7 +377,7 @@
roomIncludeMatchDevice = GetMatchHumiditySensorDevice(room);
foreach (var de in room.ListDevice)
{
- var device = HdlDeviceCommonLogic.Current.GetDevice(de);
+ var device = LocalDevice.Current.GetDevice(de);
if (device != null)
{
if (device.Type == DeviceType.FreshAirHumiditySensor)
@@ -390,7 +390,7 @@
case BindInfo.BindType.PM:
foreach (var de in room.ListDevice)
{
- var device = HdlDeviceCommonLogic.Current.GetDevice(de);
+ var device = LocalDevice.Current.GetDevice(de);
if (device != null)
{
if (device.Type == DeviceType.PMSensor)
@@ -403,7 +403,7 @@
case BindInfo.BindType.AC:
foreach (var de in room.ListDevice)
{
- var device = HdlDeviceCommonLogic.Current.GetDevice(de);
+ var device = LocalDevice.Current.GetDevice(de);
if (device != null)
{
if (device.Type == DeviceType.Thermostat)
@@ -452,7 +452,7 @@
List<CommonDevice> UndistributeCommonDeviceListTemp = new List<CommonDevice>();
//鑾峰彇鏈湴璁惧鍒楄〃
- foreach (var tempDev in HdlDeviceCommonLogic.Current.listAllDevice)
+ foreach (var tempDev in Shared.Common.LocalDevice.Current.listAllDevice)
{
//鑾峰彇璁惧鎵�灞炴埧闂�
var tempDevRoom = HdlRoomLogic.Current.GetRoomByDevice(tempDev);
@@ -584,7 +584,7 @@
}
foreach (var deviceKeys in r.ListDevice)
{
- var device = HdlDeviceCommonLogic.Current.GetDevice(deviceKeys);
+ var device = LocalDevice.Current.GetDevice(deviceKeys);
if (device != null)
{
if (BindInfo.checkRealFreshAirDevice(device) == false)
@@ -627,7 +627,7 @@
}
foreach (var deviceKeys in r.ListDevice)
{
- var device = HdlDeviceCommonLogic.Current.GetDevice(deviceKeys);
+ var device = LocalDevice.Current.GetDevice(deviceKeys);
if (device != null)
{
if (device.Type == DeviceType.FreshAirHumiditySensor)
@@ -647,7 +647,7 @@
}
foreach (var deviceKeys in r.ListDevice)
{
- var device = HdlDeviceCommonLogic.Current.GetDevice(deviceKeys);
+ var device = LocalDevice.Current.GetDevice(deviceKeys);
if (device != null)
{
if (device.Type == DeviceType.PMSensor)
@@ -667,7 +667,7 @@
}
foreach (var deviceKeys in r.ListDevice)
{
- var device = HdlDeviceCommonLogic.Current.GetDevice(deviceKeys);
+ var device = LocalDevice.Current.GetDevice(deviceKeys);
if (device != null)
{
if (device.Type == DeviceType.Thermostat)
@@ -754,8 +754,8 @@
{
bool result = true;
//鑾峰彇璁惧灞炰簬銆愮畝绾﹀鍔熻兘闈㈡澘銆�
- var deviceEnumInfo = HdlDeviceCommonLogic.Current.GetMyDeviceEnumInfo(new List<CommonDevice> { device });
- if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_SimpleMultifunction)
+ var deviceEnumInfo = Common.LocalDevice.Current.GetMyDeviceEnumInfo(new List<CommonDevice> { device });
+ if (deviceEnumInfo.ConcreteType == Common.DeviceConcreteType.ButtonPanel_SimpleMultifunction)
{
if (device.Type == DeviceType.TemperatureSensor && device.DeviceEpoint == 1)
{
@@ -802,7 +802,7 @@
}
foreach (var deviceKeys in room.ListDevice)
{
- var device = HdlDeviceCommonLogic.Current.GetDevice(deviceKeys);
+ var device = Common.LocalDevice.Current.GetDevice(deviceKeys);
//妫�娴嬭璁惧鑳藉惁鏄剧ず
if (CheckCanShowDevice(device, curDeviceBindType) == false)
{
--
Gitblit v1.8.0