合并嘉乐lc代码

wxr

2021-07-01 adc150efb13a0506f45a3c344c3ee2ef2dba8e90

 HDL_ON/UI/UI2/FuntionControlView/Video/View/ShowDialog.cs

@@ -125,12 +125,16 @@
            //密码
            Button btnpaw = new Button()
            {
                X=Application.GetRealWidth(95),
                X=Application.GetRealWidth(100),
                Y = Application.GetRealHeight(62),
                Height = Application.GetRealHeight(32),
                Width = Application.GetRealWidth(82+5),
                Width = Application.GetRealWidth(82),
                TextColor = MusicColor.SelectedColor,
<<<<<<< HEAD
                TextSize =18,//24
=======
                TextSize =24,
>>>>>>> origin/CJL-LC
                TextAlignment = TextAlignment.Center,
                IsBold = true,
                Text = str1,