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

wxr

2022-07-04 cc7eb0553e93844be984045bca3e335d4ae0dede

 HDL_ON/UI/UI2/FuntionControlView/Video/VideoMainView.cs

@@ -23,7 +23,6 @@
            this.AddChidren(topView.TopFLayoutView());
            topView.topNameBtn.TextID = StringId.keshiduijiang;


            var pageView = new PageLayout()
            {
                Y = Application.GetRealHeight(64),