From 9acd3887f1f8db40d59f991b1726a61aa7c7637c Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 12 五月 2021 15:13:56 +0800
Subject: [PATCH] Merge branch 'CJL' into wxr4
---
HDL_ON/UI/UI2/FuntionControlView/Video/View/FrameLayout60.cs | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Video/View/FrameLayout60.cs b/HDL_ON/UI/UI2/FuntionControlView/Video/View/FrameLayout60.cs
index 9eb9fc4..dd1c231 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Video/View/FrameLayout60.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Video/View/FrameLayout60.cs
@@ -8,10 +8,10 @@
/// <summary>
/// 涓绘帶浠禫iew
/// </summary>
- public FrameLayout frameLayout = new FrameLayout
+ public RowLayout frameLayout = new RowLayout
{
Height = Application.GetRealHeight(60),
- //BackgroundColor = CSS.CSS_Color.view,
+ LineColor = CSS.CSS_Color.view,
};
/// <summary>
@@ -37,10 +37,10 @@
Y = Application.GetRealHeight(10),
Width = Application.GetRealWidth(120),
Height = Application.GetRealHeight(20),
- TextColor = CSS.CSS_Color.textColor,
+ TextColor = CSS.CSS_Color.textCancelColor,
TextSize = TextSize.text14,
TextAlignment=TextAlignment.CenterLeft,
- Text = "15:01",
+ //Text = "15:01",
};
/// <summary>
/// 鐘舵�佹枃鏈�
@@ -53,7 +53,6 @@
TextSize = TextSize.text12,
TextColor = CSS.CSS_Color.textCancelColor,
TextAlignment = TextAlignment.CenterLeft,
- Text = "宸叉帴鍚�, 宸插紑閿�",
};
@@ -88,7 +87,7 @@
/// View鐨勬柟娉�
/// </summary>
/// <returns></returns>
- public FrameLayout FLayoutView()
+ public RowLayout FLayoutView()
{
frameLayout.AddChidren(btnText);
frameLayout.AddChidren(btnTime);
--
Gitblit v1.8.0