From 0c1b0cdf903114c4214f6b9298ecd440972a42b5 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 14 一月 2022 13:13:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wjc' into wxr0114
---
HDL_ON/UI/UI2/FuntionControlView/Music/A31MyList.cs | 82 ++++------------------------------------
1 files changed, 9 insertions(+), 73 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Music/A31MyList.cs b/HDL_ON/UI/UI2/FuntionControlView/Music/A31MyList.cs
index 2e8ac86..fa2a7c6 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Music/A31MyList.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Music/A31MyList.cs
@@ -101,71 +101,7 @@
UnSelectedImagePath = "MusicIcon/fileList.png",
};
addFlieRow.AddChidren(fileIconBtn);
- //鎾斁/鏆傚仠鍥炬爣
- Button playIconBtn = new Button
- {
- X = Application.GetRealWidth(78),
- Y = Application.GetRealHeight(70),
- Width = Application.GetRealWidth(24),
- Height = Application.GetRealWidth(24),
- UnSelectedImagePath = "MusicIcon/filePause.png",
- SelectedImagePath = "MusicIcon/filePlay.png",
- Tag= list,
- };
- addFlieRow.AddChidren(playIconBtn);
-
- playIconBtn.MouseUpEventHandler = (sender, e) =>
- {
-
-
-
- ///鏌ユ壘褰撳墠鎾斁闊充箰鏄惁杩欎釜鍒楄〃
- if (playIconBtn.IsSelected)
- {
- if (list.ListName == A31MusicModel.Current.A31PlayStatus.Artist && A31MusicModel.Current.A31PlayStatus.status == "play")
- {
-
- SendMethod.Pause(A31MusicModel.Current);
- A31MusicModel.Current.A31PlayStatus.status = "pause";
- }
-
- }
- else
- {
- 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";
- }
- else
- {
- ///鍙栭殢鏈烘暟;
- var ra = new Random { }.Next(0, list.MusicInfoList.Count);
- ///鏌ユ壘褰撳墠鐨勯煶涔�;
- var songs = list.MusicInfoList[ra];
- //鐐瑰嚮鎸夐挳闅忔満鎾斁闊充箰
- System.Threading.Tasks.Task.Run(() =>
- {
- System.Threading.Thread.Sleep(50);
- Application.RunOnMainThread(() =>
- {
- //绉婚櫎鐣岄潰
- System.Threading.Tasks.Task.Run(() =>
- {
- SendMethod.PushList(songs, list.ListName, list.MusicInfoList,A31MusicModel.Current, "鎴戠殑鍒楄〃");
- });
- });
- });
- }
-
- }
-
- };
+
//鏂囦欢鍚嶆帶浠�
Button fileNameBtn = new Button
{
@@ -268,14 +204,14 @@
var playBtn = (Button)view.GetChildren(1);//鐩存帴FrameLayout鐖舵帶浠舵壘鍒拌鎺т欢Button
var listIfon = playBtn.Tag as FileListInfo;//寮哄埗杞崲涓篎ileListInfo绫诲瀷;
///鏌ユ壘褰撳墠鎾斁闊充箰鏄惁杩欎釜鍒楄〃
- if (A31MusicModel.Current.A31PlayStatus.Artist == listIfon.ListName && A31MusicModel.Current.A31PlayStatus.status == "play")
- {
- playBtn.IsSelected = true;
- }
- else
- {
- playBtn.IsSelected = false;
- }
+ //if (A31MusicModel.Current.A31PlayStatus.Artist == listIfon.ListName && A31MusicModel.Current.A31PlayStatus.status == "play")
+ //{
+ // playBtn.IsSelected = true;
+ //}
+ //else
+ //{
+ // playBtn.IsSelected = false;
+ //}
}
}
catch { }
--
Gitblit v1.8.0