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/SendMethod.cs |   14 +++++++++-----
 1 files changed, 9 insertions(+), 5 deletions(-)

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