版本备份

wxr

2021-12-15 e71c57108e6dd407c2c6f0361f68150f2ff9aed5

 HDL_ON/Entity/FunctionList.cs

@@ -5,6 +5,7 @@
using HDL_ON.Common;
using HDL_ON.DAL;
using HDL_ON.DAL.Server;
using HDL_ON.DriverLayer;
using Shared;

namespace HDL_ON.Entity
@@ -127,7 +128,7 @@
        /// </summary>
        public List<Function> GetEnvirSensorsList()
        {
            var spkList = SPK.EnvironSpkList();
            var spkList = SPK.EnvironDeviceSpkList();
            return Functions.FindAll((obj) => spkList.Contains(obj.spk));
        }
        /// <summary>
@@ -172,13 +173,7 @@
        /// <summary>
        /// 安防列表
        /// </summary>
        public List<SecurityAlarm> securities
        {
            get
            {
                return SecurityCenter.Security.securityAlarmList;
            }
        }
        public List<SecurityAlarm> securities = new List<SecurityAlarm>();


        /// <summary>
@@ -191,72 +186,79 @@
        /// <para>false:直接无条件添加</para></param>
        public void IniFunctionList(string filePath, bool checkRepeat = false)
        {
            // todo 增加设备，增加功能进功能列表
            if (filePath.StartsWith("FunctionData_"))
            try
            {
                var functionDataBytes = FileUtlis.Files.ReadFile(filePath);
                var functionDataString = System.Text.Encoding.UTF8.GetString(functionDataBytes);
                var tempFunction = Newtonsoft.Json.JsonConvert.DeserializeObject<Function>(functionDataString);
                if (tempFunction == null)
                // todo 增加设备，增加功能进功能列表
                if (filePath.StartsWith("FunctionData_"))
                {
                    MainPage.Log("null");
                    FileUtlis.Files.DeleteFile(filePath);
                    return;
                }
                //音乐部分要修改
                //if(tempFunction.spk.ToString() == SPK.MusicStandard)
                //{
                //    UI.Music.A31MusicModel.A31MusicModelList.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<UI.Music.A31MusicModel>(functionDataString));
                //}
                if (checkRepeat == true)
                {
                    //检测重复
                    for (int i = 0; i < Functions.Count; i++)
                    var functionDataBytes = FileUtlis.Files.ReadFile(filePath);
                    var functionDataString = System.Text.Encoding.UTF8.GetString(functionDataBytes);
                    var tempFunction = Newtonsoft.Json.JsonConvert.DeserializeObject<Function>(functionDataString);
                    if (tempFunction == null)
                    {
                        if (Functions[i].deviceId == tempFunction.deviceId)
                        MainPage.Log("null");
                        FileUtlis.Files.DeleteFile(filePath);
                        return;
                    }
                    //音乐部分要修改
                    //if(tempFunction.spk.ToString() == SPK.MusicStandard)
                    //{
                    //    UI.Music.A31MusicModel.A31MusicModelList.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<UI.Music.A31MusicModel>(functionDataString));
                    //}
                    if (checkRepeat == true)
                    {
                        //检测重复
                        for (int i = 0; i < Functions.Count; i++)
                        {
                            //先移除掉再加
                            Functions.RemoveAt(i);
                            Functions.Add(tempFunction);
                            return;
                            if (Functions[i].deviceId == tempFunction.deviceId)
                            {
                                //先移除掉再加
                                Functions.RemoveAt(i);
                                Functions.Add(tempFunction);
                                return;
                            }
                        }
                    }
                    Functions.Add(tempFunction);
                }
                Functions.Add(tempFunction);
            }
            if (filePath.StartsWith("SceneData_"))
            {
                var sceneDataBytes = FileUtlis.Files.ReadFile(filePath);
                var sceneDataString = System.Text.Encoding.UTF8.GetString(sceneDataBytes);
                var tempScene = Newtonsoft.Json.JsonConvert.DeserializeObject<Scene>(sceneDataString);
                List.scenes.Add(tempScene);
            }
            else if (filePath.StartsWith("SecurityData_"))
            {
                var dataBytes = FileUtlis.Files.ReadFile(filePath);
                var dataString = System.Text.Encoding.UTF8.GetString(dataBytes);
                var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<SecurityAlarm>(dataString);
                if (temp == null)
                if (filePath.StartsWith("SceneData_"))
                {
                    MainPage.Log("null");
                    FileUtlis.Files.DeleteFile(filePath);
                    return;
                    var sceneDataBytes = FileUtlis.Files.ReadFile(filePath);
                    var sceneDataString = System.Text.Encoding.UTF8.GetString(sceneDataBytes);
                    var tempScene = Newtonsoft.Json.JsonConvert.DeserializeObject<Scene>(sceneDataString);
                    List.scenes.Add(tempScene);
                }
                if (checkRepeat == true)
                else if (filePath.StartsWith("SecurityData_"))
                {
                    //检测重复
                    for (int i = 0; i < securities.Count; i++)
                    var dataBytes = FileUtlis.Files.ReadFile(filePath);
                    var dataString = System.Text.Encoding.UTF8.GetString(dataBytes);
                    var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<SecurityAlarm>(dataString);
                    if (temp == null)
                    {
                        if (securities[i].sid == temp.sid)
                        MainPage.Log("null");
                        FileUtlis.Files.DeleteFile(filePath);
                        return;
                    }
                    if (checkRepeat == true)
                    {
                        //检测重复
                        for (int i = 0; i < securities.Count; i++)
                        {
                            //先移除掉再加
                            securities.RemoveAt(i);
                            securities.Add(temp);
                            return;
                            if (securities[i].sid == temp.sid)
                            {
                                //先移除掉再加
                                securities.RemoveAt(i);
                                securities.Add(temp);
                                return;
                            }
                        }
                    }
                    securities.Add(temp);
                }
                securities.Add(temp);
            }
            catch (Exception ex)
            {
                MainPage.Log($"IniFunctionList error : {ex.Message}");
            }
        }

@@ -284,11 +286,14 @@
                        break;

                    case SPK.BrandType.Tuya:
                        foreach (var function in Functions)
                        lock (Functions)
                        {
                            if (SPK.Get3tySpk(SPK.BrandType.Tuya).Contains(function.spk))
                            foreach (var function in Functions)
                            {
                                resultFunctions.Add(function);
                                if (SPK.Get3tySpk(SPK.BrandType.Tuya).Contains(function.spk))
                                {
                                    resultFunctions.Add(function);
                                }
                            }
                        }
                        break;
@@ -420,24 +425,19 @@
                    {
                        foreach (var function in GetDeviceFunctionList(SPK.BrandType.Hdl))
                        {
                            switch (function.Spk_Prefix)
                            {
                                case FunctionCategory.Music:
                                case FunctionCategory.DryContact:
                                    continue;
                            }
                            DriverLayer.Control.Ins.SendReadCommand(function);
                            //switch (function.Spk_Prefix)
                            //{
                            //    case FunctionCategory.Light:
                            //    case FunctionCategory.Electric:
                            //    case FunctionCategory.Curtain:
                            //    case FunctionCategory.AC:
                            //    case FunctionCategory.FloorHeat:
                            //    case FunctionCategory.Sensor:
                            //        DriverLayer.Control.Ins.SendReadCommand(function);
                            //        break;
                            //}
                            MainPage.Log($"读取功能状态：{function.name} : {function.sid} ");
                            Control.Ins.SendReadCommand(function);
                        }
                        if(DB_ResidenceData.Instance.GatewayType == 1)
                        {
                            Dictionary<string, string> pairs = new Dictionary<string, string>();
                            string sendId = Control.Ins.msg_id.ToString();
                            pairs.Add("id", sendId);
                            pairs.Add("time_stamp", Utlis.GetTimestamp());
                            var readSecurityStatusJson = Newtonsoft.Json.JsonConvert.SerializeObject(pairs);
                            var sendBytes = Control.Ins.ConvertSendBodyData(CommunicationTopic.ct.ReadSecurityStatus, readSecurityStatusJson);
                            MainPage.Log($"本地通讯 读取安防状态:{readSecurityStatusJson}");
                            new Control_Udp().SendLocalHdlLinkData(sendBytes, sendId);
                        }
                    }
                    else