Merge branch 'wxr6' into MergeFL

wxr

2021-07-05 5f1fdf638033a87980b84689fb6f29f70cf68c6e

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

@@ -44,7 +44,7 @@
                Gravity = Gravity.CenterHorizontal,
                Y = Application.GetRealHeight(88),
                Width = Application.GetRealWidth(134),
                Height = Application.GetRealHeight(134),
                Height = Application.GetRealWidth(134),
                UnSelectedImagePath = "FunctionIcon/IrFan/FanIcon.png",
            };
            FrameWhiteCentet1.AddChidren(btnIcon);