合并嘉乐lc代码

wxr

2021-07-01 adc150efb13a0506f45a3c344c3ee2ef2dba8e90

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

@@ -119,7 +119,7 @@
                TextSize = TextSize.Text16,
                TextAlignment = TextAlignment.Center,
                IsBold = true,
                Text = "临时密码",
                TextID=StringId.linshimima,
            };
            whiteView.AddChidren(btnTitle);
            //密码
@@ -130,7 +130,11 @@
                Height = Application.GetRealHeight(32),
                Width = Application.GetRealWidth(82),
                TextColor = MusicColor.SelectedColor,
<<<<<<< HEAD
                TextSize =18,//24
=======
                TextSize =24,
>>>>>>> origin/CJL-LC
                TextAlignment = TextAlignment.Center,
                IsBold = true,
                Text = str1,
@@ -142,7 +146,8 @@
                Y = Application.GetRealHeight(68),
                Width = Application.GetRealWidth(20),
                Height = Application.GetRealWidth(20),
                UnSelectedImagePath = "VideoIcon/hangup.png",
                UnSelectedImagePath = "LoginIcon/ShowPasswordIcon.png",
                SelectedImagePath = "LoginIcon/HidePasswordIcon.png",

            };
            whiteView.AddChidren(iconBtn);
            //二维码