2023年08月31日19:00:14

mac

2023-08-31 38ee59a8404c1fa9385649f9690c8d671a5d95de

 HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs

@@ -359,7 +359,9 @@
            {
                return "MusicIcon/localMusic.png";
            }
            else if (SPK.SensorPm10 == device.spk || SPK.SensorPirHold == device.spk)
            else if (SPK.SensorPm10 == device.spk
                || SPK.SensorPirHold == device.spk
                || SPK.SensorLight == device.spk)
            {
                return "LogicIcon/sensor.png";
            }
@@ -368,6 +370,7 @@
            {
                return "FunctionIcon/DoorLock/DoorLock.png";
            }

            //LogicIcon/heatlogic.png"
            return $"FunctionIcon/Icon/{device.IconName}.png";

@@ -576,6 +579,7 @@
                          || device.spk == SPK.SensorHelp
                          || device.spk == SPK.SensorPm10
                          || device.spk == SPK.SensorPirHold
                          || device.spk == SPK.SensorLight
            );
            if (sensor != null)
            {
@@ -707,6 +711,7 @@
                functionTypeList.Add(SPK.SensorHelp);
                functionTypeList.Add(SPK.SensorPm10);
                functionTypeList.Add(SPK.SensorPirHold);
                functionTypeList.Add(SPK.SensorLight);


            }
@@ -810,6 +815,7 @@
                functionTypeList.Add(SPK.AcIr);
                functionTypeList.Add(SPK.SensorPirHold);
                functionTypeList.Add(SPK.ElectricalTvHisense);
                functionTypeList.Add(SPK.SensorLight);

            }

@@ -874,6 +880,7 @@
                        deviceTypeList.Add(SPK.VideoDoorLock);
                        deviceTypeList.Add(SPK.AcIr);
                        deviceTypeList.Add(SPK.SensorPirHold);
                        deviceTypeList.Add(SPK.SensorLight);

                    }
                    break;
@@ -1215,7 +1222,7 @@
            {
                //模拟设备
                var functions = new List<Function> {
                 //new Entity.Function { sid = "1234567890", name = "超声波传感器", spk = Entity.SPK.SensorUtrasonic },
                 new Entity.Function { sid = "1234567890", name = "照明传感器", spk = Entity.SPK.SensorLight },
                 // new Entity.Function { sid = "1234567891", name = "温度传感器", spk = Entity.SPK.SensorTemperature },
                 //  new Entity.Function { sid = "1234567892", name = "湿度传感器", spk = Entity.SPK.SensorHumidity },
                    //new Entity.Function { sid = "12345678933456", name = "门锁", spk = Entity.SPK.DoorLock },