Merge remote-tracking branch 'origin/newBranch1' into WJC

JLChen

2021-08-21 af9c3e0b3b1eb370e966b3ca9db3f62848d4189b

 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);
            //密码
@@ -142,7 +142,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);
            //二维码