From adc150efb13a0506f45a3c344c3ee2ef2dba8e90 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 01 七月 2021 15:19:13 +0800
Subject: [PATCH] 合并嘉乐lc代码
---
HDL_ON/UI/UI2/FuntionControlView/Video/View/ShowDialog.cs | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Video/View/ShowDialog.cs b/HDL_ON/UI/UI2/FuntionControlView/Video/View/ShowDialog.cs
index 6e15f59..b162ee9 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Video/View/ShowDialog.cs
+++ b/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);
//浜岀淮鐮�
--
Gitblit v1.8.0