From 611786df5108dca0bdcff03834cc285cba4b8e61 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期二, 13 十月 2020 16:48:43 +0800
Subject: [PATCH] 2020-10-13-1
---
HDL_ON/UI/UI2/FuntionControlView/Music/MusicMain.cs | 32 +++++++++++++++++++-------------
1 files changed, 19 insertions(+), 13 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Music/MusicMain.cs b/HDL_ON/UI/UI2/FuntionControlView/Music/MusicMain.cs
index 3b748fe..5a3e74d 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Music/MusicMain.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Music/MusicMain.cs
@@ -8,19 +8,27 @@
public class MusicMain : FrameLayout
{
-
+ /// <summary>
+ /// MusicMain瀵硅薄鏋勯�犲嚱鏁�
+ /// </summary>
public MusicMain()
{
Tag = "MusicMain";
//杩涙潵闊充箰鍒楄〃鐣岄潰鍏堢Щ闄や箣鍓嶇嚎绋�;
A31MusicModel.RemoveListThread();
}
+ /// <summary>
+ /// 閲嶅啓RemoveFromParent鏂规硶
+ /// </summary>
public override void RemoveFromParent()
{
base.RemoveFromParent();
clearA31Threads();
A31MusicModel.ReadMusicStates();//杩涙潵娌℃湁闊充箰琚敹钘忚繃锛岄��鍑烘湁闊充箰琚敹钘忚繃
}
+ /// <summary>
+ /// 鍒涘缓绾跨▼鍒楄〃
+ /// </summary>
static List<System.Threading.Thread> threadLists = new List<System.Threading.Thread>();
/// <summary>
/// 绉婚櫎绾跨▼
@@ -35,6 +43,7 @@
threadLists.Remove(thread);
if (thread.IsAlive)
{
+ ///寮哄埗绾跨▼鎶涘紓甯�
thread.Abort();
}
}
@@ -44,19 +53,19 @@
}
}
}
-
-
/// <summary>
/// 鏄剧ず鍔犺浇鐣岄潰
/// </summary>
public static Loading loading = new Loading();
+ /// <summary>
+ /// 瀹氫箟鍏ㄥ眬瀵硅薄
+ /// </summary>
VerticalRefreshLayout verticalRefresh;
-
public void Show()
{
#region 鐣岄潰甯冨眬
- this.BackgroundColor = Color.ViewColor;
+ this.BackgroundColor = MusicColor.ViewColor;
var topView = new TopView();
this.AddChidren(topView.TopFLayoutView());
topView.topNameBtn.TextID =StringId.a31Music;
@@ -135,7 +144,10 @@
});
}
}
-
+ /// <summary>
+ /// 鍒锋柊鎾斁鍣ㄥ垪琛�
+ /// </summary>
+ /// <param name="Yes">鏄惁鏄剧ず鍒锋柊鍥炬爣</param>
void SeachMusic(bool Yes = false)
{
for (int i = 0; i < A31MusicModel.A31MusicModelList.Count; i++)
@@ -219,10 +231,8 @@
{
MusicView musicView = new MusicView();
musicView.View(verticalRefresh);
- musicView.singerBtn.Text = a31player.A31PlayStatus.Artist;
musicView.songNameBtn.Text = a31player.A31PlayStatus.Title;
musicView.musicNameBtn.Text = new View.DialogView { }.NamePlayer(a31player);
-
if (a31player.IsEnd)
{
musicView.muiscFl.Height = Application.GetRealHeight(12 + 139 + 12);
@@ -260,7 +270,7 @@
{
if (a31player.ServerClientType == 0)
{
- new View.DialogView { }.PlayMergence();
+ new View.DialogView { }.PlayMergence(a31player);
}
else if (a31player.ServerClientType == 1)
{
@@ -282,7 +292,6 @@
};
musicView.musicIfonFl.MouseUpEventHandler += clickPlayView;
musicView.clickBtn.MouseUpEventHandler += clickPlayView;//
- musicView.singerBtn.MouseUpEventHandler += clickPlayView;
musicView.songNameBtn.MouseUpEventHandler += clickPlayView;//
musicView.musicNameBtn.MouseUpEventHandler += clickPlayView;
musicView.regionBtn.MouseUpEventHandler += clickPlayView;//
@@ -336,7 +345,6 @@
SendMethod.ReadStatus(a31player);
Application.RunOnMainThread(() =>
{
- musicView.singerBtn.Text = a31player.A31PlayStatus.Artist;
musicView.songNameBtn.Text = a31player.A31PlayStatus.Title;
musicView.musicNameBtn.Text = new View.DialogView { }.NamePlayer(a31player);
if (a31player.A31PlayStatus.status == "play")
@@ -377,8 +385,6 @@
musicThread.Start();
threadLists.Add(musicThread);
}
-
-
/// <summary>
/// 璇诲彇涓讳粠鍏崇郴
/// </summary>
--
Gitblit v1.8.0