From 610a6a826a00d47320b17478cb5ca5f60abfa291 Mon Sep 17 00:00:00 2001 From: wxr <464027401@qq.com> Date: 星期二, 24 五月 2022 17:25:16 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/wjc' into Dev-Branch --- HDL_ON/UI/UI2/FuntionControlView/Music/MusicMain.cs | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/HDL_ON/UI/UI2/FuntionControlView/Music/MusicMain.cs b/HDL_ON/UI/UI2/FuntionControlView/Music/MusicMain.cs index cef6e69..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) { -- Gitblit v1.8.0