From b562a582ac3a288193e6e4f57c5eff8a344305a4 Mon Sep 17 00:00:00 2001
From: wxr <wxr@hdlchina.com.cn>
Date: 星期五, 27 九月 2024 13:52:17 +0800
Subject: [PATCH] Update AndroidManifest.xml
---
HDL_ON/UI/UI2/FuntionControlView/Music/A31PlayMusicPage.cs | 103 +++++++++++++++++++++++++++++++++------------------
1 files changed, 67 insertions(+), 36 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Music/A31PlayMusicPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Music/A31PlayMusicPage.cs
index 71d6531..7a30610 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Music/A31PlayMusicPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Music/A31PlayMusicPage.cs
@@ -43,7 +43,7 @@
{
///1绉掑畾鏃舵洿鏂扮姸鎬�
- timerUpdateStatus();
+ TimerUpdateStatus();
#region ---鐣岄潰甯冨眬---
this.BackgroundColor = MusicColor.ViewColor;
topView = new TopView();
@@ -71,7 +71,7 @@
#endregion
#region ---鐣岄潰鐐瑰嚮浜嬩欢---
- playView.collectIconBtn.Visible = false;//鍏堟殏鏃堕殣钘忔敹钘忓姛鑳�
+ //playView.collectIconBtn.Visible = false;//鍏堟殏鏃堕殣钘忔敹钘忓姛鑳�
//鏀惰棌鍥炬爣浜嬩欢
playView.collectIconBtn.MouseUpEventHandler += (sender, e) =>
{
@@ -84,7 +84,7 @@
{
A31MusicModel.Current.functionMusic.collect = false;
}
-
+ A31MusicModel.Current.functionMusic.CollectFunction();
};
///鍒囨崲鎾斁妯″紡鐐瑰嚮浜嬩欢;
playView.playOrderBtn.MouseUpEventHandler += (sender, e) =>
@@ -145,7 +145,7 @@
Dictionary<string, string> dic = new Dictionary<string, string>();
dic.Add(KeyProperty.mode, modeValueString);
//鍙戦�佹帶鍒舵寚浠�
- SendMethod.mMethod.SendControlCommand(A31MusicModel.Current.functionMusic, dic);
+ SendMethod.Current.SendControlCommand(A31MusicModel.Current.functionMusic, dic);
};
///娣诲姞鍠滅埍鐐瑰嚮浜嬩欢;
playView.loveBtn.MouseUpEventHandler += (sender, e) =>
@@ -161,7 +161,7 @@
return name == musicInfo.name;
}))
{
- A31MusicModel.Current.LoveMusicInfoList.Add(new Songs { name = name, time = songTime });
+ A31MusicModel.Current.LoveMusicInfoList.Add(new SongInfo { name = name, time = songTime });
}
}
else
@@ -182,17 +182,31 @@
UI2.FuntionControlView.Music.View.MyListView myListView = new UI2.FuntionControlView.Music.View.MyListView();
myListView.frameLayout(this, A31MusicModel.Current);
myListView.dialogFra.AddChidren(loading);//dialogFra鍒锋柊鍥炬爣鐖舵帶浠�
+ loading.Start();
///涓嬫媺鍒锋柊
myListView.verticalScrolViewLayout.BeginHeaderRefreshingAction += () =>
{
- System.Threading.Tasks.Task.Run(() =>
+ myListView.verticalScrolViewLayout.EndHeaderRefreshing(); //缁撴潫鍒锋柊
+ loading.Start();
+ System.Threading.Tasks.Task.Run((() =>
{
try
{
- A31MusicModel.Current.palyLists.Clear();
- if (A31MusicModel.Current.palyLists.Count == 0)
+ A31MusicModel.Current.CurrentPlayMusicInfoList.Clear();
+ if (A31MusicModel.Current.CurrentPlayMusicInfoList.Count == 0)
{
- SendMethod.mMethod.GetPalyList(A31MusicModel.Current.functionMusic);
+ SendMethod.Current.GetCurrentPalyList(A31MusicModel.Current.functionMusic, () =>
+ {
+
+ Application.RunOnMainThread(() =>
+ {
+ myListView.verticalScrolViewLayout.RemoveAll();
+ var listName = A31MusicModel.Current.functionMusic.GetAttrState(KeyProperty.playlist_name);
+ var source = A31MusicModel.Current.functionMusic.GetAttrState(KeyProperty.source);
+ var musicList = A31MusicModel.Current.GetSongList(listName);
+ A31SongPlay.SongListView(myListView.verticalScrolViewLayout, musicList, listName, source, myListView.popFra);
+ });
+ });
}
}
@@ -203,15 +217,17 @@
{
Application.RunOnMainThread(() =>
{
- myListView.verticalScrolViewLayout.EndHeaderRefreshing();
- myListView.verticalScrolViewLayout.RemoveAll();
- var listName = A31MusicModel.Current.functionMusic.GetAttrState(KeyProperty.playlist_name);
- var musicList = A31MusicModel.Current.GetSongList(listName);
- A31SongPlay.SongListView(myListView.verticalScrolViewLayout, musicList, listName, myListView.popFra);
+ loading.Hide();
+ //myListView.verticalScrolViewLayout.EndHeaderRefreshing();
+ //myListView.verticalScrolViewLayout.RemoveAll();
+ //var listName = A31MusicModel.Current.functionMusic.GetAttrState(KeyProperty.playlist_name);
+ //var source = A31MusicModel.Current.functionMusic.GetAttrState(KeyProperty.source);
+ //var musicList = A31MusicModel.Current.GetSongList(listName);
+
+ //A31SongPlay.SongListView(myListView.verticalScrolViewLayout, musicList, listName, source, myListView.popFra);
});
}
- });
- //缁撴潫鍒锋柊
+ }));
};
///绉婚櫎鐣岄潰
@@ -220,14 +236,14 @@
myListView.popFra.RemoveFromParent();
};
myListView.backIextBtn.MouseUpEventHandler += removeFromParentView;
- myListView.popFra.MouseUpEventHandler += removeFromParentView;
+ //myListView.popFra.MouseUpEventHandler += removeFromParentView;
#endregion
//var listName = A31MusicModel.Current.functionMusic.GetAttribute("playlist_name").ToString();
//var musicList = A31MusicModel.Current.GetSongList(listName);
//new A31SongPlay { }.SongListView(myListView.verticalScrolViewLayout, musicList, listName);
- PlayListView(myListView.popFra, myListView.verticalScrolViewLayout);
- UpdateSelectedMusic(myListView.popFra, myListView.verticalScrolViewLayout);
+ this.PlayListView(myListView.popFra, myListView.verticalScrolViewLayout, loading);
+ this.UpdateSelectedMusic(myListView.popFra, myListView.verticalScrolViewLayout);
};
///闊抽噺鍥炬爣鐐瑰嚮浜嬩欢
@@ -249,7 +265,7 @@
A31MusicModel.Current.functionMusic.SetAttrState(KeyProperty.volume, startVolume);
Dictionary<string, string> dic = new Dictionary<string, string>();
dic.Add(KeyProperty.volume, startVolume.ToString());
- SendMethod.mMethod.SendControlCommand(A31MusicModel.Current.functionMusic, dic);
+ SendMethod.Current.SendControlCommand(A31MusicModel.Current.functionMusic, dic);
}
};
@@ -263,7 +279,7 @@
A31MusicModel.Current.functionMusic.SetAttrState(KeyProperty.song_step, ValueProperty.down);
Dictionary<string, string> dic = new Dictionary<string, string>();
dic.Add(KeyProperty.song_step, ValueProperty.up);
- SendMethod.mMethod.SendControlCommand(A31MusicModel.Current.functionMusic, dic);
+ SendMethod.Current.SendControlCommand(A31MusicModel.Current.functionMusic, dic);
};
playView.prevBtn.MouseUpEventHandler += (sender, e) =>
@@ -288,7 +304,7 @@
A31MusicModel.Current.functionMusic.SetAttrState(KeyProperty.on_off, status);
Dictionary<string, string> dic = new Dictionary<string, string>();
dic.Add(KeyProperty.on_off, status);
- SendMethod.mMethod.SendControlCommand(A31MusicModel.Current.functionMusic, dic);
+ SendMethod.Current.SendControlCommand(A31MusicModel.Current.functionMusic, dic);
};
///涓嬩竴鏇茬偣鍑讳簨浠�
playView.nextBtn.MouseDownEventHandler += (sender, e) =>
@@ -297,7 +313,7 @@
A31MusicModel.Current.functionMusic.SetAttrState(KeyProperty.song_step, ValueProperty.down);
Dictionary<string, string> dic = new Dictionary<string, string>();
dic.Add(KeyProperty.song_step, ValueProperty.down);
- SendMethod.mMethod.SendControlCommand(A31MusicModel.Current.functionMusic, dic);
+ SendMethod.Current.SendControlCommand(A31MusicModel.Current.functionMusic, dic);
};
playView.nextBtn.MouseUpEventHandler += (sender, e) =>
{
@@ -329,7 +345,7 @@
/// <summary>
/// 瀹氭椂鏇存柊鐘舵��
/// </summary>
- void timerUpdateStatus()
+ void TimerUpdateStatus()
{
timerThread = new System.Threading.Thread((obj) =>
{
@@ -449,7 +465,7 @@
if (A31MusicModel.Current.functionMusic.GetAttrState(KeyProperty.on_off) == ValueProperty.on)
{
//闊充箰鍦ㄦ挱鏀炬椂锛屽啀璁＄畻鎾斁鏃堕棿(鐜板湪鏃堕棿=鍘熸潵鏃堕棿+1绉�)
- playSecond += (int)(DateTime.Now - A31MusicModel.Current.LastDateTime).TotalSeconds;
+ //playSecond += (int)(DateTime.Now - A31MusicModel.Current.LastDateTime).TotalSeconds;
playSecond += 1;//琛ㄧず鍔犱笂绛夊緟鐨勬椂闂�1s
///姝屾洸璁板綍鏆傛椂鏃堕棿鍐欏叆缂撳瓨锛�
A31MusicModel.Current.functionMusic.SetAttrState(KeyProperty.playing_time, playSecond);
@@ -597,24 +613,34 @@
/// 鍔犺浇鎾斁闊充箰鍒楄〃View
/// </summary>
/// <param name="verticalScrolViewLayout"></param>
- void PlayListView(FrameLayout frameLayout, VerticalRefreshLayout verticalScrolViewLayout)
+ private void PlayListView(FrameLayout frameLayout, VerticalRefreshLayout verticalScrolViewLayout, Loading loading)
{
verticalScrolViewLayout.RemoveAll();
- //鑾峰彇鎾斁鍣ㄥ悕绉�
var listName = A31MusicModel.Current.functionMusic.GetAttrState(KeyProperty.playlist_name);
+ var source = A31MusicModel.Current.functionMusic.GetAttrState(KeyProperty.source);
//鑾峰彇缂撳瓨姝屾洸鍒楄〃
var musicList = A31MusicModel.Current.GetSongList(listName);
+ loading.Start();
if (musicList.Count == 0)
{
- System.Threading.Tasks.Task.Run(() =>
+ System.Threading.Tasks.Task.Run((() =>
{
try
{
- A31MusicModel.Current.palyLists.Clear();
- if (A31MusicModel.Current.palyLists.Count == 0)
+ A31MusicModel.Current.CurrentPlayMusicInfoList.Clear();
+ if (A31MusicModel.Current.CurrentPlayMusicInfoList.Count == 0)
{
//鑾峰彇姝屾洸鍒楄〃
- SendMethod.mMethod.GetPalyList(A31MusicModel.Current.functionMusic);
+ SendMethod.Current.GetCurrentPalyList(A31MusicModel.Current.functionMusic, () =>
+ {
+
+ Application.RunOnMainThread(() =>
+ {
+ musicList = A31MusicModel.Current.GetSongList(listName);
+ A31SongPlay.SongListView(verticalScrolViewLayout, musicList, listName, source, frameLayout);
+
+ });
+ });
}
}
@@ -625,21 +651,26 @@
{
Application.RunOnMainThread(() =>
{
- musicList = A31MusicModel.Current.GetSongList(listName);
- A31SongPlay.SongListView(verticalScrolViewLayout, musicList, listName, frameLayout);
+ loading.Hide();
+ //musicList = A31MusicModel.Current.GetSongList(listName);
+ //A31SongPlay.SongListView(verticalScrolViewLayout, musicList, listName, source, frameLayout);
});
}
- });
+ }));
}
else
{
- A31SongPlay.SongListView(verticalScrolViewLayout, musicList, listName, frameLayout);
+ Application.RunOnMainThread(() =>
+ {
+ loading.Hide();
+ A31SongPlay.SongListView(verticalScrolViewLayout, musicList, listName, source, frameLayout);
+ });
}
}
/// <summary>
/// 瀹氭椂鏇存柊褰撳墠鎾斁闊充箰
/// </summary>
- void UpdateSelectedMusic(FrameLayout frameLayout, VerticalRefreshLayout middViewLayout)
+ private void UpdateSelectedMusic(FrameLayout frameLayout, VerticalRefreshLayout middViewLayout)
{
UpdateThread.updateCurrMusicThread(frameLayout, middViewLayout, A31MusicModel.Current);
}
--
Gitblit v1.8.0