Merge remote-tracking branch 'origin/wjc' into Dev-Branch

wxr

2022-05-24 610a6a826a00d47320b17478cb5ca5f60abfa291

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

@@ -397,6 +397,11 @@
                        strPath = "LogicIcon/sensor.png";
                    }
                    break;
                case SPK.DoorLock:
                    {
                        strPath = "FunctionIcon/DoorLock/DoorLock.png";
                    }
                    break;

            }
            return strPath;
@@ -488,6 +493,12 @@
            {
                deviceStrTypeList.Add(Language.StringByID(StringId.Electric));
            }
            ///门锁类
            var doorlock = deviceList.Find((device) => device.spk == SPK.DoorLock);
            if (doorlock != null)
            {
                deviceStrTypeList.Add(Language.StringByID(StringId.DoorLock));
            }
            return deviceStrTypeList;

        }
@@ -568,6 +579,11 @@
                functionTypeList.Add(SPK.AirSwitch);
                functionTypeList.Add(SPK.PanelSocket);
                functionTypeList.Add(SPK.ElectricSocket);
            }
            ///门锁类
            else if (deviceType == Language.StringByID(StringId.DoorLock))
            {
                functionTypeList.Add(SPK.DoorLock); 
            }
            else
            {
@@ -668,6 +684,7 @@
                        deviceTypeList.Add(SPK.ElectricSocket);
                        deviceTypeList.Add(SPK.HvacCac);
                        deviceTypeList.Add(SPK.SensorHelp);
                        deviceTypeList.Add(SPK.DoorLock);

                    }
                    break;