From a25046509bbc7b449e7269eea9cf3173e6ea6d12 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期三, 16 十二月 2020 16:19:24 +0800
Subject: [PATCH] 2020-12-16-3
---
HDL_ON/UI/UI2/FuntionControlView/Music/View/MyListView.cs | 4
HDL_ON/UI/UI2/FuntionControlView/Music/A31MyList.cs | 12 +-
HDL_ON/UI/UI2/FuntionControlView/Music/View/PlayView.cs | 50 ++++++------
HDL_ON/UI/UI2/FuntionControlView/Music/A31Radio.cs | 4
HDL_ON/UI/UI2/FuntionControlView/Music/View/DialogView.cs | 28 +++---
HDL_ON/UI/UI2/FuntionControlView/Music/View/MusicSourceView.cs | 12 +-
HDL_ON/UI/UI2/FuntionControlView/Music/View/TipView.cs | 8 +-
HDL_ON/UI/UI2/FuntionControlView/Music/A31LoveList.cs | 8 +-
HDL_ON/UI/UI2/FuntionControlView/Music/View/SongView.cs | 12 +-
HDL_ON/UI/UI2/FuntionControlView/Music/A31MusicSourcePage.cs | 4
HDL_ON/UI/UI2/FuntionControlView/Music/A31PlayMusicPage.cs | 1
HDL_ON/UI/UI2/FuntionControlView/Music/A31LoveRadioList.cs | 8 +-
HDL_ON/UI/UI2/FuntionControlView/Music/View/MusicView.cs | 24 +++---
.vs/HDL_APP_Project/xs/UserPrefs.xml | 22 +---
HDL_ON/UI/UI2/FuntionControlView/Music/A31RadioList.cs | 12 +-
15 files changed, 99 insertions(+), 110 deletions(-)
diff --git a/.vs/HDL_APP_Project/xs/UserPrefs.xml b/.vs/HDL_APP_Project/xs/UserPrefs.xml
index 66e84a6..0a2834d 100644
--- a/.vs/HDL_APP_Project/xs/UserPrefs.xml
+++ b/.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,15 +1,6 @@
-锘�<Properties StartupConfiguration="{09712674-2A38-407B-B1E2-560B2C352F9A}|Default">
+锘�<Properties StartupConfiguration="{D998E133-F0DD-4760-BE3C-461632F54DA4}|Default">
<MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.00008020-001674E61438002E" />
- <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/FuntionControlView/Music/View/PlayView.cs">
- <Files>
- <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/FunTpye.cs" Line="99" Column="18" />
- <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs" Line="160" Column="74" />
- <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/MainView.cs" Line="5" Column="28" />
- <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/Send.cs" Line="36" Column="10" />
- <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs" Line="202" Column="58" />
- <File FileName="HDL_ON/UI/UI2/FuntionControlView/Music/A31PlayMusicPage.cs" Line="38" Column="46" />
- <File FileName="HDL_ON/UI/UI2/FuntionControlView/Music/View/PlayView.cs" Line="5" Column="18" />
- </Files>
+ <MonoDevelop.Ide.Workbench>
<Pads>
<Pad Id="ProjectPad">
<State name="__root__">
@@ -18,14 +9,15 @@
<Node name="DAL" expanded="True" />
<Node name="UI" expanded="True">
<Node name="UI2" expanded="True">
+ <Node name="2-Classification" expanded="True" />
<Node name="3-Intelligence" expanded="True">
- <Node name="Automation" expanded="True" />
+ <Node name="Automation" expanded="True">
+ <Node name="FunTpye.cs" selected="True" />
+ </Node>
</Node>
<Node name="FuntionControlView" expanded="True">
<Node name="Music" expanded="True">
- <Node name="View" expanded="True">
- <Node name="PlayView.cs" selected="True" />
- </Node>
+ <Node name="View" expanded="True" />
</Node>
</Node>
</Node>
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Music/A31LoveList.cs b/HDL_ON/UI/UI2/FuntionControlView/Music/A31LoveList.cs
index 47dff85..17e903c 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Music/A31LoveList.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Music/A31LoveList.cs
@@ -67,8 +67,8 @@
{
X = Application.GetRealWidth(16),
Y = Application.GetRealHeight(8),
- Width = Application.GetMinRealAverage(88),
- Height = Application.GetMinRealAverage(88),
+ Width = Application.GetRealWidth(88),
+ Height = Application.GetRealWidth(88),
};
addFlieRow.AddChidren(fileIconBtn);
@@ -77,8 +77,8 @@
{
X = Application.GetRealWidth(78),
Y = Application.GetRealHeight(70),
- Width = Application.GetMinRealAverage(24),
- Height = Application.GetMinRealAverage(24),
+ Width = Application.GetRealWidth(24),
+ Height = Application.GetRealWidth(24),
UnSelectedImagePath = "MusicIcon/filePause.png",
SelectedImagePath = "MusicIcon/filePlay.png",
};
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Music/A31LoveRadioList.cs b/HDL_ON/UI/UI2/FuntionControlView/Music/A31LoveRadioList.cs
index 5767ca5..4369486 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Music/A31LoveRadioList.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Music/A31LoveRadioList.cs
@@ -80,8 +80,8 @@
{
X = Application.GetRealWidth(16),
Y = Application.GetRealHeight(18),
- Width = Application.GetMinRealAverage(32),
- Height = Application.GetMinRealAverage(32),
+ Width = Application.GetRealWidth(32),
+ Height = Application.GetRealWidth(32),
UnSelectedImagePath = "MusicIcon/radioIcon.png",
};
radioViewFl.AddChidren(radioIconBtn);
@@ -104,8 +104,8 @@
{
X = Application.GetRealWidth(335),
Y = Application.GetRealHeight(20),
- Width = Application.GetMinRealAverage(28),
- Height = Application.GetMinRealAverage(28),
+ Width = Application.GetRealWidth(28),
+ Height = Application.GetRealWidth(28),
UnSelectedImagePath = "MusicIcon/loveSelected.png",
};
radioViewFl.AddChidren(loveIcon);
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Music/A31MusicSourcePage.cs b/HDL_ON/UI/UI2/FuntionControlView/Music/A31MusicSourcePage.cs
index 95b2b2e..3db0642 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Music/A31MusicSourcePage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Music/A31MusicSourcePage.cs
@@ -64,8 +64,8 @@
areaText.FrameLayoutView(fL1, false);
areaText.nextLevelBtn.X = Application.GetRealWidth(339);
areaText.nextLevelBtn.Y = Application.GetRealHeight(17);
- areaText.nextLevelBtn.Width = Application.GetMinRealAverage(16);
- areaText.nextLevelBtn.Height = Application.GetMinRealAverage(16);
+ areaText.nextLevelBtn.Width = Application.GetRealWidth(16);
+ areaText.nextLevelBtn.Height = Application.GetRealWidth(16);
areaText.nextLevelBtn.UnSelectedImagePath = "MusicIcon/sourceNetx.png";
areaText.lineBtn.BackgroundColor = MusicColor.WhiteColor;
areaText.textBtn.X = Application.GetRealWidth(16);
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Music/A31MyList.cs b/HDL_ON/UI/UI2/FuntionControlView/Music/A31MyList.cs
index f871783..2e8ac86 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Music/A31MyList.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Music/A31MyList.cs
@@ -40,8 +40,8 @@
{
X = Application.GetRealWidth(336),
Y = Application.GetRealHeight(30),
- Width = Application.GetMinRealAverage(28),
- Height = Application.GetMinRealAverage(28),
+ Width = Application.GetRealWidth(28),
+ Height = Application.GetRealWidth(28),
UnSelectedImagePath = "MusicIcon/addMusic.png",
};
topView.TopFLayoutView().AddChidren(addIconBtn);
@@ -96,8 +96,8 @@
{
X = Application.GetRealWidth(16),
Y = Application.GetRealHeight(8),
- Width = Application.GetMinRealAverage(88),
- Height = Application.GetMinRealAverage(88),
+ Width = Application.GetRealWidth(88),
+ Height = Application.GetRealWidth(88),
UnSelectedImagePath = "MusicIcon/fileList.png",
};
addFlieRow.AddChidren(fileIconBtn);
@@ -106,8 +106,8 @@
{
X = Application.GetRealWidth(78),
Y = Application.GetRealHeight(70),
- Width = Application.GetMinRealAverage(24),
- Height = Application.GetMinRealAverage(24),
+ Width = Application.GetRealWidth(24),
+ Height = Application.GetRealWidth(24),
UnSelectedImagePath = "MusicIcon/filePause.png",
SelectedImagePath = "MusicIcon/filePlay.png",
Tag= list,
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Music/A31PlayMusicPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Music/A31PlayMusicPage.cs
index e637068..d651ae9 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Music/A31PlayMusicPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Music/A31PlayMusicPage.cs
@@ -39,7 +39,6 @@
public void Show()
{
-
///1绉掑畾鏃舵洿鏂扮姸鎬�
timerUpdateStatus();
#region ---鐣岄潰甯冨眬---
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Music/A31Radio.cs b/HDL_ON/UI/UI2/FuntionControlView/Music/A31Radio.cs
index 072c1ff..bd119b9 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Music/A31Radio.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Music/A31Radio.cs
@@ -64,8 +64,8 @@
{
X = Application.GetRealWidth(16),
Y = Application.GetRealHeight(8),
- Width = Application.GetMinRealAverage(62),
- Height = Application.GetMinRealAverage(62),
+ Width = Application.GetRealWidth(62),
+ Height = Application.GetRealWidth(62),
UnSelectedImagePath = "MusicIcon/file.png",
};
addFlieRow.AddChidren(fileIconBtn);
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Music/A31RadioList.cs b/HDL_ON/UI/UI2/FuntionControlView/Music/A31RadioList.cs
index 1379d33..9ad5b09 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Music/A31RadioList.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Music/A31RadioList.cs
@@ -71,8 +71,8 @@
{
X = Application.GetRealWidth(16),
Y = Application.GetRealHeight(18),
- Width = Application.GetMinRealAverage(32),
- Height = Application.GetMinRealAverage(32),
+ Width = Application.GetRealWidth(32),
+ Height = Application.GetRealWidth(32),
UnSelectedImagePath = "MusicIcon/radioIcon.png",
};
radioViewFl.AddChidren(radioIconBtn);
@@ -96,8 +96,8 @@
{
X = Application.GetRealWidth(335),
Y = Application.GetRealHeight(20),
- Width = Application.GetMinRealAverage(28),
- Height = Application.GetMinRealAverage(28),
+ Width = Application.GetRealWidth(28),
+ Height = Application.GetRealWidth(28),
UnSelectedImagePath = "MusicIcon/love.png",
SelectedImagePath = "MusicIcon/loveSelected.png",
};
@@ -185,8 +185,8 @@
{
X = Application.GetRealWidth(16),
Y = Application.GetRealHeight(8),
- Width = Application.GetMinRealAverage(62),
- Height = Application.GetMinRealAverage(62),
+ Width = Application.GetRealWidth(62),
+ Height = Application.GetRealWidth(62),
UnSelectedImagePath = "MusicIcon/file.png",
};
addFlieRow.AddChidren(fileIconBtn);
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Music/View/DialogView.cs b/HDL_ON/UI/UI2/FuntionControlView/Music/View/DialogView.cs
index 9423667..1c15666 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Music/View/DialogView.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Music/View/DialogView.cs
@@ -80,8 +80,8 @@
{
X = Application.GetRealWidth(304),
Y = Application.GetRealHeight(20),
- Width = Application.GetMinRealAverage(28),
- Height = Application.GetMinRealAverage(28),
+ Width = Application.GetRealWidth(28),
+ Height = Application.GetRealWidth(28),
UnSelectedImagePath = "MusicIcon/addMusic.png",
};
topFra.AddChidren(addIconBtn);
@@ -132,8 +132,8 @@
{
X = Application.GetRealWidth(12),
Y = Application.GetRealHeight(8),
- Width = Application.GetMinRealAverage(62),
- Height = Application.GetMinRealAverage(62),
+ Width = Application.GetRealWidth(62),
+ Height = Application.GetRealWidth(62),
UnSelectedImagePath = "MusicIcon/file.png",
};
addFlieRow.AddChidren(fileIconBtn);
@@ -352,8 +352,8 @@
{
X = Application.GetRealWidth(303),
Y = Application.GetRealHeight(11),
- Width = Application.GetMinRealAverage(28),
- Height = Application.GetMinRealAverage(28),
+ Width = Application.GetRealWidth(28),
+ Height = Application.GetRealWidth(28),
UnSelectedImagePath = "MusicIcon/noSelectedIcon.png",
SelectedImagePath = "MusicIcon/selectedIcon.png",
};
@@ -626,8 +626,8 @@
{
X = Application.GetRealWidth(303),
Y = Application.GetRealHeight(11),
- Width = Application.GetMinRealAverage(28),
- Height = Application.GetMinRealAverage(28),
+ Width = Application.GetRealWidth(28),
+ Height = Application.GetRealWidth(28),
UnSelectedImagePath = "MusicIcon/noSelectedIcon.png",
SelectedImagePath = "MusicIcon/selectedIcon.png",
Tag = player,
@@ -812,8 +812,8 @@
{
X = Application.GetRealWidth(303),
Y = Application.GetRealHeight(11),
- Width = Application.GetMinRealAverage(28),
- Height = Application.GetMinRealAverage(28),
+ Width = Application.GetRealWidth(28),
+ Height = Application.GetRealWidth(28),
UnSelectedImagePath = "MusicIcon/noSelectedIcon.png",
SelectedImagePath = "MusicIcon/selectedIcon.png",
};
@@ -1284,8 +1284,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),//杩涘害鏉＄殑楂樺害
Progress = int.Parse(a31player.A31PlayStatus.vol),
SeekBarPadding = Application.GetRealWidth(20),
//ProgressChangeDelayTime=
@@ -1347,8 +1347,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),//杩涘害鏉＄殑楂樺害
Progress = int.Parse(player.A31PlayStatus.vol),
SeekBarPadding = Application.GetRealWidth(20),
//ProgressChangeDelayTime=
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Music/View/MusicSourceView.cs b/HDL_ON/UI/UI2/FuntionControlView/Music/View/MusicSourceView.cs
index 6cb0965..2c622a0 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Music/View/MusicSourceView.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Music/View/MusicSourceView.cs
@@ -20,8 +20,8 @@
{
X = Application.GetRealWidth(16),
Y = Application.GetRealHeight(13),
- Width = Application.GetMinRealAverage(24),
- Height = Application.GetMinRealAverage(24),
+ Width = Application.GetRealWidth(24),
+ Height = Application.GetRealWidth(24),
};
/// <summary>
///鏂囨湰
@@ -58,8 +58,8 @@
{
X = Application.GetRealWidth(339),
Y = Application.GetRealHeight(17),
- Width = Application.GetMinRealAverage(16),
- Height = Application.GetMinRealAverage(16),
+ Width = Application.GetRealWidth(16),
+ Height = Application.GetRealWidth(16),
UnSelectedImagePath = "MusicIcon/sourceNetx.png",
};
@@ -104,8 +104,8 @@
fLayout.AddChidren(inputTextBtn);
nextLevelBtn.X = Application.GetRealWidth(333);
nextLevelBtn.Y = Application.GetRealHeight(11);
- nextLevelBtn.Width = Application.GetMinRealAverage(28);
- nextLevelBtn.Height = Application.GetMinRealAverage(28);
+ nextLevelBtn.Width = Application.GetRealWidth(28);
+ nextLevelBtn.Height = Application.GetRealWidth(28);
nextLevelBtn.UnSelectedImagePath = "MusicIcon/edit.png";
}
fLayout.AddChidren(textBtn);
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Music/View/MusicView.cs b/HDL_ON/UI/UI2/FuntionControlView/Music/View/MusicView.cs
index 7304bb9..cb68d38 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Music/View/MusicView.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Music/View/MusicView.cs
@@ -32,8 +32,8 @@
{
X = Application.GetRealWidth(10),
Y = Application.GetRealHeight(15),
- Width = Application.GetMinRealAverage(32),
- Height = Application.GetMinRealAverage(32),
+ Width = Application.GetRealWidth(32),
+ Height = Application.GetRealWidth(32),
UnSelectedImagePath = "MusicIcon/playStatus.png",
};
/// <summary>
@@ -55,8 +55,8 @@
{
X = Application.GetRealWidth(214 + 13),
Y = Application.GetRealHeight(18 + 5),
- Width = Application.GetMinRealAverage(16),
- Height = Application.GetMinRealAverage(16),
+ Width = Application.GetRealWidth(16),
+ Height = Application.GetRealWidth(16),
UnSelectedImagePath = "MusicIcon/Merge.png",
};
/// <summary>
@@ -80,8 +80,8 @@
{
X = Application.GetRealWidth(299),
Y = Application.GetRealHeight(10),
- Width = Application.GetMinRealAverage(40),
- Height = Application.GetMinRealAverage(40),
+ Width = Application.GetRealWidth(40),
+ Height = Application.GetRealWidth(40),
UnSelectedImagePath = "MusicIcon/collect.png",
SelectedImagePath = "MusicIcon/collectSelected.png",
};
@@ -157,8 +157,8 @@
{
X = Application.GetRealWidth(163),
Y = Application.GetRealHeight(101),
- Width = Application.GetMinRealAverage(32),
- Height = Application.GetMinRealAverage(32),
+ Width = Application.GetRealWidth(32),
+ Height = Application.GetRealWidth(32),
UnSelectedImagePath = "MusicIcon/prev.png",
SelectedImagePath = "MusicIcon/prevSeletced.png",
};
@@ -169,8 +169,8 @@
{
X = Application.GetRealWidth(233),
Y = Application.GetRealHeight(101),
- Width = Application.GetMinRealAverage(32),
- Height = Application.GetMinRealAverage(32),
+ Width = Application.GetRealWidth(32),
+ Height = Application.GetRealWidth(32),
UnSelectedImagePath = "MusicIcon/pause.png",
SelectedImagePath = "MusicIcon/play.png",
};
@@ -181,8 +181,8 @@
{
X = Application.GetRealWidth(303),
Y = Application.GetRealHeight(101),
- Width = Application.GetMinRealAverage(32),
- Height = Application.GetMinRealAverage(32),
+ Width = Application.GetRealWidth(32),
+ Height = Application.GetRealWidth(32),
UnSelectedImagePath = "MusicIcon/next.png",
SelectedImagePath = "MusicIcon/nextSelected.png",
};
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Music/View/MyListView.cs b/HDL_ON/UI/UI2/FuntionControlView/Music/View/MyListView.cs
index a7516e7..c9b4aab 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Music/View/MyListView.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Music/View/MyListView.cs
@@ -40,8 +40,8 @@
{
X = Application.GetRealWidth(16),
Y = Application.GetRealHeight(11),
- Width = Application.GetMinRealAverage(28),
- Height = Application.GetMinRealAverage(28),
+ Width = Application.GetRealWidth(28),
+ Height = Application.GetRealWidth(28),
};
/// <summary>
/// 妯″紡鏂囨湰鎺т欢
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Music/View/PlayView.cs b/HDL_ON/UI/UI2/FuntionControlView/Music/View/PlayView.cs
index 438e708..e368d4f 100644
--- 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",
};
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Music/View/SongView.cs b/HDL_ON/UI/UI2/FuntionControlView/Music/View/SongView.cs
index 8be5b91..cc67593 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Music/View/SongView.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Music/View/SongView.cs
@@ -21,8 +21,8 @@
{
X = Application.GetRealWidth(16),
Y = Application.GetRealHeight(10),
- Width = Application.GetMinRealAverage(24),
- Height = Application.GetMinRealAverage(24),
+ Width = Application.GetRealWidth(24),
+ Height = Application.GetRealWidth(24),
UnSelectedImagePath = "MusicIcon/playStatus.png",
Visible = false,
Name = "playStatus",
@@ -64,8 +64,8 @@
{
X = Application.GetRealWidth(291),
Y = Application.GetRealHeight(8),
- Width = Application.GetMinRealAverage(28),
- Height = Application.GetMinRealAverage(28),
+ Width = Application.GetRealWidth(28),
+ Height = Application.GetRealWidth(28),
UnSelectedImagePath = "MusicIcon/love.png",
SelectedImagePath = "MusicIcon/loveSelected.png",
};
@@ -77,8 +77,8 @@
{
X = Application.GetRealWidth(335),
Y = Application.GetRealHeight(8),
- Width = Application.GetMinRealAverage(28),
- Height = Application.GetMinRealAverage(28),
+ Width = Application.GetRealWidth(28),
+ Height = Application.GetRealWidth(28),
UnSelectedImagePath = "MusicIcon/addMusic1.png",
};
/// <summary>
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Music/View/TipView.cs b/HDL_ON/UI/UI2/FuntionControlView/Music/View/TipView.cs
index 56bcb04..82ae30a 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Music/View/TipView.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Music/View/TipView.cs
@@ -92,8 +92,8 @@
{
X = Application.GetRealWidth(194),
Y = Application.GetRealHeight(8),
- Width = Application.GetMinRealAverage(24),
- Height = Application.GetMinRealAverage(24),
+ Width = Application.GetRealWidth(24),
+ Height = Application.GetRealWidth(24),
UnSelectedImagePath = "MusicIcon/clear.png",
};
editBjView.AddChidren(clearIconBtn);
@@ -264,8 +264,8 @@
{
X = Application.GetRealWidth(194),
Y = Application.GetRealHeight(8),
- Width = Application.GetMinRealAverage(24),
- Height = Application.GetMinRealAverage(24),
+ Width = Application.GetRealWidth(24),
+ Height = Application.GetRealWidth(24),
UnSelectedImagePath = "MusicIcon/clear.png",
};
editBjView.AddChidren(clearIconBtn);
--
Gitblit v1.8.0