From 258d1675d02d3610cb302514fb5c86ab68ee6571 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期一, 25 五月 2020 17:51:13 +0800
Subject: [PATCH] 2020-05-25-1
---
HDL_ON/UI/Music/A31LoveList.cs | 40 +++++++++++++++++++++-------------------
1 files changed, 21 insertions(+), 19 deletions(-)
diff --git a/HDL_ON/UI/Music/A31LoveList.cs b/HDL_ON/UI/Music/A31LoveList.cs
index f5f303b..4937a67 100644
--- a/HDL_ON/UI/Music/A31LoveList.cs
+++ b/HDL_ON/UI/Music/A31LoveList.cs
@@ -45,7 +45,7 @@
{
RowLayout addFlieRow = new RowLayout
{
- Height = Application.GetRealHeight(122),
+ Height = Application.GetRealHeight(104),
LineColor = Color.WhiteColor,
SubViewWidth = Application.GetRealWidth(90),//鏀瑰彉缂栬緫鎺т欢瀹藉害澶氬皯锛�
};
@@ -55,16 +55,16 @@
{
X = Application.GetRealWidth(16),
Y = Application.GetRealHeight(8),
- Width = Application.GetMinRealAverage(106),
- Height = Application.GetMinRealAverage(106),
+ Width = Application.GetMinRealAverage(88),
+ Height = Application.GetMinRealAverage(88),
};
addFlieRow.AddChidren(fileIconBtn);
//鎾斁/鏆傚仠鍥炬爣
Button playIconBtn = new Button
{
- X = Application.GetRealWidth(94),
- Y = Application.GetRealHeight(86),
+ X = Application.GetRealWidth(78),
+ Y = Application.GetRealHeight(70),
Width = Application.GetMinRealAverage(24),
Height = Application.GetMinRealAverage(24),
UnSelectedImagePath = "MusicIcon/filePause.png",
@@ -80,7 +80,7 @@
Button fileNameBtn = new Button
{
X = fileIconBtn.Right + Application.GetRealWidth(16),
- Y = Application.GetRealHeight(51),
+ Y = Application.GetRealHeight(42),
Width = Application.GetRealWidth(217),
Height = Application.GetRealHeight(20),
TextColor = Color.TextColor,
@@ -90,12 +90,12 @@
addFlieRow.AddChidren(fileNameBtn);
if (i == 0)
{
- fileIconBtn.UnSelectedImagePath = "MusicIcon/loveList.png";
+ fileIconBtn.UnSelectedImagePath = "MusicIcon/loveMusic.png";
fileNameBtn.TextID = StringId.a31Music;
}
else
{
- fileIconBtn.UnSelectedImagePath = "MusicIcon/radioList.png";
+ fileIconBtn.UnSelectedImagePath = "MusicIcon/loveRadio.png";
fileNameBtn.TextID = StringId.radioLove;
}
@@ -103,31 +103,33 @@
{
X = fileIconBtn.Right + Application.GetRealWidth(16),
Width = Application.GetRealWidth(375 - 138),
- Height = Application.GetRealHeight(122),
+ Height = Application.GetRealHeight(104),
};
addFlieRow.AddChidren(clickBtn);
clickBtn.MouseUpEventHandler += (sender, e) =>
{
- List<MusicInfo> loveList = new List<MusicInfo>();
- loveList.Clear();
if (fileNameBtn.Text == Language.StringByID(StringId.a31Music))
{
///鍠滅埍闊充箰鍒楄〃
- loveList.AddRange(A31MusicModel.Current.LoveMusicInfoList);
+ A31LoveMusicList a31LoveMusicList = new A31LoveMusicList();
+ MainPage.BasePageView.AddChidren(a31LoveMusicList);
+ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ a31LoveMusicList.Show();
+ a31LoveMusicList.UpdateSelectedMusic();
}
else
{
///鍠滅埍鐢靛彴鍒楄〃
- loveList.AddRange(A31MusicModel.Current.LoveRadioInfoList);
+ A31LoveRadioList a31LoveRadioList = new A31LoveRadioList();
+ MainPage.BasePageView.AddChidren(a31LoveRadioList);
+ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ a31LoveRadioList.Show();
+ a31LoveRadioList.UpdateSelectedMusic();
}
- A31LoveMusicList a31LoveMusicList = new A31LoveMusicList();
- MainPage.BasePageView.AddChidren(a31LoveMusicList);
- MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
- a31LoveMusicList.Show(fileNameBtn.Text, loveList);
- a31LoveMusicList.UpdateSelectedMusic();
+
};
}
}
}
-}
+}
--
Gitblit v1.8.0