From c26c06ef4a22d6fb9e59dc734abca92fa8a23c47 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期五, 05 六月 2020 17:41:00 +0800
Subject: [PATCH] 2020-06-05-02
---
HDL_ON/UI/Music/View/DialogView.cs | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/HDL_ON/UI/Music/View/DialogView.cs b/HDL_ON/UI/Music/View/DialogView.cs
index b9aff05..ebc8951 100644
--- a/HDL_ON/UI/Music/View/DialogView.cs
+++ b/HDL_ON/UI/Music/View/DialogView.cs
@@ -1001,7 +1001,7 @@
MusicMain.loading.Start("瑙ｉ櫎涓�...");
var slaveList = new List<Slave>();
slaveList.AddRange(a31player.Slave.slave_list);
- bool host_If = false; //琛ㄧず鏄惁鏄剧ず瑙ｉ櫎鐨勬挱鏀�
+ // bool host_If = false; //琛ㄧず鏄惁鏄剧ず瑙ｉ櫎鐨勬挱鏀�
bool _if = false;
System.Threading.Tasks.Task.Run(() =>
{
@@ -1010,7 +1010,6 @@
var play_If = playList1.Find((obj) => obj.UniqueDeviceName == a31player.UniqueDeviceName);
if (play_If == null)
{
- host_If = false;
//瀛愰煶绠变笌涓婚煶绠辨柇寮�鐨勫懡浠�
for (int i = 0; i < playList1.Count; i++)
{
@@ -1028,7 +1027,6 @@
}
else
{
- host_If = true;
//瑙ｆ暎缁勭殑鍛戒护
if (null == SendMethod.OpenWeb("http://" + a31player.IPAddress + "/httpapi.asp?command=multiroom:Ungroup"))
{
@@ -1050,7 +1048,7 @@
var tmepSlaves = Newtonsoft.Json.JsonConvert.DeserializeObject<Slaves>(result);
if (tmepSlaves != null)
{
- if (host_If && tmepSlaves.slave_list.Count == 0)
+ if (tmepSlaves.slave_list.Count == 0)
{
var host_music = A31MusicModel.A31MusicModelList.Find((c) => c.UniqueDeviceName == a31player.UniqueDeviceName);
@@ -1073,9 +1071,9 @@
}
else
{
- for (int a = 0; a < playList1.Count; a++)
+ for (int b = 0; b < tmepSlaves.slave_list.Count; b++)
{
- var uuid = playList1[a].UniqueDeviceName;
+ var uuid = tmepSlaves.slave_list[b].uuid.Replace("uuid:", "");
var music = A31MusicModel.A31MusicModelList.Find((c) => c.UniqueDeviceName == uuid);
if (music != null)
{
@@ -1084,6 +1082,7 @@
music.IsOnLine = false;//鍏堜笉鍏佽璇诲彇
}
}
+
}
var host_a31player = A31MusicModel.A31MusicModelList.Find((c) => c.UniqueDeviceName == a31player.UniqueDeviceName);
--
Gitblit v1.8.0