From 48ba446936b51fffafa7c3600c0dadc6ac0e8c20 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期五, 10 七月 2020 10:52:13 +0800
Subject: [PATCH] 2020-07-10-01
---
ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindInfo.cs | 86 +++++++++++++------------------------------
1 files changed, 26 insertions(+), 60 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindInfo.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindInfo.cs
index c2a79dc..9524092 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindInfo.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindInfo.cs
@@ -2,7 +2,6 @@
using System.Collections.Generic;
using System.Threading.Tasks;
using Shared.Common;
-using Shared.Phone.Device.Category;
using Shared.Phone.UserCenter.Device;
using ZigBee.Device;
using static ZigBee.Device.Panel;
@@ -19,52 +18,6 @@
/// 璁板綍鏃х殑鐩爣鍒楄〃
/// </summary>
public static List<CommonDevice> oldTargetList = new List<CommonDevice>();
-
- public static async System.Threading.Tasks.Task<int> RemoveTargets(BindObj.BindListResponseObj bindDevice, Panel currentKey)
- {
- var delDevice = new BindObj.DelDeviceBindData();
- delDevice.DeviceAddr = currentKey.DeviceAddr;
- delDevice.Epoint = currentKey.DeviceEpoint;
-
- if (bindDevice.BindType == 0 || bindDevice.BindType == 1)
- {
- var removeDevice = new BindObj.RemoveBindListObj();
- removeDevice.BindCluster = bindDevice.BindCluster;
- removeDevice.BindType = 0;
- removeDevice.BindMacAddr = bindDevice.BindMacAddr;
- removeDevice.BindEpoint = bindDevice.BindEpoint;
- delDevice.RemoveBindList.Add(removeDevice);
- }
- else if (bindDevice.BindType == 2)
- {
- var removeDevice = new BindObj.RemoveBindListObj();
- removeDevice.BindCluster = bindDevice.BindCluster;
- removeDevice.BindType = 1;
- removeDevice.BindScenesId = bindDevice.BindScenesId;
- delDevice.RemoveBindList.Add(removeDevice);
- }
- var delResult = await currentKey.DelDeviceBindAsync(delDevice);
- foreach (var re in delResult.delDeviceBindResponseData.RemoveBindList)
- {
- switch (re.Result)
- {
- case 0:
- return 0;
- break;
- case 4:
-
- if (delResult.removeBindResultResponseData != null)
- {
- if (delResult.removeBindResultResponseData.Result == 0)
- {
- return 0;
- }
- }
- break;
- }
- }
- return -1;
- }
/// <summary>
/// 妫�娴嬭璁惧鑳藉惁鏄剧ず
@@ -92,7 +45,7 @@
/// <returns></returns>
public static bool CheckCanShowRoom(Common.Room room, string curDeviceBindType = "AddSwitch")
{
- if (room.DeviceUIList.Count == 0)
+ if (room.ListDevice.Count == 0)
{
return false;
}
@@ -100,10 +53,11 @@
{
return false;
}
- foreach (var deviceUi in room.DeviceUIList)
+ foreach (var deviceKeys in room.ListDevice)
{
+ var device = Common.LocalDevice.Current.GetDevice(deviceKeys);
//妫�娴嬭璁惧鑳藉惁鏄剧ず
- if (CheckCanShowDevice(deviceUi.CommonDevice, curDeviceBindType) == false)
+ if (CheckCanShowDevice(device, curDeviceBindType) == false)
{
continue;
}
@@ -173,12 +127,11 @@
/// <returns></returns>
public static string GetCurrentKeyAllRoomList()
{
- var dicFloor = Common.Room.CurrentRoom.GetFloorSortList();
+ var dicFloor = HdlRoomLogic.Current.GetFloorSortList();
foreach (var floorId in dicFloor.Keys)
{
//绗竴涓ゼ灞�
return dicFloor[floorId];
- break;
}
return null;
}
@@ -189,12 +142,11 @@
/// <returns></returns>
public static string GetCurrentSelectFloorId()
{
- var dicFloor = Common.Room.CurrentRoom.GetFloorSortList();
+ var dicFloor = HdlRoomLogic.Current.GetFloorSortList();//
foreach (var floorId in dicFloor.Keys)
{
//绗竴涓ゼ灞�
return floorId;
- break;
}
return null;
}
@@ -205,12 +157,30 @@
/// <returns></returns>
public static string GetCurrentSelectFloorIdName()
{
- var dicFloor = Common.Room.CurrentRoom.GetFloorSortList();
+ var dicFloor = HdlRoomLogic.Current.GetFloorSortList();
foreach (var floorId in dicFloor.Keys)
{
//绗竴涓ゼ灞�
return dicFloor[floorId];
- break;
+ }
+ return null;
+ }
+
+ /// <summary>
+ /// 鑾峰彇褰撳墠妤煎眰鍚嶇О
+ /// fllodID:妤煎眰ID
+ /// </summary>
+ /// <returns></returns>
+ public static string GetBindTargetsFloorIdName(string curFllodID)
+ {
+ var dicFloor = HdlRoomLogic.Current.GetFloorSortList();
+ foreach (var floorId in dicFloor.Keys)
+ {
+ //褰撳墠妤煎眰
+ if (curFllodID == floorId)
+ {
+ return dicFloor[floorId];
+ }
}
return null;
}
@@ -422,11 +392,7 @@
}
}
}
-
return dicCheck;
}
-
-
-
}
}
--
Gitblit v1.8.0