From 21923381bdac04d1633b168c97accc81f0898d84 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 23 三月 2020 16:45:31 +0800
Subject: [PATCH] 上传版本
---
ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/AddDevicePage.cs | 150 +++++++++++++++++++++----------------------------
1 files changed, 65 insertions(+), 85 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/AddDevicePage.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/AddDevicePage.cs
index df44068..7b91537 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/AddDevicePage.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/AddDevicePage.cs
@@ -8,19 +8,8 @@
using static ZigBee.Device.Panel;
namespace Shared.Phone.UserCenter.DeviceBind
{
- public class AddDevicePage : BindCommonLayout, ZigBee.Common.IStatus
+ public class AddDevicePage : BindCommonLayout
{
- /// <summary>
- /// 鎸夐敭妯″紡鎺ユ敹
- /// </summary>
- /// <param name="common">Common.</param>
- public void Changed(CommonDevice common)
- {
- Shared.Application.RunOnMainThread(() =>
- {
- });
- }
-
/// 鏋勯�犲嚱鏁�
/// </summary>
/// <param name="doorLock"></param>
@@ -58,7 +47,7 @@
/// <summary>
/// 褰撳墠璁惧绫诲瀷鍒楄〃
/// </summary>
- List<DeviceUI> curTypeDeviceList = new List<DeviceUI> { };
+ List<CommonDevice> curTypeDeviceList = new List<CommonDevice> { };
/// <summary>
/// 褰撳墠璁惧缁戝畾绫诲瀷
/// </summary>
@@ -82,7 +71,7 @@
/// <summary>
/// 褰撳墠鎸夐敭鐨勬墍鏈夋埧闂磋澶囧垪琛�
/// </summary>
- List<DeviceUI> currentKeyAllRoomDeviceList = new List<DeviceUI>();
+ List<CommonDevice> currentKeyAllRoomDeviceList = new List<CommonDevice>();
/// <summary>
/// 涓存椂瀛樺偍鐨勭洰鏍囧垪琛�
/// </summary>
@@ -221,14 +210,15 @@
#region 鏁版嵁澶勭悊
//鑾峰彇妤煎眰
- dicFloor = Common.Room.CurrentRoom.GetFloorSortList();
+ dicFloor = HdlRoomLogic.Current.GetFloorSortList();
currentKey.currentSelectFloorId = BindInfo.GetCurrentSelectFloorId();
btnFloorText.Text = BindInfo.GetCurrentSelectFloorIdName();
if (Common.Config.Instance.Home.FloorDics.Count == 0)
{
// 鑾峰彇娌℃湁妤煎眰鎴块棿
- foreach (var room in Shared.Common.Room.Lists)
+ var listAllRoom = HdlRoomLogic.Current.GetAllListRooms();
+ foreach (var room in listAllRoom)
{
if (string.IsNullOrEmpty(room.FloorId))
{
@@ -237,9 +227,10 @@
}
}
else
- {
- // 鑾峰彇妤煎眰瀵瑰簲瀵规埧闂�
- foreach (var room in Shared.Common.Room.Lists)
+ {
+ // 鑾峰彇妤煎眰瀵瑰簲瀵规埧闂�
+ var listAllRoom = HdlRoomLogic.Current.GetAllListRooms();
+ foreach (var room in listAllRoom)
{
if (room.FloorId == currentKey.currentSelectFloorId)
{
@@ -255,13 +246,13 @@
{
foreach (var devA in currentKeyAllRoomDeviceList)
{
- var id = devA.CommonDevice?.DeviceAddr + devA.CommonDevice?.DeviceEpoint;
+ var id = devA.DeviceAddr + devA.DeviceEpoint;
var dev = currentKey.bindList.Find(obj => (obj != null) && (obj.BindMacAddr + obj.BindEpoint == id));
if (dev != null)
{
if (!oldTargetList.ContainsKey(id))
{
- oldTargetList.Add(id, devA.CommonDevice);
+ oldTargetList.Add(id, devA);
}
}
}
@@ -453,15 +444,16 @@
/// 褰撳墠鎸夐敭鎵�鏈夋樉绀烘埧闂寸殑鎵�鏈夎澶囧鐞�
/// </summary>
/// <returns></returns>
- List<DeviceUI> GetALlDispalyRoomDeviceList()
+ List<CommonDevice> GetALlDispalyRoomDeviceList()
{
- currentKeyAllRoomDeviceList.Clear();
+ currentKeyAllRoomDeviceList.Clear();
+ var listAllRoom = HdlRoomLogic.Current.GetAllListRooms();
switch (curDeviceBindType)
{
case "AddSwitch":
- foreach (var r in Shared.Common.Room.Lists)
+ foreach (var r in listAllRoom)
{
- if (r.DeviceUIList.Count == 0)
+ if (r.ListDevice.Count == 0)
{
continue;
}
@@ -469,11 +461,12 @@
{
continue;
}
- foreach (var device in r.DeviceUIList)
+ foreach (var deviceKeys in r.ListDevice)
{
- if (device.CommonDevice != null)
+ var device = LocalDevice.Current.GetDevice(deviceKeys);
+ if (device != null)
{
- var dev = device.CommonDevice.InClusterList.Find(obj => (obj != null) && (obj.InCluster == 6));
+ var dev = device.InClusterList.Find(obj => (obj != null) && (obj.InCluster == 6));
if (dev != null)
{
currentKeyAllRoomDeviceList.Add(device);
@@ -483,21 +476,22 @@
}
break;
case "AddDimmer":
- foreach (var r in Shared.Common.Room.Lists)
+ foreach (var r in listAllRoom)
{
- if (r.DeviceUIList.Count == 0)
+ if (r.ListDevice.Count == 0)
{
continue;
}
if (r.IsLove == true)
{
continue;
- }
- foreach (var device in r.DeviceUIList)
+ }
+ foreach (var deviceKeys in r.ListDevice)
{
- if (device.CommonDevice != null)
+ var device = LocalDevice.Current.GetDevice(deviceKeys);
+ if (device != null)
{
- var dev = device.CommonDevice.InClusterList.Find(obj => (obj != null) && (obj.InCluster == 8));
+ var dev = device.InClusterList.Find(obj => (obj != null) && (obj.InCluster == 8));
if (dev != null)
{
currentKeyAllRoomDeviceList.Add(device);
@@ -507,9 +501,9 @@
}
break;
case "AddCurtain":
- foreach (var r in Shared.Common.Room.Lists)
+ foreach (var r in listAllRoom)
{
- if (r.DeviceUIList.Count == 0)
+ if (r.ListDevice.Count == 0)
{
continue;
}
@@ -517,11 +511,12 @@
{
continue;
}
- foreach (var device in r.DeviceUIList)
+ foreach (var deviceKeys in r.ListDevice)
{
- if (device.CommonDevice != null)
+ var device = LocalDevice.Current.GetDevice(deviceKeys);
+ if (device != null)
{
- var dev = device.CommonDevice.InClusterList.Find(obj => (obj != null) && (obj.InCluster == 258));
+ var dev = device.InClusterList.Find(obj => (obj != null) && (obj.InCluster == 258));
if (dev != null)
{
currentKeyAllRoomDeviceList.Add(device);
@@ -546,11 +541,12 @@
switch (curDeviceBindType)
{
case "AddSwitch":
- foreach (var device in curRoom.DeviceUIList)
- {
- if (device.CommonDevice != null)
+ foreach (var deviceKeys in curRoom.ListDevice)
+ {
+ var device = LocalDevice.Current.GetDevice(deviceKeys);
+ if (device != null)
{
- var dev = device.CommonDevice.InClusterList.Find(obj => (obj != null) && (obj.InCluster == 6));
+ var dev = device.InClusterList.Find(obj => (obj != null) && (obj.InCluster == 6));
if (dev != null)
{
curTypeDeviceList.Add(device);
@@ -558,12 +554,13 @@
}
}
break;
- case "AddDimmer":
- foreach (var device in curRoom.DeviceUIList)
- {
- if (device.CommonDevice != null)
+ case "AddDimmer":
+ foreach (var deviceKeys in curRoom.ListDevice)
+ {
+ var device = LocalDevice.Current.GetDevice(deviceKeys);
+ if (device != null)
{
- var dev = device.CommonDevice.InClusterList.Find(obj => (obj != null) && (obj.InCluster == 8));
+ var dev = device.InClusterList.Find(obj => (obj != null) && (obj.InCluster == 8));
if (dev != null)
{
curTypeDeviceList.Add(device);
@@ -571,12 +568,13 @@
}
}
break;
- case "AddCurtain":
- foreach (var device in curRoom.DeviceUIList)
- {
- if (device.CommonDevice != null)
+ case "AddCurtain":
+ foreach (var deviceKeys in curRoom.ListDevice)
+ {
+ var device = LocalDevice.Current.GetDevice(deviceKeys);
+ if (device != null)
{
- var dev = device.CommonDevice.InClusterList.Find(obj => (obj != null) && (obj.InCluster == 258));
+ var dev = device.InClusterList.Find(obj => (obj != null) && (obj.InCluster == 258));
if (dev != null)
{
curTypeDeviceList.Add(device);
@@ -589,7 +587,7 @@
foreach (var device in curTypeDeviceList)
{
curIndex++;
- if (device.CommonDevice != null && device.CommonDevice.IsOnline == 0)
+ if (device != null && device.IsOnline == 0)
{
continue;
}
@@ -598,7 +596,7 @@
{
Height = Application.GetRealHeight(23 + 127),
BackgroundColor = Shared.Common.ZigbeeColor.Current.XMWhite,
- Tag = device.CommonDevice?.DeviceEpointName,
+ Tag = device.DeviceEpointName,
};
midVerticalScrolViewLayout.AddChidren(rowLayout);
@@ -609,7 +607,7 @@
Width = Application.GetMinRealAverage(81),
Height = Application.GetMinRealAverage(81),
UnSelectedImagePath = device.IconPath,
- Tag = device.CommonDevice?.DeviceEpointName,
+ Tag = device.DeviceEpointName,
};
rowLayout.AddChidren(devicePic);
@@ -619,7 +617,8 @@
X = devicePic.Right + Application.GetRealWidth(20),
TextColor = Shared.Common.ZigbeeColor.Current.TextBlack,
TextAlignment = TextAlignment.CenterLeft,
- Tag = device.CommonDevice?.DeviceEpointName,
+ Tag = device.DeviceEpointName,
+ Text = Common.LocalDevice.Current.GetDeviceEpointName(device),
TextSize = 15,
};
rowLayout.AddChidren(btnBindName);
@@ -633,7 +632,7 @@
SelectedImagePath = "DoorLock/SelectedIcon.png",
TextColor = Shared.Common.ZigbeeColor.Current.XMWhite,
Visible = false,
- Tag = device.CommonDevice?.DeviceEpointName,
+ Tag = device.DeviceEpointName,
};
rowLayout.AddChidren(btnChoose);
@@ -659,7 +658,7 @@
if (!btnChoose.IsSelected)
{
- targetList.Remove(device.CommonDevice);
+ targetList.Remove(device);
btnChoose.IsSelected = false;
btnChoose.Visible = false;
}
@@ -671,7 +670,7 @@
}
else
{
- targetList.Add(device.CommonDevice);
+ targetList.Add(device);
btnChoose.IsSelected = true;
btnChoose.Visible = true;
}
@@ -692,17 +691,9 @@
btnBindName.MouseUpEventHandler += hander;
btnChoose.MouseUpEventHandler += hander;
- if (string.IsNullOrEmpty(device.CommonDevice?.DeviceEpointName))
- {
- btnBindName.Text = device.CommonDevice?.DeviceAddr + "_" + device.CommonDevice?.DeviceEpoint;
- }
- else
- {
- btnBindName.Text = device.CommonDevice?.DeviceEpointName;
- }
foreach (var bindedDev in targetList)
{
- var id = device.CommonDevice?.DeviceAddr + device.CommonDevice?.DeviceEpoint;
+ var id = device.DeviceAddr + device.DeviceEpoint;
if (id == bindedDev.DeviceAddr + bindedDev.DeviceEpoint)
{
btnChoose.IsSelected = true;
@@ -838,10 +829,11 @@
btnMethodText.IsSelected = true;
oldbuttonText.TextColor = Shared.Common.ZigbeeColor.Current.XMBlack;
oldbuttonText.IsBold = true;
- }
-
- //鑾峰彇妤煎眰瀵瑰簲鐨勬埧闂�
- foreach (var room in Shared.Common.Room.Lists)
+ }
+
+ //鑾峰彇妤煎眰瀵瑰簲鐨勬埧闂�
+ var listAllRoom = HdlRoomLogic.Current.GetAllListRooms();
+ foreach (var room in listAllRoom)
{
if (room.FloorId == currentKey.currentSelectFloorId)
{
@@ -867,18 +859,6 @@
rowFrameLayout.MouseUpEventHandler += hander;
btnMethodText.MouseUpEventHandler += hander;
}
- }
-
- public void DeviceInfoChange(CommonDevice common, string typeTag)
- {
- }
-
- public void ChangedILogicStatus(ZigBee.Device.Logic logic)
- {
- }
-
- public void ChangedISceneStatus(Scene scene)
- {
}
}
}
--
Gitblit v1.8.0