From 7c2541f609e8235c4c33b4fb2ee27125f73f8ee6 Mon Sep 17 00:00:00 2001
From: lss <lsc@hdlchina.com.cn>
Date: 星期五, 24 六月 2022 13:28:36 +0800
Subject: [PATCH] 2022-06-24

---
 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
index 8b5383d..fb59e14 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 music = A31MusicModel.A31MusicModelList.Find((music) =>
-                   (music.functionMusic.deviceId == function.deviceId && function.spk == "music.standard") || (
-                     music.functionMusic.deviceId == function.deviceId && function.spk == "av.music")
+                    var function = musicListFunction[i]; 
+                    var music = A31MusicModel.A31MusicModelList.Find((obj) =>
+                   (obj.functionMusic.deviceId == function.deviceId && function.spk == SPK.MusicStandard) || (
+                     obj.functionMusic.deviceId == function.deviceId && function.spk == SPK.AvMusic)
                     );
                     if (music == null)
                     {
@@ -192,7 +192,7 @@
             musicView.singerBtn.Text = player.functionMusic.GetAttrState(KeyProperty.song_name);
             musicView.songNameBtn.Text = player.functionMusic.GetAttrState(KeyProperty.song_name);
             musicView.musicNameBtn.Text = player.functionMusic.name;
-
+            musicView.collectIconBtn.Visible = false;//鍏堟殏鏃堕殣钘忔敹钘忓姛鑳�
             ///鏀惰棌浜嬩欢
             musicView.collectIconBtn.MouseUpEventHandler += (sender, e) =>
             {

--
Gitblit v1.8.0