From fd888555a4758e30c07799a09ae146f1746425f1 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 22 十二月 2021 18:17:18 +0800
Subject: [PATCH] 2021-12-22-01
---
HDL_ON/UI/UI2/FuntionControlView/Music/A31MusicSourcePage.cs | 2
HDL_ON/DAL/Server/HttpUtil.cs | 4 +-
HDL_ON/UI/UI2/FuntionControlView/Music/A31PlayMusicPage.cs | 17 ++++----
HDL_ON/UI/UI2/FuntionControlView/Music/A31MusicFileList.cs | 4 +-
HDL_ON/UI/UI2/FuntionControlView/Music/A31MusicModel.cs | 23 ++++++++++-
HDL_ON/UI/UI2/FuntionControlView/Music/A31SongPlay.cs | 2
HDL_ON/UI/UI2/FuntionControlView/Music/SendMethod.cs | 14 ++++--
7 files changed, 44 insertions(+), 22 deletions(-)
diff --git a/HDL_ON/DAL/Server/HttpUtil.cs b/HDL_ON/DAL/Server/HttpUtil.cs
index 315e9a2..6c692b6 100644
--- a/HDL_ON/DAL/Server/HttpUtil.cs
+++ b/HDL_ON/DAL/Server/HttpUtil.cs
@@ -17,8 +17,8 @@
/// 鍥哄畾鍩熷悕,姝ｅ紡鐜
/// 鍏叡鍩熷悕灏辫繎瑙ｆ瀽
/// </summary>
- public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com";
- //public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com";//mmmm
+ //public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com";
+ public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com";//mmmm
/// <summary>
/// RegionMark
/// </summary>
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Music/A31MusicFileList.cs b/HDL_ON/UI/UI2/FuntionControlView/Music/A31MusicFileList.cs
index 779d161..96b11c8 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Music/A31MusicFileList.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Music/A31MusicFileList.cs
@@ -59,9 +59,9 @@
public void FileView()
{
middViewLayout.RemoveAll();
- for (int i = 0; i < A31MusicModel.Current.palyListInfos.Count; i++)
+ for (int i = 0; i < A31MusicModel.Current.palyLists.Count; i++)
{
- var list = A31MusicModel.Current.palyListInfos[i];
+ var list = A31MusicModel.Current.palyLists[i];
RowLayout addFlieRow = new RowLayout
{
Height = Application.GetRealHeight(104),
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Music/A31MusicModel.cs b/HDL_ON/UI/UI2/FuntionControlView/Music/A31MusicModel.cs
index 15371bc..52b7c03 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Music/A31MusicModel.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Music/A31MusicModel.cs
@@ -180,7 +180,7 @@
/// <summary>
/// 鍒楄〃
/// </summary>
- public List<PalyListInfo> palyListInfos = new List<PalyListInfo>();
+ public List<PalyList> palyLists = new List<PalyList>();
/// <summary>
/// 鍠滅埍闊充箰鍒楄〃
@@ -277,7 +277,7 @@
/// <returns></returns>
public List<Songs> GetSongList(string listName)
{
- var list = palyListInfos.Find((o)=>o.group==listName);
+ var list = palyLists.Find((o)=>o.group==listName);
if (list==null) {
return new List<Songs>();
}
@@ -361,11 +361,28 @@
public string version = string.Empty;
public string uuid = string.Empty;
}
+
+ [System.Serializable]
+ /// <summary>
+ /// 鏀寔澶氫釜闊充箰
+ /// </summary>
+ public class PalyListInfo
+ {
+ /// <summary>
+ /// 闊充箰sid
+ /// </summary>
+ public string sid = string.Empty;
+ /// <summary>
+ /// 瑙ｉ噴澶氫釜闊充箰
+ /// </summary>
+ public List<PalyList> playlist = new List<PalyList>();
+ }
+
[System.Serializable]
/// <summary>
/// 鍒楄〃淇℃伅
/// </summary>
- public class PalyListInfo
+ public class PalyList
{
/// <summary>
/// 鍒楄〃鍚�
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Music/A31MusicSourcePage.cs b/HDL_ON/UI/UI2/FuntionControlView/Music/A31MusicSourcePage.cs
index 572d534..bf32937 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Music/A31MusicSourcePage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Music/A31MusicSourcePage.cs
@@ -184,7 +184,7 @@
{
try
{
- if (A31MusicModel.Current.palyListInfos.Count == 0)
+ if (A31MusicModel.Current.palyLists.Count == 0)
{
SendMethod.sendMethod.GetPalyList(A31MusicModel.Current.functionMusic);
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Music/A31PlayMusicPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Music/A31PlayMusicPage.cs
index 284aadc..5a8636c 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Music/A31PlayMusicPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Music/A31PlayMusicPage.cs
@@ -85,18 +85,18 @@
//蹇繘婊戝姩寮硅捣浜嬩欢;
playView.diyArcSeekBar.OnStopTrackingTouchEvent+= (sender, e) =>
{
- int totalSecond = (int)(playView.diyArcSeekBar.Progress * 1.0f / 100 * int.Parse(A31MusicModel.Current.functionMusic.GetAttrState("song_time")));
- //鍒嗛挓
- int Minute = totalSecond / 60;
- //绉掗挓
- int Second = totalSecond % 60;
- string time = "00" + ":" + (Minute.ToString().Length < 2 ? "0" + Minute.ToString() : Minute.ToString()) + ":" + (Second.ToString().Length < 2 ? "0" + Second.ToString() : Second.ToString());
+ //int totalSecond = (int)(playView.diyArcSeekBar.Progress * 1.0f / 100 * int.Parse(A31MusicModel.Current.functionMusic.GetAttrState("song_time")));
+ ////鍒嗛挓
+ //int Minute = totalSecond / 60;
+ ////绉掗挓
+ //int Second = totalSecond % 60;
+ //string time = "00" + ":" + (Minute.ToString().Length < 2 ? "0" + Minute.ToString() : Minute.ToString()) + ":" + (Second.ToString().Length < 2 ? "0" + Second.ToString() : Second.ToString());
//SendMethod.Seek(time, A31MusicModel.Current);
//Dictionary<string, string> dic = new Dictionary<string, string>();
//dic.Add("mode", modeValueString);
//SendMethod.sendMethod.SendControlCommand(A31MusicModel.Current.functionMusic, dic);
- A31MusicModel.Current.A31PlayStatus.curpos = (DateTime.Parse(time) - DateTime.Parse("00:00:00")).TotalMilliseconds.ToString();
+ // A31MusicModel.Current.A31PlayStatus.curpos = (DateTime.Parse(time) - DateTime.Parse("00:00:00")).TotalMilliseconds.ToString();
};
///鍒囨崲鎾斁妯″紡鐐瑰嚮浜嬩欢;
playView.playOrderBtn.MouseUpEventHandler += (sender, e) =>
@@ -418,7 +418,8 @@
}
//鏇存柊鎾斁鍣ㄩ煶閲忕粰绯荤粺闊抽噺
Volume.MusicVolume = playView.volSeekBar.Progress;
- //褰撳墠鎾斁闊充箰鏃堕棿
+ //褰撳墠鎾斁闊充箰鏃堕棿
+ //鎸夐亾鐞嗕笉浼氫负绌猴紝GetAttrState("playing_time")鍊煎彲鑳戒负绌猴紝寮哄埗杞崲int.Parse(锛変細鍑虹幇寮傚父锛屼笉杩囦篃鍋氫簡寮傚父澶勭悊浜�
int playSecond = int.Parse(A31MusicModel.Current.functionMusic.GetAttrState("playing_time"))+ (int)(DateTime.Now - A31MusicModel.Current.LastDateTime).TotalSeconds;
int playMusicMinute = playSecond / 60;
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Music/A31SongPlay.cs b/HDL_ON/UI/UI2/FuntionControlView/Music/A31SongPlay.cs
index 349bac5..ac28bbf 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Music/A31SongPlay.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Music/A31SongPlay.cs
@@ -53,7 +53,7 @@
}
UI.Music.View.SongView songView = new UI.Music.View.SongView();
songView.SongFrameLayout(vv, songs);
- songView.singerBtn.Text = songs.name;
+ songView.songBtn.Text = songs.name;
///鐐瑰嚮鎾斁浜嬩欢
songView.clickBtn.MouseUpEventHandler += (sender, e) =>
{
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Music/SendMethod.cs b/HDL_ON/UI/UI2/FuntionControlView/Music/SendMethod.cs
index bb8f901..56992b1 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Music/SendMethod.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Music/SendMethod.cs
@@ -937,12 +937,12 @@
d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
d.Add("deviceIds", functionIds);
var responsePackNew = RequestServerhomeId(d, NewAPI.Api_Post_RefreshDeviceStatus);
- if (responsePackNew.Code != "0")
+ if (responsePackNew.Code != "0" || responsePackNew.Data != null || responsePackNew.Data.ToString() != "")
{
return;
}
//鏁版嵁杩斿簭鍒楀寲涓篎unction瀵硅薄
- var str = Newtonsoft.Json.JsonConvert.SerializeObject(responsePackNew.Data.ToString());
+ var str = Newtonsoft.Json.JsonConvert.SerializeObject(responsePackNew.Data);
var function = Newtonsoft.Json.JsonConvert.DeserializeObject<Function>(str);
if (function == null)
{
@@ -971,18 +971,22 @@
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")
+ if (responsePackNew.Code != "0"||responsePackNew.Data == null ||responsePackNew.Data.ToString() == "")
{
return;
}
//鏁版嵁杩斿簭鍒楀寲涓篎unction瀵硅薄
- var str = Newtonsoft.Json.JsonConvert.SerializeObject(responsePackNew.Data.ToString());
+ var str = Newtonsoft.Json.JsonConvert.SerializeObject(responsePackNew.Data);
var palyLists = Newtonsoft.Json.JsonConvert.DeserializeObject<List<PalyListInfo>>(str);
if (palyLists == null)
{
palyLists =new List<PalyListInfo>();
}
- A31MusicModel.Current.palyListInfos = palyLists;
+ if (palyLists.Count > 0)
+ {
+ ///榛樿鎷跨涓�涓垪琛�
+ A31MusicModel.Current.palyLists = palyLists[0].playlist;
+ }
}
catch
{
--
Gitblit v1.8.0