2023年09月01日18:06:42

mac

2023-09-01 0a11352dffeb8d5f31dd40b9728fe1abf4537f04

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

@@ -131,7 +131,7 @@
        /// <param name="dic">Dictionary类</param>
        /// <param name="key">健</param>
        /// <param name="value">值</param>
        public void dictionary(Dictionary<string, string> dic, string key, string value)
        public void dictionary(Dictionary<string, string> dic, string key, string value)  
        {
            if (dic.ContainsKey(key)) //判断是否存在键值
            {
@@ -189,7 +189,7 @@
            list.AddRange(list2);
            list.AddRange(FunctionList.List.groupControls);
#if DEBUG
            GetTestDevice(ref list, true);
            //GetTestDevice(ref list, true);
#endif
            return list;
        }
@@ -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)
            {
@@ -586,6 +590,7 @@
            device.spk == SPK.AirSwitch
            || device.spk == SPK.PanelSocket
            || device.spk == SPK.ElectricSocket
            || device.spk == SPK.ElectricalTvHisense
            );
            if (electric != null)
            {
@@ -706,6 +711,7 @@
                functionTypeList.Add(SPK.SensorHelp);
                functionTypeList.Add(SPK.SensorPm10);
                functionTypeList.Add(SPK.SensorPirHold);
                functionTypeList.Add(SPK.SensorLight);


            }
@@ -715,6 +721,7 @@
                functionTypeList.Add(SPK.AirSwitch);
                functionTypeList.Add(SPK.PanelSocket);
                functionTypeList.Add(SPK.ElectricSocket);
                functionTypeList.Add(SPK.ElectricalTvHisense);
            }
            ///门锁类
            else if (deviceType == Language.StringByID(StringId.DoorLock))
@@ -807,6 +814,8 @@
                functionTypeList.Add(SPK.VideoDoorLock);
                functionTypeList.Add(SPK.AcIr);
                functionTypeList.Add(SPK.SensorPirHold);
                functionTypeList.Add(SPK.ElectricalTvHisense);
                functionTypeList.Add(SPK.SensorLight);

            }

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

                    }
                    break;
@@ -896,6 +906,7 @@
                        deviceTypeList.Add(SPK.AvMusic);
                        deviceTypeList.Add(SPK.MechanicalArm);
                        deviceTypeList.Add(SPK.AcIr);
                        deviceTypeList.Add(SPK.ElectricalTvHisense);
                    }
                    break;
            }
@@ -1211,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 },
@@ -1226,6 +1237,7 @@
                              new Entity.Function { sid = "12345678991234566844", name = "大华摄像头", spk = Entity.SPK.IpCam_Imou },
                                 new Entity.Function { sid = "12345678991234567", name = "RGB", spk = Entity.SPK.LightRGB },
                                  new Entity.Function { sid = "123456789912345678", name = "RGBW", spk = Entity.SPK.LightRGBW },
                                     new Function { spk = SPK.ElectricalTvHisense, name = "海信电视1",sid="123456789"},
            };
                foreach (var function in functions)
                {