From 1c4904d77f484c075080942d87785481b52b6fb2 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期一, 28 十月 2019 14:58:46 +0800
Subject: [PATCH] Revert "Merge branch 'dev-tzy' into DEV_GXC"
---
ZigbeeApp/Shared/Phone/Device/Logic/LogicIfon.cs | 72 +++++++-----------------------------
1 files changed, 14 insertions(+), 58 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/LogicIfon.cs b/ZigbeeApp/Shared/Phone/Device/Logic/LogicIfon.cs
index 78c77e8..6d3e7a7 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/LogicIfon.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/LogicIfon.cs
@@ -1,19 +1,16 @@
锘縰sing System;
using System.Collections.Generic;
-using Shared;
-using ZigBee.Device;
-
namespace Shared.Phone.Device.Logic
{
public class LogicIfon
{
- #region ----閫昏緫鏉′欢杈撳叆----
+ #region ----閫昏緫鏉′欢杈撳叆----
/// <summary>
/// 娣诲姞璁惧鏉′欢鐨勬柟娉�
/// </summary>
/// <param name="common">Common.</param>
/// <param name="objecttype">Objecttype.</param>
- public static void AddDeviceconditions(CommonDevice common, Dictionary<string, string> objecttype)
+ public static void AddDeviceconditions(ZigBee.Device.CommonDevice common, Dictionary<string, string> objecttype)
{
for (int i = 0; i < Common.Logic.CurrentLogic.Conditions.Count; i++)
{
@@ -21,32 +18,9 @@
{
if ((Common.Logic.CurrentLogic.Conditions[i]["MacAddr"] == common.DeviceAddr) && (Common.Logic.CurrentLogic.Conditions[i]["Epoint"] == common.DeviceEpoint.ToString()))
{
- if (common.Type == DeviceType.TemperatureSensor)//璁惧娓╁害浼犳劅鍣ㄦ湁鐐圭壒鍒�
- {
- 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;
- }
-
- }
- else
- {
- Common.Logic.CurrentLogic.Conditions.RemoveAt(i);
- Common.Logic.CurrentLogic.Conditions.Insert(i, objecttype);
- return;
- }
+ Common.Logic.CurrentLogic.Conditions.RemoveAt(i);
+ Common.Logic.CurrentLogic.Conditions.Insert(i, objecttype);
+ return;
}
}
@@ -65,7 +39,7 @@
if (Common.Logic.CurrentLogic.Conditions[i]["Type"] == "2")
{
- if (Common.Logic.CurrentLogic.Conditions[i]["Condition_LogicId"] == logic.LogicId.ToString())
+ if (Common.Logic.CurrentLogic.Conditions[i]["Condition_LogicId"] ==logic.LogicId.ToString())
{
Common.Logic.CurrentLogic.Conditions.RemoveAt(i);
Common.Logic.CurrentLogic.Conditions.Insert(i, objecttype);
@@ -106,7 +80,7 @@
{
for (int i = 0; i < Common.Logic.CurrentLogic.Conditions.Count; i++)
{
- if (Common.Logic.CurrentLogic.Conditions[i]["Type"] == objecttype["Type"])
+ if (Common.Logic.CurrentLogic.Conditions[i]["Type"] == "7")
{
Common.Logic.CurrentLogic.Conditions.RemoveAt(i);
@@ -119,6 +93,7 @@
Common.Logic.CurrentLogic.Conditions.Add(objecttype);
}
#endregion
+
#region ----閫昏緫杈撳嚭鐩爣----
/// <summary>
@@ -132,7 +107,7 @@
{
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())
+ 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);
@@ -147,13 +122,13 @@
/// </summary>
/// <param name="Scene">Common.</param>
/// <param name="actionsInfo">Objecttype.</param>
- public static void AddSceneactions(Shared.Common.SceneUI Scene, Dictionary<string, object> actionsInfo)
+ public static void AddSceneactions(Shared.Common.SceneUI Scene,Dictionary<string, object> actionsInfo)
{
for (int i = 0; i < Common.Logic.CurrentLogic.Actions.Count; i++)
{
if (Common.Logic.CurrentLogic.Actions[i]["LinkType"].ToString() == "2")
{
- if (Common.Logic.CurrentLogic.Actions[i]["DeviceAddr"].ToString() == Scene.Id.ToString())
+ if (Common.Logic.CurrentLogic.Actions[i]["DeviceAddr"].ToString() ==Scene.Id.ToString())
{
Common.Logic.CurrentLogic.Actions.RemoveAt(i);
Common.Logic.CurrentLogic.Actions.Insert(i, actionsInfo);
@@ -187,14 +162,14 @@
/// </summary>
/// <param name="objecttype">Objecttype.</param>
/// <param name="o">O.</param>
- public static void AddLogicactions(Common.Logic logic, Dictionary<string, object> actionsInfo)
+ public static void AddLogicactions(Common.Logic logic,Dictionary<string, object> actionsInfo)
{
for (int i = 0; i < Common.Logic.CurrentLogic.Actions.Count; i++)
{
if (Common.Logic.CurrentLogic.Actions[i]["LinkType"].ToString() == "4")
{
- if (Common.Logic.CurrentLogic.Actions[i]["DeviceAddr"].ToString() == logic.LogicId.ToString())
+ if (Common.Logic.CurrentLogic.Actions[i]["DeviceAddr"].ToString() ==logic.LogicId.ToString())
{
Common.Logic.CurrentLogic.Actions.RemoveAt(i);
Common.Logic.CurrentLogic.Actions.Insert(i, actionsInfo);
@@ -206,26 +181,7 @@
}
#endregion
- #region ----鍏宠仈app璐﹀彿----
- /// <summary>
- /// 鍏宠仈app璐﹀彿
- /// </summary>
- /// <param name="accountsInfo"></param>
- public static void Addaccounts(Dictionary<string, string> accountsInfo)
- {
- for (int i = 0; i < Common.Logic.CurrentLogic.Accounts.Count; i++)
- {
- if (Common.Logic.CurrentLogic.Accounts[i]["Type"] == accountsInfo["Type"])
- {
- Common.Logic.CurrentLogic.Accounts.RemoveAt(i);
- Common.Logic.CurrentLogic.Accounts.Insert(i, accountsInfo);
- return;
- }
- }
- Common.Logic.CurrentLogic.Accounts.Add(accountsInfo);
- }
- #endregion
}
-
+
}
--
Gitblit v1.8.0