From 0891d90cd0d435338cc2851fd0830cd318a17fff Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期三, 23 十二月 2020 14:25:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/WJC' into NewFilePath
---
HDL_ON/UI/UI2/FuntionControlView/Music/MusicMain.cs | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Music/MusicMain.cs b/HDL_ON/UI/UI2/FuntionControlView/Music/MusicMain.cs
old mode 100644
new mode 100755
index 4cf1f92..01c7106
--- a/HDL_ON/UI/UI2/FuntionControlView/Music/MusicMain.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Music/MusicMain.cs
@@ -209,7 +209,7 @@
//涓嶆槸鎴戜滑鏀寔鐨勫搧鐗屼笉鏀寔
if (obj.Name != null)
{
- obj.sid = "030101123456781A1A230123AABB" + obj.UniqueDeviceName;
+ obj.sid = "030101123456780909020123AABB" + obj.UniqueDeviceName;
A31MusicModel.A31MusicModelList.Add(obj);
}
}
@@ -257,11 +257,11 @@
{
if (musicView.collectIconBtn.IsSelected)
{
- a31player.collection = true;
+ a31player.collect = true;
}
else
{
- a31player.collection = false;
+ a31player.collect = false;
}
}
A31MusicModel.Save();
@@ -372,7 +372,7 @@
}
else
{
- if (a31player.collection)
+ if (a31player.collect)
{
musicView.collectIconBtn.IsSelected = true;
}
@@ -445,7 +445,7 @@
{
A31MusicModel.A31MusicModelList.Add(new A31MusicModel
{
- sid = "030101123456781A1A230123AABB" + slave.uuid.Replace("uuid:", ""),
+ sid = "030101123456780909020123AABB" + slave.uuid.Replace("uuid:", ""),
ServerClientType = -1,//浠庣殑
IPAddress = slave.ip,
MainPlayIP = a31player.IPAddress,
--
Gitblit v1.8.0