From 26d1cdf2f5246c1ad7890e6740444c4a6a80e6fb Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期二, 11 八月 2020 13:21:10 +0800
Subject: [PATCH] 合并了新代码
---
ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/MutilfunctionPanelMethod.cs | 103 +++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 91 insertions(+), 12 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/MutilfunctionPanelMethod.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/MutilfunctionPanelMethod.cs
index 1fced47..30314e1 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/MutilfunctionPanelMethod.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/MutilfunctionPanelMethod.cs
@@ -48,11 +48,34 @@
var tempList = new List<BindListAllInfo>();
int count1 = 0;
int count2 = 0;
+
+ switch (curBindType)
+ {
+ case 1:
+ curSwitchCount = 0;
+ break;
+ case 2:
+ curSocketCount = 0;
+ break;
+ case 3:
+ curLightFromRelayCount = 0;
+ curLightCount = 0;
+ break;
+ }
+
foreach (var key in bindTargetsFromMutilfunctionPanelList.Keys)
{
var bList = bindTargetsFromMutilfunctionPanelList[key];
foreach (var bDev in bList)
{
+ if (curBindType == 0)
+ {
+ if (bDev.KeyEpoint >= 32 && bDev.KeyEpoint <= 51)
+ {
+ tempList.Add(bDev);
+ }
+ }
+
var device = LocalDevice.Current.GetDevice(bDev.BindMacAddr, bDev.BindEpoint);
if (device == null)
{
@@ -60,12 +83,6 @@
}
switch (curBindType)
{
- case 0:
- if (bDev.KeyEpoint >= 32 && bDev.KeyEpoint <= 51)
- {
- tempList.Add(bDev);
- }
- break;
case 1:
if (bDev.KeyEpoint >= 52 && bDev.KeyEpoint <= 61)
{
@@ -156,6 +173,66 @@
}
/// <summary>
+ /// 璋冨厜鐏拰缁х數鍣ㄧ壒娈婂鐞嗘柟娉�
+ /// <param name="curBindType">褰撳墠绫诲瀷 0:鍦烘櫙 1:寮�鍏� 2:鎻掑骇 3:鐏厜 4:閬槼 5:绌鸿皟 6:鏂伴</param>
+ /// </summary>
+ /// <returns></returns>
+ public static void UpdateLightCount(int curBindType)
+ {
+
+ if (curBindType == 1 || curBindType == 2 || curBindType == 3)
+ {
+ curSwitchCount = 0;
+ curSocketCount = 0;
+ curLightFromRelayCount = 0;
+ curLightCount = 0;
+
+ foreach (var key in bindTargetsFromMutilfunctionPanelList.Keys)
+ {
+ var bList = bindTargetsFromMutilfunctionPanelList[key];
+ foreach (var bDev in bList)
+ {
+ var device = LocalDevice.Current.GetDevice(bDev.BindMacAddr, bDev.BindEpoint);
+ if (device == null)
+ {
+ continue;
+ }
+ if (bDev.KeyEpoint >= 52 && bDev.KeyEpoint <= 61)
+ {
+ if (device != null)
+ {
+ if (device.DfunctionType == DeviceFunctionType.A寮�鍏�)
+ {
+ curSwitchCount++;
+ }
+ else if (device.DfunctionType == DeviceFunctionType.A鎻掑骇)
+ {
+ curSocketCount++;
+ }
+ else if (device.DfunctionType == DeviceFunctionType.A鐏厜)
+ {
+ curLightFromRelayCount++;
+ }
+ }
+ }
+
+ if (bDev.KeyEpoint >= 22 && bDev.KeyEpoint <= 28)
+ {
+ if (device != null)
+ {
+ if (device.Type == DeviceType.DimmableLight && bDev.BindCluster == 8)
+ {
+ curLightCount++;
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+
+
+ /// <summary>
/// 鏀寔鍖归厤鐨勭鐐逛釜鏁�
/// <param name="curBindType">褰撳墠绫诲瀷 0:鍦烘櫙 1:寮�鍏� 2:鎻掑骇 3:鐏厜 4:閬槼 5:绌鸿皟 6:鏂伴</param>
/// </summary>
@@ -225,6 +302,14 @@
var bList = bindTargetsFromMutilfunctionPanelList[key];
foreach (var bDev in bList)
{
+ if (curBindType == 0)
+ {
+ if (bDev.KeyEpoint >= 32 && bDev.KeyEpoint <= 51)
+ {
+ tempList.Remove(bDev.KeyEpoint);
+ }
+ }
+
var device = LocalDevice.Current.GetDevice(bDev.BindMacAddr, bDev.BindEpoint);
if (device == null)
{
@@ -232,12 +317,6 @@
}
switch (curBindType)
{
- case 0:
- if (bDev.KeyEpoint >= 32 && bDev.KeyEpoint <= 51)
- {
- tempList.Remove(bDev.KeyEpoint);
- }
- break;
case 1:
case 2:
if (bDev.KeyEpoint >= 52 && bDev.KeyEpoint <= 61)
--
Gitblit v1.8.0