From e82cf12d701ebc716f85675ba63b6b024005d9b1 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期三, 27 五月 2020 11:36:23 +0800
Subject: [PATCH] 2020-05-27-1
---
HDL_ON/UI/Music/A31MyList.cs | 60 +++++++++++++++-----
HDL_ON/UI/Music/MusicMain.cs | 21 ++----
HDL_ON/UI/Music/View/MusicView.cs | 11 +++
HDL_ON/UI/Music/A31MyListMusic.cs | 20 ++++++
.vs/HDL_APP_Project/xs/sqlite3/storage.ide-shm | 0
.DS_Store | 0
.vs/HDL_APP_Project/xs/sqlite3/storage.ide | 0
.vs/HDL_APP_Project/xs/UserPrefs.xml | 23 ++++---
.vs/HDL_APP_Project/xs/sqlite3/storage.ide-wal | 0
9 files changed, 96 insertions(+), 39 deletions(-)
diff --git a/.DS_Store b/.DS_Store
index 3d17adf..10860c0 100644
--- a/.DS_Store
+++ b/.DS_Store
Binary files differ
diff --git a/.vs/HDL_APP_Project/xs/UserPrefs.xml b/.vs/HDL_APP_Project/xs/UserPrefs.xml
index fd47087..1284165 100644
--- a/.vs/HDL_APP_Project/xs/UserPrefs.xml
+++ b/.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,13 +1,16 @@
锘�<Properties StartupConfiguration="{09712674-2A38-407B-B1E2-560B2C352F9A}|Default">
- <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/Music/A31MusicSourcePage.cs">
+ <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/Music/View/MusicView.cs">
<Files>
- <File FileName="HDL_ON/UI/Music/A31PlayMusicPage.cs" Line="525" Column="23" />
- <File FileName="../鏃х増鏈琈usic/MyMusic.cs" Line="813" Column="70" />
- <File FileName="HDL_ON/UI/Music/A31MusicModel.cs" Line="64" Column="1" />
- <File FileName="HDL_ON/UI/Music/A31USBMusicList.cs" Line="19" Column="33" />
- <File FileName="HDL_ON/UI/Music/A31MyList.cs" Line="7" Column="27" />
- <File FileName="HDL_ON/UI/Music/A31MyListMusic.cs" Line="29" Column="46" />
- <File FileName="HDL_ON/UI/Music/A31MusicSourcePage.cs" Line="201" Column="36" />
+ <File FileName="HDL_ON/UI/Music/A31PlayMusicPage.cs" Line="494" Column="37" />
+ <File FileName="../鏃х増鏈琈usic/MyMusic.cs" Line="385" Column="21" />
+ <File FileName="HDL_ON/UI/Music/A31MusicModel.cs" Line="176" Column="1" />
+ <File FileName="HDL_ON/UI/Music/A31USBMusicList.cs" Line="91" Column="58" />
+ <File FileName="HDL_ON/UI/Music/A31MyList.cs" Line="257" Column="30" />
+ <File FileName="HDL_ON/UI/Music/A31MyListMusic.cs" Line="207" Column="61" />
+ <File FileName="HDL_ON/UI/Music/A31MusicSourcePage.cs" Line="204" Column="40" />
+ <File FileName="HDL_ON/UI/Music/MusicMain.cs" Line="215" Column="28" />
+ <File FileName="HDL_ON/UI/Music/SendMethod.cs" Line="298" Column="23" />
+ <File FileName="HDL_ON/UI/Music/View/MusicView.cs" Line="102" Column="23" />
</Files>
<Pads>
<Pad Id="ProjectPad">
@@ -17,7 +20,9 @@
<Node name="Common" expanded="True" />
<Node name="UI" expanded="True">
<Node name="Music" expanded="True">
- <Node name="A31MusicSourcePage.cs" selected="True" />
+ <Node name="View" expanded="True">
+ <Node name="MusicView.cs" selected="True" />
+ </Node>
</Node>
</Node>
</Node>
diff --git a/.vs/HDL_APP_Project/xs/sqlite3/storage.ide b/.vs/HDL_APP_Project/xs/sqlite3/storage.ide
index 6325d97..c9e950d 100644
--- a/.vs/HDL_APP_Project/xs/sqlite3/storage.ide
+++ b/.vs/HDL_APP_Project/xs/sqlite3/storage.ide
Binary files differ
diff --git a/.vs/HDL_APP_Project/xs/sqlite3/storage.ide-shm b/.vs/HDL_APP_Project/xs/sqlite3/storage.ide-shm
index 8bec6fa..fbfa6e6 100644
--- a/.vs/HDL_APP_Project/xs/sqlite3/storage.ide-shm
+++ b/.vs/HDL_APP_Project/xs/sqlite3/storage.ide-shm
Binary files differ
diff --git a/.vs/HDL_APP_Project/xs/sqlite3/storage.ide-wal b/.vs/HDL_APP_Project/xs/sqlite3/storage.ide-wal
index 1d6b710..26ff6fa 100644
--- a/.vs/HDL_APP_Project/xs/sqlite3/storage.ide-wal
+++ b/.vs/HDL_APP_Project/xs/sqlite3/storage.ide-wal
Binary files differ
diff --git a/HDL_ON/UI/Music/A31MyList.cs b/HDL_ON/UI/Music/A31MyList.cs
index a58e1f3..033c614 100644
--- a/HDL_ON/UI/Music/A31MyList.cs
+++ b/HDL_ON/UI/Music/A31MyList.cs
@@ -102,33 +102,60 @@
Height = Application.GetMinRealAverage(24),
UnSelectedImagePath = "MusicIcon/filePause.png",
SelectedImagePath = "MusicIcon/filePlay.png",
- Tag= list.ListName,
+ Tag= list,
};
addFlieRow.AddChidren(playIconBtn);
- playIconBtn.MouseUpEventHandler += (sender, e) =>
+ playIconBtn.MouseUpEventHandler = (sender, e) =>
{
+
if (list.MusicInfoList.Count == 0)
{
return;
}
- ///鍙栭殢鏈烘暟;
- var ra = new Random { }.Next(0, list.MusicInfoList.Count);
- ///鏌ユ壘褰撳墠鐨勯煶涔�;
- var songs = list.MusicInfoList[ra];
- //鐐瑰嚮鎸夐挳闅忔満鎾斁闊充箰
- System.Threading.Tasks.Task.Run(() =>
+
+ ///鏌ユ壘褰撳墠鎾斁闊充箰鏄惁杩欎釜鍒楄〃
+ var music = list.MusicInfoList.Find((c) => (c.URL == A31MusicModel.Current.A31PlayStatus.TrackURL) && (list.ListName == A31MusicModel.Current.A31PlayStatus.Artist));
+ if (playIconBtn.IsSelected)
{
- System.Threading.Thread.Sleep(50);
- Application.RunOnMainThread(() =>
+ if (music != null && A31MusicModel.Current.A31PlayStatus.status == "play")
{
- //绉婚櫎鐣岄潰
+
+ SendMethod.Pause(A31MusicModel.Current);
+ A31MusicModel.Current.A31PlayStatus.status = "pause";
+ }
+
+ }
+ else
+ {
+ if (music != null && A31MusicModel.Current.A31PlayStatus.status != "play")
+ {
+ SendMethod.Play(A31MusicModel.Current);
+ A31MusicModel.Current.A31PlayStatus.status = "play";
+ }
+ else
+ {
+ ///鍙栭殢鏈烘暟;
+ var ra = new Random { }.Next(0, list.MusicInfoList.Count);
+ ///鏌ユ壘褰撳墠鐨勯煶涔�;
+ var songs = list.MusicInfoList[ra];
+ //鐐瑰嚮鎸夐挳闅忔満鎾斁闊充箰
System.Threading.Tasks.Task.Run(() =>
{
- PushList(songs, list.ListName, list.MusicInfoList);
+ System.Threading.Thread.Sleep(50);
+ Application.RunOnMainThread(() =>
+ {
+ //绉婚櫎鐣岄潰
+ System.Threading.Tasks.Task.Run(() =>
+ {
+ PushList(songs, list.ListName, list.MusicInfoList);
+ });
+ });
});
- });
- });
+ }
+
+ }
+
};
//鏂囦欢鍚嶆帶浠�
Button fileNameBtn = new Button
@@ -230,7 +257,10 @@
{
RowLayout view = (RowLayout)middViewLayout.GetChildren(i);
var playBtn = (Button)view.GetChildren(1);//鐩存帴FrameLayout鐖舵帶浠舵壘鍒拌鎺т欢Button
- if (A31MusicModel.Current.A31PlayStatus.Artist == playBtn.Tag.ToString())
+ var listIfon = playBtn.Tag as FileListInfo;//寮哄埗杞崲涓篎ileListInfo绫诲瀷;
+ ///鏌ユ壘褰撳墠鎾斁闊充箰鏄惁杩欎釜鍒楄〃
+ var musics = listIfon.MusicInfoList.Find((c) => c.URL == A31MusicModel.Current.A31PlayStatus.TrackURL);
+ if (musics!=null&&A31MusicModel.Current.A31PlayStatus.Artist == listIfon.ListName && A31MusicModel.Current.A31PlayStatus.status == "play")
{
playBtn.IsSelected = true;
}
diff --git a/HDL_ON/UI/Music/A31MyListMusic.cs b/HDL_ON/UI/Music/A31MyListMusic.cs
index 754a81c..37266dc 100644
--- a/HDL_ON/UI/Music/A31MyListMusic.cs
+++ b/HDL_ON/UI/Music/A31MyListMusic.cs
@@ -65,10 +65,12 @@
//闃叉姝屾墜鍚嶅瓧涓虹┖鎶涘紓甯�
songs.Artist = " ";
}
- FrameLayout musicViewFl = new FrameLayout
+ RowLayout musicViewFl = new RowLayout
{
Width = Application.GetRealWidth(375),
Height = Application.GetRealHeight(44),
+ LineColor = Color.WhiteColor,
+ SubViewWidth = Application.GetRealWidth(90),//鏀瑰彉缂栬緫鎺т欢瀹藉害澶氬皯锛�
};
middViewLayout.AddChidren(musicViewFl);
//鍒楄〃褰撳墠鎾斁闊充箰鍥炬爣
@@ -177,7 +179,21 @@
{
loveIcon.IsSelected = false;
}
-
+ ///鍒犻櫎鎺т欢
+ var delBtn = new Button
+ {
+ BackgroundColor = Color.MusicDelColor,
+ Text = Language.StringByID(StringId.delMusic),
+ TextColor = Color.WhiteColor,
+ TextSize = TextSize.Text16,
+ };
+ musicViewFl.AddRightView(delBtn);
+ delBtn.MouseUpEventHandler += (sender, e) =>
+ {
+ fileListInfo.MusicInfoList.Remove(songs);
+ A31MusicModel.Save();
+ musicViewFl.RemoveFromParent();
+ };
//娣诲姞鍒版垜鐨勫垪琛�
Button addIcon = new Button
{
diff --git a/HDL_ON/UI/Music/MusicMain.cs b/HDL_ON/UI/Music/MusicMain.cs
index 4bfa00e..ba9b21f 100644
--- a/HDL_ON/UI/Music/MusicMain.cs
+++ b/HDL_ON/UI/Music/MusicMain.cs
@@ -81,7 +81,7 @@
else
{
clearA31Threads();
- verticalRefresh.RemoveAll();
+ //verticalRefresh.RemoveAll();
for (int i = 0; i < A31MusicModel.A31MusicModelList.Count; i++)
{
var a31player = A31MusicModel.A31MusicModelList[i];
@@ -203,19 +203,14 @@
{
musicView.playBtn.IsSelected = false;
}
- EventHandler<MouseEventArgs> clickPlay = (sender, e) =>
- {
- A31MusicModel.Current = a31player;//褰撳墠鎾斁鍣�
+ musicView.clickBtn.MouseUpEventHandler += (sender, e) =>
+ {
+ A31MusicModel.Current = a31player;//褰撳墠鎾斁鍣�
var a31PlayMusicPage = new A31PlayMusicPage();
- MainPage.BasePageView.AddChidren(a31PlayMusicPage);
- a31PlayMusicPage.Show();
- MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
- };
-
- musicView.singerBtn.MouseUpEventHandler += clickPlay;
- musicView.songNameBtn.MouseUpEventHandler += clickPlay;
- musicView.musicNameBtn.MouseUpEventHandler += clickPlay;
- musicView.regionBtn.MouseUpEventHandler += clickPlay;
+ MainPage.BasePageView.AddChidren(a31PlayMusicPage);
+ a31PlayMusicPage.Show();
+ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ };
///涓婁竴鏇茬偣鍑讳簨浠�
musicView.prevBtn.MouseDownEventHandler += (sender, e) =>
diff --git a/HDL_ON/UI/Music/View/MusicView.cs b/HDL_ON/UI/Music/View/MusicView.cs
index ddb89dd..db385d8 100644
--- a/HDL_ON/UI/Music/View/MusicView.cs
+++ b/HDL_ON/UI/Music/View/MusicView.cs
@@ -138,6 +138,16 @@
TextAlignment = TextAlignment.CenterLeft,
};
+
+ /// <summary>
+ /// 鐐瑰嚮浜嬩欢
+ /// </summary>
+ public Button clickBtn = new Button
+ {
+ Width = Application.GetRealWidth(130),
+ Height = Application.GetRealHeight(139),
+ };
+
/// <summary>
/// 涓婁竴鏇�
/// </summary>
@@ -191,6 +201,7 @@
musicIfonFl.AddChidren(singerBtn);
musicIfonFl.AddChidren(musicNameBtn);
musicIfonFl.AddChidren(regionBtn);
+ musicIfonFl.AddChidren(clickBtn);
musicIfonFl.AddChidren(prevBtn);
musicIfonFl.AddChidren(playBtn);
musicIfonFl.AddChidren(nextBtn);
--
Gitblit v1.8.0