From 2bf5ec775cb57d8015bee58c745a1e48081ff1b1 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期二, 15 十月 2019 11:06:05 +0800
Subject: [PATCH] 首次合并了全部的代码
---
ZigbeeApp/Shared/Phone/Device/Logic/LogicIfon.cs | 38 +++++++++++++++++++++++++++++---------
1 files changed, 29 insertions(+), 9 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/LogicIfon.cs b/ZigbeeApp/Shared/Phone/Device/Logic/LogicIfon.cs
index 6d3e7a7..99a78c5 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/LogicIfon.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/LogicIfon.cs
@@ -1,10 +1,11 @@
锘縰sing System;
using System.Collections.Generic;
+using Shared;
namespace Shared.Phone.Device.Logic
{
public class LogicIfon
{
- #region ----閫昏緫鏉′欢杈撳叆----
+ #region ----閫昏緫鏉′欢杈撳叆----
/// <summary>
/// 娣诲姞璁惧鏉′欢鐨勬柟娉�
/// </summary>
@@ -39,7 +40,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);
@@ -80,7 +81,7 @@
{
for (int i = 0; i < Common.Logic.CurrentLogic.Conditions.Count; i++)
{
- if (Common.Logic.CurrentLogic.Conditions[i]["Type"] == "7")
+ if (Common.Logic.CurrentLogic.Conditions[i]["Type"] == objecttype["Type"])
{
Common.Logic.CurrentLogic.Conditions.RemoveAt(i);
@@ -107,7 +108,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);
@@ -122,13 +123,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);
@@ -162,14 +163,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);
@@ -181,7 +182,26 @@
}
#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