2023年06月05日17:44:04

wjc

2023-06-05 8369943018da4ffe3fed1ecf5992edaee597d49c

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

@@ -356,7 +356,7 @@
            {
                return "MusicIcon/localMusic.png";
            }
            else if (SPK.SensorPm10 == device.spk)
            else if (SPK.SensorPm10 == device.spk || SPK.sensorPirhold == device.spk)
            {
                return "LogicIcon/sensor.png";
            }
@@ -467,6 +467,8 @@
                case SPK.SensorTVOC:
                case SPK.SensorHcho:
                case SPK.SensorHelp:
                case SPK.sensorPirhold:
                    
                    {
                        strPath = "LogicIcon/sensor.png";
                    }
@@ -562,6 +564,7 @@
                          || device.spk == SPK.SensorHcho
                          || device.spk == SPK.SensorHelp
                          || device.spk == SPK.SensorPm10
                          || device.spk == SPK.sensorPirhold
            );
            if (sensor != null)
            {
@@ -686,6 +689,7 @@
                functionTypeList.Add(SPK.SensorHcho);
                functionTypeList.Add(SPK.SensorHelp);
                functionTypeList.Add(SPK.SensorPm10);
                functionTypeList.Add(SPK.sensorPirhold);


            }
@@ -781,6 +785,7 @@
                functionTypeList.Add(SPK.SensorPm10);
                functionTypeList.Add(SPK.VideoDoorLock);
                functionTypeList.Add(SPK.AcIr);
                functionTypeList.Add(SPK.sensorPirhold);

            }

@@ -842,6 +847,7 @@
                        deviceTypeList.Add(SPK.SensorPm10);
                        deviceTypeList.Add(SPK.VideoDoorLock);
                        deviceTypeList.Add(SPK.AcIr);
                        deviceTypeList.Add(SPK.sensorPirhold);

                    }
                    break;
@@ -1186,7 +1192,7 @@
                 //  new Entity.Function { sid = "1234567892", name = "湿度传感器", spk = Entity.SPK.SensorHumidity },
                    //new Entity.Function { sid = "12345678933456", name = "门锁", spk = Entity.SPK.DoorLock },
                    //  new Entity.Function { sid = "1234567895444", name = "视频门锁", spk = Entity.SPK.VideoDoorLock },
                      new Entity.Function { sid = "12345678968888", name = "pm10", spk = Entity.SPK.LightDimming },
                      new Entity.Function { sid = "12345678968888", name = "人体存在传感器", spk = Entity.SPK.sensorPirhold },
                      //  new Entity.Function { sid = "1234567897", name = "毫米波传感器1", spk = Entity.SPK.SenesorMegahealth2 },
                      // new Entity.Function { sid = "1234567899", name = "门磁传感器", spk = Entity.SPK.SensorDoorWindow },
                      //  new Entity.Function { sid = "12345678991234", name = "HDL机械手", spk = Entity.SPK.MechanicalArm },