From f432344ed815e5b6b88ab42bcee50b45e664472e Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期五, 05 六月 2020 15:49:22 +0800
Subject: [PATCH] 2020-06-05-01

---
 HDL_ON/UI/Music/SendMethod.cs |   15 +++++----------
 1 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/HDL_ON/UI/Music/SendMethod.cs b/HDL_ON/UI/Music/SendMethod.cs
index b9b530d..a6ae4bb 100644
--- a/HDL_ON/UI/Music/SendMethod.cs
+++ b/HDL_ON/UI/Music/SendMethod.cs
@@ -153,22 +153,17 @@
             try
             {
 
-                if (a31MusicModel.ServerClientType == -1)
+                if (a31MusicModel.ServerClientType == 1)
                 {
-                    var result = OpenWeb("http://" + a31MusicModel.MainPlayIP + "/httpapi.asp?command=multiroom:getSlaveList");
-                    if (result != null)
+                    var result = OpenWeb("http://" + a31MusicModel.IPAddress + "/httpapi.asp?command=multiroom:getSlaveList");
+                    if (result != null && result != "Failed")
                     {
                         var slaves = Newtonsoft.Json.JsonConvert.DeserializeObject<Slaves>(result);
-                        if (slaves != null && slaves.slave_list != null)
+                        if (slaves != null && slaves.slave_list != null && slaves.slave_list.Count != 0)
                         {
-                            var slave = slaves.slave_list.Find((obj) => obj.uuid.Replace("uuid:", "") == a31MusicModel.UniqueDeviceName);
-                            if (slave != null)
-                            {
-                                a31MusicModel.A31PlayStatus.vol = slave.volume;
-                            }
+                            a31MusicModel.Slave = slaves;
                         }
                     }
-                    return;
                 }
 
                 WebClient webClient = new WebClient();

--
Gitblit v1.8.0