Merge remote-tracking branch 'origin/wjc' into release0123

wxr

2022-07-04 cc7eb0553e93844be984045bca3e335d4ae0dede

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

@@ -211,7 +211,7 @@
            angleView.AddChidren(angleBar);
            angleBar.OnProgressChangedEvent = (sender, e) =>
            {
                float angle = (e - 90);
                float angle = e;
                btnAngle.Text = angle + "°";
                foreach (var btn in buttons)
                {