Merge branch 'dev-tzy' into DEV_GXC

gxc

2019-10-29 081ea8d273048fd03756718ac6fb48a3c09218e9

 ZigbeeApp/Shared/Phone/Device/Logic/LogicIfon.cs

@@ -1,5 +1,8 @@
using System;
using System.Collections.Generic;
using Shared;
using ZigBee.Device;

namespace Shared.Phone.Device.Logic
{
    public class LogicIfon
@@ -10,7 +13,7 @@
        /// </summary>
        /// <param name="common">Common.</param>
        /// <param name="objecttype">Objecttype.</param>
        public static void AddDeviceconditions(ZigBee.Device.CommonDevice common, Dictionary<string, string> objecttype)
        public static void AddDeviceconditions(CommonDevice common, Dictionary<string, string> objecttype)
        {
            for (int i = 0; i < Common.Logic.CurrentLogic.Conditions.Count; i++)
            {
@@ -18,9 +21,32 @@
                {
                    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;
                        }
                    }

                }
@@ -80,7 +106,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);
@@ -93,7 +119,6 @@
            Common.Logic.CurrentLogic.Conditions.Add(objecttype);
        }
        #endregion

        #region ----逻辑输出目标----

        /// <summary>
@@ -181,6 +206,25 @@

        }
        #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
    }