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);
@@ -615,7 +616,23 @@
                {
                    Read3tyFunctionStatus();

                    if (DriverLayer.Control.Ins.IsRemote)
                    if(DriverLayer.Control.Ins.GatewayOnline_Local)
                    {
                        foreach (var function in GetDeviceFunctionList(SPK.BrandType.Hdl))
                        {
                            switch (function.Spk_Prefix)
                            {
                                case FunctionCategory.Light:
                                case FunctionCategory.Electric:
                                case FunctionCategory.Curtain:
                                case FunctionCategory.AC:
                                case FunctionCategory.FloorHeat:
                                    DriverLayer.Control.Ins.SendReadCommand(function);
                                    break;
                            }
                        }
                    }
                    else
                    {
                        var page = new List<string>();
                        int count = 0;
@@ -632,22 +649,6 @@
                            }
                        }
                        DriverLayer.Control.Ins.SendApiReadCommand(page);
                    }
                    else
                    {
                        foreach (var function in GetDeviceFunctionList(SPK.BrandType.Hdl))
                        {
                            switch (function.Spk_Prefix)
                            {
                                case FunctionCategory.Light:
                                case FunctionCategory.Electric:
                                case FunctionCategory.Curtain:
                                case FunctionCategory.AC:
                                case FunctionCategory.FloorHeat:
                                    DriverLayer.Control.Ins.SendReadCommand(function);
                                    break;
                            }
                        }
                    }
                }
                catch (Exception ex)