Merge branch 'wxr-2.2' into Dev-Branch

wxr

2023-10-20 4e4f9c3ee4ff6d05d5a431626901fbf43eb368a9

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

@@ -370,13 +370,13 @@
            {
                return "FunctionIcon/DoorLock/DoorLock.png";
            }
            else if (SPK.SensorDryContact == device.spk
                || SPK.SensorDryContact2 == device.spk
                || SPK.OtherCommon == device.spk
                )
            {
                return "LogicIcon/ganjiedian.png";
            }
            //else if (SPK.SensorDryContact == device.spk
            //    || SPK.SensorDryContact2 == device.spk
            //    || SPK.OtherCommon == device.spk
            //    )
            //{
            //    return "LogicIcon/ganjiedian.png";
            //}
            else if (SPK.SensorLight == device.spk)
            {
                return "LogicIcon/lightloguc.png";