From 145b157ba183ebf877c93ed2dbb01ec737c993d3 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 08 十二月 2020 18:59:33 +0800
Subject: [PATCH] Merge branch 'WJC'
---
HDL_ON/UI/UI2/FuntionControlView/Music/View/TopView.cs | 22 ++++++++++++++++------
1 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Music/View/TopView.cs b/HDL_ON/UI/UI2/FuntionControlView/Music/View/TopView.cs
index 453aa2b..27ec27a 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Music/View/TopView.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Music/View/TopView.cs
@@ -12,7 +12,7 @@
/// </summary>
public FrameLayout fLayout = new FrameLayout
{
- BackgroundColor = Color.TopViewColor,
+ BackgroundColor = MusicColor.TopViewColor,
Height = Application.GetRealHeight(64),
Width=Application.GetRealWidth(375),
};
@@ -22,7 +22,7 @@
public Button topNameBtn = new Button
{
TextSize = TextSize.Text18,
- TextColor = Color.Text18Color,
+ TextColor = MusicColor.Text18Color,
Width = Application.GetRealWidth(140),
Height = Application.GetRealHeight(25),
Y = Application.GetRealHeight(30),
@@ -34,7 +34,7 @@
public Button backBtn = new Button
{
Width = Application.GetRealWidth(12),
- Height = Application.GetRealHeight(20),
+ Height = Application.GetRealWidth(20),
X = Application.GetRealWidth(16),
Y = Application.GetRealHeight(32),
UnSelectedImagePath = "MusicIcon/MusicBack.png",
@@ -45,7 +45,7 @@
{
Width = Application.GetRealWidth(375),
Height = 1,
- BackgroundColor = Color.LineColor,
+ BackgroundColor = MusicColor.LineColor,
};
/// <summary>
@@ -55,8 +55,8 @@
{
Y = Application.GetRealHeight(29),
X = Application.GetRealWidth(337),
- Width = Application.GetMinRealAverage(28),
- Height = Application.GetMinRealAverage(28),
+ Width = Application.GetRealWidth(28),
+ Height = Application.GetRealWidth(28),
UnSelectedImagePath = "MusicIcon/set.png",
Visible=false,
};
@@ -67,6 +67,15 @@
{
Width = Application.GetRealWidth(16+12+16),
Height = Application.GetRealHeight(64),
+ };
+ /// <summary>
+ /// 璁剧疆鍥炬爣澧炲姞鐑敭澶у皬
+ /// </summary>
+ public Button clickSetBtn = new Button
+ {
+ X = Application.GetRealWidth(337 - 37),
+ Width = Application.GetRealWidth(28 + 37),
+ Height = Application.GetRealWidth(28 + 7 + 29),
};
/// <summary>
/// 鏈�涓婇潰鐨勯偅鍧楁柟娉�
@@ -80,6 +89,7 @@
fLayout.AddChidren(lineBtn);
fLayout.AddChidren(setBtn);
fLayout.AddChidren(clickBackBtn);
+ fLayout.AddChidren(clickSetBtn);
return fLayout;
}
#endregion
--
Gitblit v1.8.0