From 3afa6b622356b974a42ff29b1e4f0e35d2bf68f0 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 07 六月 2022 17:03:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wjc' into Dev-Branch
---
HDL_ON/UI/UI2/FuntionControlView/Music/MusicMain.cs | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Music/MusicMain.cs b/HDL_ON/UI/UI2/FuntionControlView/Music/MusicMain.cs
index f2c4b44..cd2c148 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Music/MusicMain.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Music/MusicMain.cs
@@ -122,10 +122,10 @@
var musicListFunction = FunctionList.List.GetMusicList();
for (int i = 0; i < musicListFunction.Count; i++)
{
- var function = musicListFunction[i];
+ var function = musicListFunction[i];
var music = A31MusicModel.A31MusicModelList.Find((obj) =>
- (obj.functionMusic.deviceId == function.deviceId && function.spk == "music.standard") || (
- obj.functionMusic.deviceId == function.deviceId && function.spk == "av.music")
+ (obj.functionMusic.deviceId == function.deviceId && function.spk == SPK.MusicStandard) || (
+ obj.functionMusic.deviceId == function.deviceId && function.spk == SPK.AvMusic)
);
if (music == null)
{
@@ -291,6 +291,7 @@
musicView.musicNameBtn.Text = player.functionMusic.name;
if (player.functionMusic.GetAttrState(KeyProperty.on_off) == ValueProperty.on)
{
+
musicView.playBtn.IsSelected = true;
}
else
--
Gitblit v1.8.0