1127最新合并代码，合并嘉乐更新

wei

2020-11-27 e53a1951d6aa07ad22aad9816da4703496fcbccd

 HDL_ON/UI/UI2/FuntionControlView/Electrical/FanPage.cs

@@ -109,7 +109,7 @@
                Y = Application.GetRealHeight(100),
                Width = Application.GetRealWidth(198),
                Height = Application.GetRealWidth(198),
                IsSelected = fan.trait_on_off.value.ToString() == "on",
                IsSelected = fan.trait_on_off.curValue.ToString() == "on",
                SelectedImagePath = "FunctionIcon/Electrical/FanIconBg.png",
                UnSelectedImagePath = "FunctionIcon/Electrical/FanIconBgGray.png",
            };
@@ -161,7 +161,7 @@
                Height = Application.GetMinRealAverage(40),
                UnSelectedImagePath = "Public/PowerClose.png",
                SelectedImagePath = "Public/PowerOpen.png",
                IsSelected = fan.trait_on_off.value.ToString() == "on"
                IsSelected = fan.trait_on_off.curValue.ToString() == "on"
            };
            controlView.AddChidren(btnSwitch);