Merge branch 'WJC' into wxr6

wxr

2021-11-05 f6c4e9886b924d8f5271e8b58378d7a07269dcb8

 HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPage.cs

@@ -145,7 +145,7 @@
                Height = Application.GetRealHeight(50),
                TextSize = CSS_FontSize.TextFontSize,
                TextColor = CSS_Color.PromptingColor1,
                Text = curtainTemp.GetPercent(function).ToString() + "%",
                Text =  curtainTemp.GetPercent(function).ToString() + "%",
            };
            controlView.AddChidren(btnProgress);