From a9d1161b1df96e7ddad566335989a1444e433ef5 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期二, 28 三月 2023 11:54:45 +0800
Subject: [PATCH] 2023年03月28日11:52:02
---
HDL_ON/UI/UI2/FuntionControlView/Music/SendMethod.cs | 135 ++++++++++++++++++++++++++++++++------------
1 files changed, 97 insertions(+), 38 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Music/SendMethod.cs b/HDL_ON/UI/UI2/FuntionControlView/Music/SendMethod.cs
index ae44c70..d631763 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Music/SendMethod.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Music/SendMethod.cs
@@ -49,8 +49,7 @@
})
{ IsBackground = true }.Start();
}
- //璁板綍姝屾洸鎾斁鏃堕棿
- private int songPlayTime = -1;
+
/// <summary>
/// 鑾峰彇璁惧鏈�鏂扮殑鐘舵��
/// </summary>
@@ -60,7 +59,7 @@
try
{
//RefreshDeviceStatus(functionIds);
- //a31Music.LastDateTime = DateTime.Now;
+ a31Music.LastDateTime = DateTime.Now;
///浠庣紦瀛橀噷闈㈡煡鎵鹃煶涔愭挱鏀惧櫒瀵硅薄<鏀跺埌鎺ㄩ�佽繃鏉ョ殑鐘舵�佷細鏇存柊缂撳瓨鏁版嵁>
var allLocalFuntion = FunctionList.List.GetDeviceFunctionList();
var localFunction = allLocalFuntion.Find((obj) => obj.sid == sid);
@@ -70,13 +69,6 @@
}
///鏇存柊鐨勬暟鎹�
a31Music.functionMusic = localFunction;
- if (int.Parse(A31MusicModel.Current.functionMusic.GetAttrState(UI2.FuntionControlView.Music.KeyProperty.playing_time)) != songPlayTime)
- {
- ///姝屾洸璁板綍鏃堕棿鍜屽綋鍓嶆椂闂翠笉涓�鏍凤紝绔嬪嵆鏇存柊鏁版嵁鍙嶉鏃堕棿
- a31Music.LastDateTime = DateTime.Now;
- ///姝屾洸璁板綍鏃堕棿鍜屽綋鍓嶆椂闂翠笉涓�鏍凤紝绔嬪嵆鏇存柊姝屾洸鎾斁鏃堕棿
- songPlayTime = int.Parse(A31MusicModel.Current.functionMusic.GetAttrState(UI2.FuntionControlView.Music.KeyProperty.playing_time));
- }
}
catch { }
@@ -94,11 +86,10 @@
d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
d.Add("deviceIds", functionIds);
var responsePackNew = RequestServerhomeId(d, NewAPI.Api_Post_RefreshDeviceStatus, "鍒锋柊璁惧鐘舵��");
- if (responsePackNew.Code != "0" || responsePackNew.Data == null || responsePackNew.Data.ToString() == "")
+ if (!this.dataChecking(responsePackNew))
{
return;
}
-
}
catch { }
}
@@ -119,11 +110,12 @@
}
/// <summary>
- /// 鑾峰彇闊充箰鍒楄〃
+ /// 鑾峰彇褰撳墠鎾斁闊充箰鍒楄〃
/// </summary>
- /// <param name="music"></param>
+ /// <param name="music">闊充箰鎾斁鍣�</param>
+ /// <param name="action">鍥炶皟</param>
/// <returns></returns>
- public void GetPalyList(Function music)
+ public void GetCurrentPalyList(Function music, Action action)
{
try
{
@@ -131,43 +123,57 @@
d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
d.Add("deviceIds", new List<string> { music.deviceId });
var responsePackNew = RequestServerhomeId(d, NewAPI.Api_Post_PlayerList, "鑾峰彇闊充箰鍒楄〃");
- if (responsePackNew.Code != "0" || responsePackNew.Data == null || responsePackNew.Data.ToString() == "")
+ if (!this.dataChecking(responsePackNew))
{
return;
}
//鏁版嵁杩斿簭鍒楀寲涓篎unction瀵硅薄
var str = Newtonsoft.Json.JsonConvert.SerializeObject(responsePackNew.Data);
- var palyLists = Newtonsoft.Json.JsonConvert.DeserializeObject<List<PalyListInfo>>(str);
+ var palyLists = Newtonsoft.Json.JsonConvert.DeserializeObject<List<PalyerSongListInfo>>(str);
if (palyLists == null)
{
- palyLists = new List<PalyListInfo>();
+ palyLists = new List<PalyerSongListInfo>();
}
if (palyLists.Count > 0)
{
///榛樿鎷跨涓�涓垪琛�
- A31MusicModel.Current.palyLists = palyLists[0].playlist;
+ A31MusicModel.Current.CurrentPlayMusicInfoList = palyLists[0].playlist;
}
}
catch
{
}
+ finally
+ {
+ Application.RunOnMainThread(() =>
+ {
+ action();
+ });
+ }
}
/// <summary>
- /// 鑾峰彇鍒楄〃鍚嶅垪琛�
+ /// 鑾峰彇銆愬涓煶涔愭簮銆戝垪琛ㄥ悕鍒楄〃
/// </summary>
/// <param name="music"></param>
+ /// <param name="source">闊充箰婧愪负null,鏀寔澶氫釜婧愯幏鍙�</param>
/// <returns></returns>
- public List<GroupList> GetListName(Function music)
+ public List<GroupList> GetMultipleSourceListName(Function music, string source)
{
try
{
Dictionary<string, object> d = new Dictionary<string, object>();
d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
d.Add("gatewayId", DB_ResidenceData.Instance.HomeGateway.gatewayId);
- d.Add("deviceIds", new List<string> { music.deviceId });
+ Dictionary<string, object> deviceIds = new Dictionary<string, object>();
+ deviceIds.Add("deviceId", music.deviceId);
+ if (!string.IsNullOrEmpty(source))
+ {
+ deviceIds.Add("source", source);
+ }
+ d.Add("deviceInfos", new List<Dictionary<string, object>> { deviceIds });
var responsePackNew = RequestServerhomeId(d, NewAPI.Api_Post_GroupList, "鑾峰彇鍒楄〃鍚嶅垪琛�");
- if (responsePackNew.Code != "0" || responsePackNew.Data == null || responsePackNew.Data.ToString() == "")
+ if (!this.dataChecking(responsePackNew))
{
return new List<GroupList>();
}
@@ -185,13 +191,35 @@
return new List<GroupList>();
}
}
+
/// <summary>
- /// 鑾峰彇鍒楄〃闊充箰
+ /// 鑾峰彇銆愬崟涓煶涔愭簮銆戝垪琛ㄥ悕鍒楄〃(榛樿鍙栧畾鍒楄〃涓竴涓�)
+ /// </summary>
+ /// <param name="music"></param>
+ /// <param name="source">闊充箰婧�</param>
+ /// <returns></returns>
+ public GroupList GetSingleSourceListNameList(Function music, string source)
+ {
+ List<GroupList> groupList = this.GetMultipleSourceListName(music, source);
+ if (groupList.Count == 0)
+ {
+ return new GroupList();
+ }
+ ////榛樿鍙栧畾鍒楄〃涓竴涓�
+ return groupList.Count > 0 ? groupList[0] : new GroupList();
+ }
+
+
+
+
+ /// <summary>
+ /// 閫氳繃鍒楄〃鍚嶈幏鍙栥�愬涓瓕鏇插垪琛ㄣ��
/// </summary>
/// <param name="music"></param>
/// <param name="listName">鍒楄〃鍚�</param>
+ /// <param name="source">闊充箰婧�</param>
/// <returns></returns>
- public PalyList GetListMusic(Function music, string listName)
+ public List<PalyerSongListInfo> GetMultipleSongListM(Function music, string listName, string source)
{
try
{
@@ -202,34 +230,65 @@
d.Add("gatewayId", DB_ResidenceData.Instance.HomeGateway.gatewayId);
d2.Add("group", listName);
d1.Add("sid", music.sid);
+ if (!string.IsNullOrEmpty(source))
+ {
+ d1.Add("source", source);
+ }
d1.Add("groupList", new List<Dictionary<string, object>> { d2 });
d.Add("sidGroups", new List<Dictionary<string, object>> { d1 });
- var responsePackNew = RequestServerhomeId(d, NewAPI.Api_Post_GroupPlayerList, "鑾峰彇鍒楄〃闊充箰");
- if (responsePackNew.Code != "0" || responsePackNew.Data == null || responsePackNew.Data.ToString() == "")
+ var responsePackNew = RequestServerhomeId(d, NewAPI.Api_Post_GroupPlayerList, "閫氳繃鍒楄〃鍚嶈幏鍙栨瓕鏇插垪琛�");
+ if (!this.dataChecking(responsePackNew))
{
- return new PalyList();
+ return new List<PalyerSongListInfo>();
}
//鏁版嵁杩斿簭鍒楀寲涓篎unction瀵硅薄
var str = Newtonsoft.Json.JsonConvert.SerializeObject(responsePackNew.Data);
- var palyLists = Newtonsoft.Json.JsonConvert.DeserializeObject<List<PalyListInfo>>(str);
+ var palyLists = Newtonsoft.Json.JsonConvert.DeserializeObject<List<PalyerSongListInfo>>(str);
if (palyLists == null)
{
- palyLists = new List<PalyListInfo>();
+ return new List<PalyerSongListInfo>();
}
- if (palyLists.Count == 0)
- {
- return new PalyList();
- }
- //榛樿绗竴涓垪琛ㄩ噷闈㈢涓�涓煶涔愬垪琛�
- return palyLists[0].playlist.Count > 0 ? palyLists[0].playlist[0] : new PalyList();
+ return palyLists;
}
catch
{
- return new PalyList();
+ return new List<PalyerSongListInfo>();
}
+ }
+ /// <summary>
+ /// 閫氳繃鍒楄〃鍚嶈幏鍙栥�愬崟涓瓕鏇插垪琛ㄣ��(榛樿鍙栧畾鍒楄〃涓竴涓瓕鏇插垪琛�)
+ /// </summary>
+ /// <param name="music"></param>
+ /// <param name="listName">鍒楄〃鍚�</param>
+ /// <param name="source">闊充箰婧�</param>
+ /// <returns></returns>
+ public SongList GetSingleSongList(Function music, string listName, string source)
+ {
+ List<PalyerSongListInfo> listInfos = this.GetMultipleSongListM(music, listName, source);
+ if (listInfos.Count == 0)
+ {
+ return new SongList();
+ }
+ ////榛樿绗竴涓垪琛ㄩ噷闈㈢涓�涓煶涔愬垪琛�
+ SongList songList = listInfos[0].playlist.Count > 0 ? listInfos[0].playlist[0] : new SongList();
+ return songList;
+
+ }
+ /// <summary>
+ /// 妫�楠屾暟鎹洖澶嶆垚鍔熸垨鑰呭け璐�
+ /// </summary>
+ /// <param name="responsePackNew">鍥炲鏁版嵁瀵硅薄</param>
+ /// <returns></returns>
+ private bool dataChecking(ResponsePackNew responsePackNew)
+ {
+ if (responsePackNew.Code != "0" || responsePackNew.Data == null || responsePackNew.Data.ToString() == "")
+ {
+ return false;
+ }
+ return true;
}
/// <summary>
@@ -241,7 +300,7 @@
/// <returns></returns>
public ResponsePackNew RequestServerhomeId(object o, string api_Url, string tag, int mTimeout = 5)
{
- JObject jobject = JObject.Parse(Newtonsoft.Json.JsonConvert.SerializeObject(o));
+ JObject jobject = JObject.Parse(Newtonsoft.Json.JsonConvert.SerializeObject(o));
return UI2.Intelligence.Automation.Send.Current.RequestServerhomeId(jobject, api_Url, tag, mTimeout);
}
}
--
Gitblit v1.8.0