From 25429f085093d89d543a0b90e30d0d62d1b7dac9 Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期二, 30 八月 2022 09:37:38 +0800
Subject: [PATCH] 合并了IOS的代码
---
ZigbeeApp/Shared/Phone/Device/Logic/LogicIfon.cs | 106 ++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 89 insertions(+), 17 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/LogicIfon.cs b/ZigbeeApp/Shared/Phone/Device/Logic/LogicIfon.cs
index 78c77e8..4ae3a2a 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/LogicIfon.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/LogicIfon.cs
@@ -21,24 +21,73 @@
{
if ((Common.Logic.CurrentLogic.Conditions[i]["MacAddr"] == common.DeviceAddr) && (Common.Logic.CurrentLogic.Conditions[i]["Epoint"] == common.DeviceEpoint.ToString()))
{
- if (common.Type == DeviceType.TemperatureSensor)//璁惧娓╁害浼犳劅鍣ㄦ湁鐐圭壒鍒�
+ if (common.Type == DeviceType.TemperatureSensor)
{
- var dev = common as TemperatureSensor;
- string str = "";
- if (dev.SensorDiv == 1)
+
+ //鑾峰彇璁惧绫诲瀷
+ var deviceEnumInfo = Common.LocalDevice.Current.GetMyDeviceEnumInfo(new List<CommonDevice>() { common });
+
+ //绌烘皵璐ㄩ噺浼犳劅鍣�
+ if (deviceEnumInfo.ConcreteType == Common.DeviceConcreteType.AirQualitySensor)
{
- str = "1026";
+ var cluster_ID1 = Common.Logic.CurrentLogic.Conditions[i]["Cluster_ID"];
+ var attriButeId1 = Common.Logic.CurrentLogic.Conditions[i]["AttriButeId"];
+ var cluster_ID2 = objecttype["Cluster_ID"];
+ var attriButeId2 = objecttype["AttriButeId"];
+
+ bool cluster_ID = false;
+ if (cluster_ID1 == cluster_ID2 && attriButeId1 == attriButeId2)
+ {
+ cluster_ID = true;
+ }
+
+ if (cluster_ID)
+ {
+ //宸茬粡瀛樺湪绉婚櫎鍐嶉噸鏂版坊鍔�
+ Common.Logic.CurrentLogic.Conditions.RemoveAt(i);
+ Common.Logic.CurrentLogic.Conditions.Insert(i, objecttype);
+ return;
+ }
}
else
{
- str = "1029";
+ //璁惧娓╁害浼犳劅鍣�
+ var dev = common as TemperatureSensor;
+ string str = "";
+ if (dev.SensorDiv == 1)
+ {
+ str = "1026";
+ }
+ else
+ {
+ str = "1029";
+ }
+ if (Common.Logic.CurrentLogic.Conditions[i]["Cluster_ID"] == str)
+ {
+ Common.Logic.CurrentLogic.Conditions.RemoveAt(i);
+ Common.Logic.CurrentLogic.Conditions.Insert(i, objecttype);
+ return;
+ }
+
}
- if (Common.Logic.CurrentLogic.Conditions[i]["Cluster_ID"] == str)
- {
- Common.Logic.CurrentLogic.Conditions.RemoveAt(i);
- Common.Logic.CurrentLogic.Conditions.Insert(i, objecttype);
- return;
+ }
+ else if (common.Type == DeviceType.IASZone)
+ {
+ var iASZonedevice = common as IASZone;
+ if (iASZonedevice.ModelIdentifier == "MSPIRB-ZB.10")
+ {//鐞冨舰绉诲姩浼犳劅鍣�
+ if (Common.Logic.CurrentLogic.Conditions[i]["Cluster_ID"] == objecttype["Cluster_ID"])
+ {
+ Common.Logic.CurrentLogic.Conditions.RemoveAt(i);
+ Common.Logic.CurrentLogic.Conditions.Insert(i, objecttype);
+ return;
+ }
+ continue;
}
+
+ Common.Logic.CurrentLogic.Conditions.RemoveAt(i);
+ Common.Logic.CurrentLogic.Conditions.Insert(i, objecttype);
+ return;
}
else
@@ -56,7 +105,7 @@
/// <summary>
/// 娣诲姞Logic鏉′欢鐨勬柟娉�
/// </summary>
- /// <param name="common">Common.</param>
+ /// <param name="logic">Common.</param>
/// <param name="objecttype">Objecttype.</param>
public static void AddLogicconditions(Common.Logic logic, Dictionary<string, string> objecttype)
{
@@ -126,13 +175,34 @@
/// </summary>
/// <param name="common">Common.</param>
/// <param name="actionsInfo">Objecttype.</param>
- public static void AddDeviceactions(ZigBee.Device.CommonDevice common, Dictionary<string, object> actionsInfo)
+ public static void AddDeviceActions(ZigBee.Device.CommonDevice common, Dictionary<string, object> actionsInfo)
{
for (int i = 0; i < Common.Logic.CurrentLogic.Actions.Count; i++)
{
if (Common.Logic.CurrentLogic.Actions[i]["LinkType"].ToString() == "0")
{
if (Common.Logic.CurrentLogic.Actions[i]["DeviceAddr"].ToString() == common.DeviceAddr && Common.Logic.CurrentLogic.Actions[i]["Epoint"].ToString() == common.DeviceEpoint.ToString())
+ {
+ Common.Logic.CurrentLogic.Actions.RemoveAt(i);
+ Common.Logic.CurrentLogic.Actions.Insert(i, actionsInfo);
+ return;
+ }
+ }
+ }
+ Common.Logic.CurrentLogic.Actions.Add(actionsInfo);
+ }
+ /// <summary>
+ /// 娣诲姞闂ㄩ攣璁惧杈撳嚭鐨勬柟娉�
+ /// </summary>
+ /// <param name="common">Common.</param>
+ /// <param name="actionsInfo">Objecttype.</param>
+ public static void AddDoorLockActions(ZigBee.Device.CommonDevice common, Dictionary<string, object> actionsInfo)
+ {
+ for (int i = 0; i < Common.Logic.CurrentLogic.Actions.Count; i++)
+ {
+ if (Common.Logic.CurrentLogic.Actions[i]["LinkType"].ToString() == "8")
+ {
+ if (Common.Logic.CurrentLogic.Actions[i]["DeviceAddr"].ToString() == common.DeviceAddr && Common.Logic.CurrentLogic.Actions[i]["Epoint"].ToString() =="200")
{
Common.Logic.CurrentLogic.Actions.RemoveAt(i);
Common.Logic.CurrentLogic.Actions.Insert(i, actionsInfo);
@@ -166,8 +236,7 @@
/// <summary>
/// 娣诲姞瀹夐槻杈撳嚭鐨勬柟娉�
/// </summary>
- /// <param name="objecttype">Objecttype.</param>
- /// <param name="o">O.</param>
+ /// <param name="actionsInfo">actionsInfo.</param>
public static void AddSecurityactions(Dictionary<string, object> actionsInfo)
{
for (int i = 0; i < Common.Logic.CurrentLogic.Actions.Count; i++)
@@ -185,8 +254,8 @@
/// <summary>
/// 娣诲姞鑷姩鍖栬緭鍑虹殑鏂规硶
/// </summary>
- /// <param name="objecttype">Objecttype.</param>
- /// <param name="o">O.</param>
+ /// <param name="actionsInfo">Objecttype.</param>
+ /// <param name="logic">logic</param>
public static void AddLogicactions(Common.Logic logic, Dictionary<string, object> actionsInfo)
{
@@ -225,6 +294,9 @@
Common.Logic.CurrentLogic.Accounts.Add(accountsInfo);
}
#endregion
+
+
+
}
--
Gitblit v1.8.0