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/Bind/AddDevicePage.cs | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/AddDevicePage.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/AddDevicePage.cs
index d3c8be3..029faad 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/AddDevicePage.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/AddDevicePage.cs
@@ -7,6 +7,9 @@
using static ZigBee.Device.Panel;
namespace Shared.Phone.UserCenter.DeviceBind
{
+ /// <summary>
+ /// 鏅�氶潰鏉跨殑缁戝畾璁惧鐣岄潰銆愬彲缁戝畾澶氫釜璁惧銆�
+ /// </summary>
public class AddDevicePage : BindCommonLayout
{
/// 鏋勯�犲嚱鏁�
@@ -393,7 +396,7 @@
curentOldRoom = btnRoom;
curentOldRoomFrameLayout = btnRoomFrameLayout;
}
- if (index == roomTempList.Count - 1 && index > 3)
+ if (index == roomTempList.Count - 1 && index > 2)
{
var btnRoomFrameLayoutEmpty = new FrameLayout
{
@@ -483,7 +486,7 @@
}
foreach (var deviceKeys in r.ListDevice)
{
- var device = LocalDevice.Current.GetDevice(deviceKeys);
+ var device = HdlDeviceCommonLogic.Current.GetDevice(deviceKeys);
if (device != null)
{
var dev = device.InClusterList.Find(obj => (obj != null) && (obj.InCluster == 6));
@@ -508,7 +511,7 @@
}
foreach (var deviceKeys in r.ListDevice)
{
- var device = LocalDevice.Current.GetDevice(deviceKeys);
+ var device = HdlDeviceCommonLogic.Current.GetDevice(deviceKeys);
if (device != null)
{
var dev = device.InClusterList.Find(obj => (obj != null) && (obj.InCluster == 8));
@@ -533,7 +536,7 @@
}
foreach (var deviceKeys in r.ListDevice)
{
- var device = LocalDevice.Current.GetDevice(deviceKeys);
+ var device = HdlDeviceCommonLogic.Current.GetDevice(deviceKeys);
if (device != null)
{
var dev = device.InClusterList.Find(obj => (obj != null) && (obj.InCluster == 258));
@@ -563,7 +566,7 @@
case "AddSwitch":
foreach (var deviceKeys in curRoom.ListDevice)
{
- var device = LocalDevice.Current.GetDevice(deviceKeys);
+ var device = HdlDeviceCommonLogic.Current.GetDevice(deviceKeys);
if (device != null)
{
var dev = device.InClusterList.Find(obj => (obj != null) && (obj.InCluster == 6));
@@ -577,7 +580,7 @@
case "AddDimmer":
foreach (var deviceKeys in curRoom.ListDevice)
{
- var device = LocalDevice.Current.GetDevice(deviceKeys);
+ var device = HdlDeviceCommonLogic.Current.GetDevice(deviceKeys);
if (device != null)
{
var dev = device.InClusterList.Find(obj => (obj != null) && (obj.InCluster == 8));
@@ -591,7 +594,7 @@
case "AddCurtain":
foreach (var deviceKeys in curRoom.ListDevice)
{
- var device = LocalDevice.Current.GetDevice(deviceKeys);
+ var device = HdlDeviceCommonLogic.Current.GetDevice(deviceKeys);
if (device != null)
{
var dev = device.InClusterList.Find(obj => (obj != null) && (obj.InCluster == 258));
@@ -638,7 +641,7 @@
TextColor = Shared.Common.ZigbeeColor.Current.TextBlack,
TextAlignment = TextAlignment.CenterLeft,
Tag = device.DeviceEpointName,
- Text = Common.LocalDevice.Current.GetDeviceEpointName(device),
+ Text = HdlDeviceCommonLogic.Current.GetDeviceEpointName(device),
TextSize = 15,
};
rowLayout.AddChidren(btnBindName);
--
Gitblit v1.8.0