11

wei

2021-02-23 d89a8ccb3d48d39f920b294c1966a3522ee8adbc

 HDL_ON/Entity/FunctionList.cs

@@ -241,7 +241,8 @@
                            break;
                        case SPK.SensorSmoke:
                        case SPK.SensorWater:
                        case SPK.SensorGas:
                        case SPK.SensorDoorWindow:
                        case SPK.SensorPir:
                            var ser = Newtonsoft.Json.JsonConvert.DeserializeObject<Sensor>(functionDataString);
                            List.sensorsArm.Add(ser);
                            deviceFunctionList.Add(ser);
@@ -261,7 +262,7 @@
        /// <summary>
        /// 获取设备功能列表
        /// </summary>
        public List<Function> GetDeviceFunctionList()
        public List<Function> GetDeviceFunctionList(SPK.BrandType brandType = SPK.BrandType.All)
        {
            if (deviceFunctionList == null || deviceFunctionList.Count == 0)
            {
@@ -274,17 +275,50 @@
                deviceFunctionList.AddRange(sensorsEnvironmentalScience);
                deviceFunctionList.AddRange(sensorsArm);
                deviceFunctionList.AddRange(UI.Music.A31MusicModel.A31MusicModelList);
                try
                {
                    deviceFunctionList = deviceFunctionList.OrderByDescending(o => o.controlCounter).ToList();
                }
                catch (Exception ex)
                {
                    MainPage.Log($"设备功能排序异常：{ex.Message}");
                }
            }
            try

            List<Function> resultFunctions = new List<Function>();
            if (brandType == SPK.BrandType.All)
            {
                deviceFunctionList = deviceFunctionList.OrderByDescending(o => o.controlCounter).ToList();
            }
            catch (Exception ex)
            {
                MainPage.Log($"设备功能排序异常：{ex.Message}");
            else
            { 
                switch (brandType)
                {
                    case SPK.BrandType.Hdl:
                        foreach (var function in deviceFunctionList)
                        {
                            if (!SPK.Get3tySpk(SPK.BrandType.All3tyBrand).Contains(function.spk))
                            {
                                resultFunctions.Add(function);
                            }
                        }
                        break;

                    case SPK.BrandType.Tuya:
                        foreach (var function in deviceFunctionList)
                        {
                            if (SPK.Get3tySpk(SPK.BrandType.Tuya).Contains(function.spk))
                            {
                                resultFunctions.Add(function);
                            }
                        }
                        break;
                }
                return resultFunctions;
            }

            return deviceFunctionList;
        }

        /// <summary>
        /// 清空设备功能列表
        /// </summary>
@@ -532,6 +566,33 @@
        }

        bool lockReadFunctionStatus = false;

        /// <summary>
        /// 读取第三方设备状态
        /// </summary>
        public void Read3tyFunctionStatus()
        {
            //读取涂鸦设备状态
            if (GetDeviceFunctionList(SPK.BrandType.Tuya).Count > 0)
            {
                var page = new List<string>();
                int count = 0;
                foreach (var function in GetDeviceFunctionList(SPK.BrandType.Tuya))
                {
                    page.Add(function.deviceId);
                    count++;
                    if (count > 9)
                    {
                        DriverLayer.Control.Ins.ReadFunctionsInfo(page);
                        page.Clear();
                        count = 0;
                    }
                }
                DriverLayer.Control.Ins.ReadFunctionsInfo(page);
            }

        }

        /// <summary>
        /// 读取全部功能的状态
        /// </summary>
@@ -553,27 +614,11 @@
                lockReadFunctionStatus = true;
                try
                {
                    if (DriverLayer.Control.Ins.IsRemote)
                    {
                        var page = new List<string>();
                        int count = 0;
                    Read3tyFunctionStatus();

                        foreach (var function in GetDeviceFunctionList())
                        {
                            page.Add(function.deviceId);
                            count++;
                            if (count > 9)
                            {
                                DriverLayer.Control.Ins.SendApiReadCommand(page);
                                page.Clear();
                                count = 0;
                            }
                        }
                        DriverLayer.Control.Ins.SendApiReadCommand(page);
                    }
                    else
                    if(DriverLayer.Control.Ins.GatewayOnline_Local)
                    {
                        foreach (var function in GetDeviceFunctionList())
                        foreach (var function in GetDeviceFunctionList(SPK.BrandType.Hdl))
                        {
                            switch (function.Spk_Prefix)
                            {
@@ -587,6 +632,24 @@
                            }
                        }
                    }
                    else
                    {
                        var page = new List<string>();
                        int count = 0;

                        foreach (var function in GetDeviceFunctionList(SPK.BrandType.Hdl))
                        {
                            page.Add(function.deviceId);
                            count++;
                            if (count > 9)
                            {
                                DriverLayer.Control.Ins.SendApiReadCommand(page);
                                page.Clear();
                                count = 0;
                            }
                        }
                        DriverLayer.Control.Ins.SendApiReadCommand(page);
                    }
                }
                catch (Exception ex)
                {
@@ -597,6 +660,8 @@
                    lockReadFunctionStatus = false;
                    MainPage.Log($"结束--读取");
                }

                
            })
            { IsBackground = true }.Start();
        }