Merge branch 'wxr6' into MergeFL

wxr

2021-07-05 5f1fdf638033a87980b84689fb6f29f70cf68c6e

 HDL_ON/UI/UI2/FuntionControlView/Music/View/TopView.cs

@@ -65,7 +65,7 @@
        /// </summary>
        public Button clickBackBtn = new Button
        {
            Width = Application.GetRealWidth(16+12+16),
            Width = Application.GetRealWidth(16+12+16+50),
            Height = Application.GetRealHeight(64),
        };
        /// <summary>