From 0891d90cd0d435338cc2851fd0830cd318a17fff Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期三, 23 十二月 2020 14:25:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/WJC' into NewFilePath
---
HDL_ON/UI/UI2/FuntionControlView/Music/View/PlayView.cs | 50 ++++++++++++++++++++++++--------------------------
1 files changed, 24 insertions(+), 26 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Music/View/PlayView.cs b/HDL_ON/UI/UI2/FuntionControlView/Music/View/PlayView.cs
old mode 100644
new mode 100755
index 438e708..e368d4f
--- a/HDL_ON/UI/UI2/FuntionControlView/Music/View/PlayView.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Music/View/PlayView.cs
@@ -51,8 +51,8 @@
{
X = Application.GetRealWidth(273),
Y = Application.GetRealHeight(14),
- Width = Application.GetMinRealAverage(40),
- Height = Application.GetMinRealAverage(40),
+ Width = Application.GetRealWidth(40),
+ Height = Application.GetRealWidth(40),
UnSelectedImagePath = "MusicIcon/collect.png",
SelectedImagePath = "MusicIcon/collectSelected.png",
};
@@ -61,20 +61,18 @@
/// </summary>
public FrameLayout fra = new FrameLayout
{
- X = Application.GetRealWidth(63 + 2),
+ X = Application.GetRealWidth(57),
Y = Application.GetRealHeight(72),
Width = Application.GetRealWidth(202+12),
- Height = Application.GetRealHeight(202+12),
+ Height = Application.GetRealWidth(202+12),
};
/// <summary>
///鏄剧ず鎾斁闊充箰鍥炬爣
/// </summary>
public Button musicIconBtn = new Button
{
- //X = Application.GetRealWidth(63 + 2+20),
- //Y = Application.GetRealHeight(72 + 6+20),
- Width = Application.GetMinRealAverage(158),
- Height = Application.GetMinRealAverage(158),
+ Width = Application.GetRealWidth(158),
+ Height = Application.GetRealWidth(158),
UnSelectedImagePath = "MusicIcon/musicIcon.png",
Gravity = Gravity.Center,
};
@@ -83,8 +81,8 @@
/// </summary>
public DiyArcSeekBar diyArcSeekBar = new DiyArcSeekBar
{
- Width = Application.GetMinRealAverage(202),
- Height = Application.GetMinRealAverage(202),
+ Width = Application.GetRealWidth(202),
+ Height = Application.GetRealWidth(202),
ProgressBarColor = MusicColor.SelectedColor,
OpenAngle = 0,//寮�鍙ｈ搴�
ArcWidth = Application.GetRealWidth(4),//杩涘害瀹藉害
@@ -156,8 +154,8 @@
{
X = Application.GetRealWidth(70),
Y = Application.GetRealHeight(355),
- Width = Application.GetMinRealAverage(28),
- Height = Application.GetMinRealAverage(28),
+ Width = Application.GetRealWidth(28),
+ Height = Application.GetRealWidth(28),
UnSelectedImagePath = "MusicIcon/list.png",
};
/// <summary>
@@ -167,8 +165,8 @@
{
X = Application.GetRealWidth(150),
Y = Application.GetRealHeight(355),
- Width = Application.GetMinRealAverage(28),
- Height = Application.GetMinRealAverage(28),
+ Width = Application.GetRealWidth(28),
+ Height = Application.GetRealWidth(28),
UnSelectedImagePath = "MusicIcon/love1.png",
SelectedImagePath = "MusicIcon/loveSelected1.png",
};
@@ -179,8 +177,8 @@
{
X = Application.GetRealWidth(230),
Y = Application.GetRealHeight(355),
- Width = Application.GetMinRealAverage(28),
- Height = Application.GetMinRealAverage(28),
+ Width = Application.GetRealWidth(28),
+ Height = Application.GetRealWidth(28),
UnSelectedImagePath = "MusicIcon/playList.png",
};
/// <summary>
@@ -190,8 +188,8 @@
{
X = Application.GetRealWidth(24),
Y = Application.GetRealHeight(414),
- Width = Application.GetMinRealAverage(24),
- Height = Application.GetMinRealAverage(24),
+ Width = Application.GetRealWidth(24),
+ Height = Application.GetRealWidth(24),
UnSelectedImagePath = "MusicIcon/vol.png",
};
/// <summary>
@@ -207,8 +205,8 @@
IsClickable = true,//杩涘害鏉℃槸鍚︽粦鍔�
ProgressBarColor = MusicColor.SelectedColor,//閫変腑杩涘害鏉￠鑹�
ThumbImagePath = "MusicIcon/progressIcon.png",//杩涘害鏉℃寜閽浘鏍�
- ThumbImageHeight = Application.GetMinRealAverage(54),//杩涘害鏉℃寜閽浘鏍囩殑楂樺害锛堥粯璁ゆ鏂瑰舰锛氬鍜岄珮涓�鏍凤級
- SeekBarViewHeight = Application.GetMinRealAverage(8),//杩涘害鏉＄殑楂樺害
+ ThumbImageHeight = Application.GetRealWidth(54),//杩涘害鏉℃寜閽浘鏍囩殑楂樺害锛堥粯璁ゆ鏂瑰舰锛氬鍜岄珮涓�鏍凤級
+ SeekBarViewHeight = Application.GetRealWidth(8),//杩涘害鏉＄殑楂樺害
ProgressChangeDelayTime = 300,//0.3绉掑彂閫佷竴娆�
SeekBarPadding = Application.GetRealWidth(20),
};
@@ -233,8 +231,8 @@
{
X = Application.GetRealWidth(64),
Y = Application.GetRealHeight(466),
- Width = Application.GetMinRealAverage(40),
- Height = Application.GetMinRealAverage(40),
+ Width = Application.GetRealWidth(40),
+ Height = Application.GetRealWidth(40),
UnSelectedImagePath = "MusicIcon/prve1.png",
SelectedImagePath = "MusicIcon/prve1Selected.png",
};
@@ -245,8 +243,8 @@
{
X = Application.GetRealWidth(144),
Y = Application.GetRealHeight(466),
- Width = Application.GetMinRealAverage(40),
- Height = Application.GetMinRealAverage(40),
+ Width = Application.GetRealWidth(40),
+ Height = Application.GetRealWidth(40),
UnSelectedImagePath = "MusicIcon/pause1.png",
SelectedImagePath = "MusicIcon/play1.png",
};
@@ -257,8 +255,8 @@
{
X = Application.GetRealWidth(224),
Y = Application.GetRealHeight(466),
- Width = Application.GetMinRealAverage(40),
- Height = Application.GetMinRealAverage(40),
+ Width = Application.GetRealWidth(40),
+ Height = Application.GetRealWidth(40),
UnSelectedImagePath = "MusicIcon/next1.png",
SelectedImagePath = "MusicIcon/next1Selected.png",
};
--
Gitblit v1.8.0