Merge remote-tracking branch 'origin/newBranch1' into WJC

JLChen

2021-08-21 af9c3e0b3b1eb370e966b3ca9db3f62848d4189b

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

@@ -31,7 +31,7 @@

            //初始化第一个索引页的内容
            this.InitFrameWhiteContent1();
            ;
            
        }

        /// <summary>
@@ -184,7 +184,7 @@

            btnTitle = new Button()
            {
                Y = btnIcon.Bottom,
                Y = Application.GetRealWidth(28),
                Text = title,
                Height = Application.GetRealHeight(30),
                TextColor = CSS_Color.TextualColor,