From 7167334c0e89dd84827d59e726123d14776e3a09 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期二, 16 六月 2020 11:14:13 +0800
Subject: [PATCH] 2020-06-16-1
---
HDL_ON/UI/Music/A31MyList.cs | 40 ++++++++++++++++++++++++----------------
1 files changed, 24 insertions(+), 16 deletions(-)
diff --git a/HDL_ON/UI/Music/A31MyList.cs b/HDL_ON/UI/Music/A31MyList.cs
index 033c614..4cc95ef 100644
--- a/HDL_ON/UI/Music/A31MyList.cs
+++ b/HDL_ON/UI/Music/A31MyList.cs
@@ -20,9 +20,17 @@
topView.clickBackBtn.MouseUpEventHandler += (sender, e) =>
{
- if (updateSelectedMusicThread == null || updateSelectedMusicThread.IsAlive)
+ if (updateSelectedMusicThread != null)
{
- updateSelectedMusicThread.Abort();
+ try
+ {
+ if (updateSelectedMusicThread.IsAlive)
+ {
+ updateSelectedMusicThread.Abort();
+ ///鍏抽棴绾跨▼
+ }
+ }
+ catch { }
}
this.RemoveFromParent();
};
@@ -68,7 +76,7 @@
}
/// <summary>
- ///
+ /// 鍔犺浇鏂囦欢澶筕iew鐨勬柟娉�
/// </summary>
void FileView()
{
@@ -109,16 +117,12 @@
playIconBtn.MouseUpEventHandler = (sender, e) =>
{
- if (list.MusicInfoList.Count == 0)
- {
- return;
- }
+
///鏌ユ壘褰撳墠鎾斁闊充箰鏄惁杩欎釜鍒楄〃
- var music = list.MusicInfoList.Find((c) => (c.URL == A31MusicModel.Current.A31PlayStatus.TrackURL) && (list.ListName == A31MusicModel.Current.A31PlayStatus.Artist));
if (playIconBtn.IsSelected)
{
- if (music != null && A31MusicModel.Current.A31PlayStatus.status == "play")
+ if (list.ListName == A31MusicModel.Current.A31PlayStatus.Artist && A31MusicModel.Current.A31PlayStatus.status == "play")
{
SendMethod.Pause(A31MusicModel.Current);
@@ -128,7 +132,12 @@
}
else
{
- if (music != null && A31MusicModel.Current.A31PlayStatus.status != "play")
+ if (list.MusicInfoList.Count == 0)
+ {
+ return;
+ }
+
+ if (list.ListName == A31MusicModel.Current.A31PlayStatus.Artist && A31MusicModel.Current.A31PlayStatus.status != "play")
{
SendMethod.Play(A31MusicModel.Current);
A31MusicModel.Current.A31PlayStatus.status = "play";
@@ -239,10 +248,10 @@
}
}
/// <summary>
- /// 瀹氭椂鏇存柊褰撳墠鎾斁闊充箰
+ /// 瀹氭椂鏇存柊鏂囦欢澶规挱鏀剧姸鎬�
/// </summary>
System.Threading.Thread updateSelectedMusicThread;
- public void UpdateSelectedMusic()
+ public void UpdateSelectedFile()
{
updateSelectedMusicThread = new System.Threading.Thread(() =>
{
@@ -259,8 +268,7 @@
var playBtn = (Button)view.GetChildren(1);//鐩存帴FrameLayout鐖舵帶浠舵壘鍒拌鎺т欢Button
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")
+ if (A31MusicModel.Current.A31PlayStatus.Artist == listIfon.ListName && A31MusicModel.Current.A31PlayStatus.status == "play")
{
playBtn.IsSelected = true;
}
@@ -274,10 +282,10 @@
});
}
- });
+ })
+ { IsBackground = true };
updateSelectedMusicThread.Start();
}
-
/// <summary>
/// 鎺ㄩ�佹挱鏀惧懡浠�
/// </summary>
--
Gitblit v1.8.0