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

xm

2021-11-24 1802b849f0dadc81644fb0a706d6fb45efdf2a20

 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);

@@ -157,7 +157,7 @@
                Height = Application.GetRealWidth(210),
                Progress = curtainTemp.GetPercent(function),
                //IsInvertedProgress = true,
                ProgressTextColor = 0x00000000,
                ProgressTextColor = CSS_Color.WarningColor,// 0x00000000,
            };
            controlView.AddChidren(curtainSeekBar);