From 4a5e9d0447aae9b264a98ea1f4c95417d0f4aa91 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期二, 01 十二月 2020 17:20:01 +0800
Subject: [PATCH] Merge branch 'master' into WJC
---
HDL_ON/UI/UI2/FuntionControlView/Music/A31PlayMusicPage.cs | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Music/A31PlayMusicPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Music/A31PlayMusicPage.cs
index 9a98f45..e637068 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Music/A31PlayMusicPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Music/A31PlayMusicPage.cs
@@ -75,11 +75,11 @@
playView.collectIconBtn.IsSelected = !playView.collectIconBtn.IsSelected;
if (playView.collectIconBtn.IsSelected)
{
- A31MusicModel.Current.collection = true;
+ A31MusicModel.Current.collect = true;
}
else
{
- A31MusicModel.Current.collection = false;
+ A31MusicModel.Current.collect = false;
}
};
@@ -365,7 +365,7 @@
}
}
playView.regionBtn.Text = A31MusicModel.Current.GetRoomListName();
- if (A31MusicModel.Current.collection)
+ if (A31MusicModel.Current.collect)
{
playView.collectIconBtn.IsSelected = true;
}
--
Gitblit v1.8.0