Merge branch 'wjc' into dev--wxr

wxr

2022-12-07 309d7ff018dddf810027bdfe05c85976b22f3b76

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

@@ -360,6 +360,10 @@
            {
                return "LogicIcon/sensor.png";
            }
            else if (SPK.DoorLock == device.spk)
            {
                return "FunctionIcon/DoorLock/DoorLock.png";
            }
            //LogicIcon/heatlogic.png"
            return $"FunctionIcon/Icon/{device.IconName}.png";