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/Bind/AddDevicePage.cs | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/AddDevicePage.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/AddDevicePage.cs
index 029faad..63679cc 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/AddDevicePage.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/AddDevicePage.cs
@@ -486,7 +486,7 @@
}
foreach (var deviceKeys in r.ListDevice)
{
- var device = HdlDeviceCommonLogic.Current.GetDevice(deviceKeys);
+ var device = LocalDevice.Current.GetDevice(deviceKeys);
if (device != null)
{
var dev = device.InClusterList.Find(obj => (obj != null) && (obj.InCluster == 6));
@@ -511,7 +511,7 @@
}
foreach (var deviceKeys in r.ListDevice)
{
- var device = HdlDeviceCommonLogic.Current.GetDevice(deviceKeys);
+ var device = LocalDevice.Current.GetDevice(deviceKeys);
if (device != null)
{
var dev = device.InClusterList.Find(obj => (obj != null) && (obj.InCluster == 8));
@@ -536,7 +536,7 @@
}
foreach (var deviceKeys in r.ListDevice)
{
- var device = HdlDeviceCommonLogic.Current.GetDevice(deviceKeys);
+ var device = LocalDevice.Current.GetDevice(deviceKeys);
if (device != null)
{
var dev = device.InClusterList.Find(obj => (obj != null) && (obj.InCluster == 258));
@@ -566,7 +566,7 @@
case "AddSwitch":
foreach (var deviceKeys in curRoom.ListDevice)
{
- var device = HdlDeviceCommonLogic.Current.GetDevice(deviceKeys);
+ var device = LocalDevice.Current.GetDevice(deviceKeys);
if (device != null)
{
var dev = device.InClusterList.Find(obj => (obj != null) && (obj.InCluster == 6));
@@ -580,7 +580,7 @@
case "AddDimmer":
foreach (var deviceKeys in curRoom.ListDevice)
{
- var device = HdlDeviceCommonLogic.Current.GetDevice(deviceKeys);
+ var device = LocalDevice.Current.GetDevice(deviceKeys);
if (device != null)
{
var dev = device.InClusterList.Find(obj => (obj != null) && (obj.InCluster == 8));
@@ -594,7 +594,7 @@
case "AddCurtain":
foreach (var deviceKeys in curRoom.ListDevice)
{
- var device = HdlDeviceCommonLogic.Current.GetDevice(deviceKeys);
+ var device = LocalDevice.Current.GetDevice(deviceKeys);
if (device != null)
{
var dev = device.InClusterList.Find(obj => (obj != null) && (obj.InCluster == 258));
@@ -641,7 +641,7 @@
TextColor = Shared.Common.ZigbeeColor.Current.TextBlack,
TextAlignment = TextAlignment.CenterLeft,
Tag = device.DeviceEpointName,
- Text = HdlDeviceCommonLogic.Current.GetDeviceEpointName(device),
+ Text = Common.LocalDevice.Current.GetDeviceEpointName(device),
TextSize = 15,
};
rowLayout.AddChidren(btnBindName);
--
Gitblit v1.8.0