Merge branch 'Dev-Branch' into Dev-Wxr-1.8.1

wxr

2023-07-17 59d9f0ad6dc40b079fa1f8f514698429ead04a75

 HDL_ON/UI/UI0-Stan/Controls/BottomControls/BottomTimeSelectControl.cs

@@ -95,7 +95,7 @@
            //初始化底层控件

            var frameWhiteBack = base.InitBaseControl();

            frameWhiteBack.Height = Application.GetRealHeight(contentView);

            //frameWhiteBack.Y = frameWhiteBack.Parent.Height - Application.GetRealHeight(297 + 20);

            //frameWhiteBack.Y = Application.GetRealHeight(667 - contentView + 60);



            //取消

            base.btnCancel.ButtonClickEvent += (sender, e) =>