From 3532db3610381f37eca1a6ac783d882517847c91 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 31 三月 2021 15:28:49 +0800
Subject: [PATCH] Merge branch 'WJC' into temp-wxr
---
HDL_ON/UI/UI2/FuntionControlView/Video/View/FrameLayout60.cs | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Video/View/FrameLayout60.cs b/HDL_ON/UI/UI2/FuntionControlView/Video/View/FrameLayout60.cs
index bedc8ec..9eb9fc4 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Video/View/FrameLayout60.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Video/View/FrameLayout60.cs
@@ -24,7 +24,8 @@
Height = Application.GetRealHeight(20),
TextColor = CSS.CSS_Color.textColor,
TextSize = TextSize.text14,
- Text= "闂ㄥ彛鏈哄懠鍙�",
+ //Text= "闂ㄥ彛鏈哄懠鍙�",
+ TextID=StringId.menkoujihujiao,
TextAlignment = TextAlignment.CenterLeft,
};
/// <summary>
@@ -42,9 +43,9 @@
Text = "15:01",
};
/// <summary>
- /// 缂栬緫鏂囨湰
+ /// 鐘舵�佹枃鏈�
/// </summary>
- public Button btnEditText = new Button
+ public Button btnStateText = new Button
{
Y = Application.GetRealHeight(32),
Width = Application.GetRealWidth(260),
@@ -91,7 +92,7 @@
{
frameLayout.AddChidren(btnText);
frameLayout.AddChidren(btnTime);
- frameLayout.AddChidren(btnEditText);
+ frameLayout.AddChidren(btnStateText);
frameLayout.AddChidren(btnNextIcon);
btnLine.Y = frameLayout.Height - 1;
frameLayout.AddChidren(btnLine);
--
Gitblit v1.8.0