From 80e4fc87ee91231d1b452c845ff8a57727d4dc44 Mon Sep 17 00:00:00 2001 From: wjc <1243177876@qq.com> Date: 星期五, 14 一月 2022 13:10:28 +0800 Subject: [PATCH] 2021-1-14-1 --- HDL_ON/DAL/DriverLayer/Control.cs | 22 +++++++++++++++++++++- 1 files changed, 21 insertions(+), 1 deletions(-) diff --git a/HDL_ON/DAL/DriverLayer/Control.cs b/HDL_ON/DAL/DriverLayer/Control.cs index 4a6ad64..cc8237a 100644 --- a/HDL_ON/DAL/DriverLayer/Control.cs +++ b/HDL_ON/DAL/DriverLayer/Control.cs @@ -972,21 +972,35 @@ var localFunction = allLocalFuntion.Find((obj) => obj.sid == updateTemp.sid); if (localFunction == null) { + Console.WriteLine("鎵句笉鍒伴煶涔愭挱鏀惧櫒娣�=======" + revString); continue; } if (Ins.GatewayOnline_Local && isCloudData)//鏈湴閾炬帴锛岄櫎浜嗘秱楦﹁澶囨暟鎹箣澶栫殑浜戠鏁版嵁涓嶅鐞� { - if (!SPK.Get3tySpk(SPK.BrandType.All3tyBrand).Contains(localFunction.spk)) + if (!SPK.Get3tySpk(SPK.BrandType.All3tyBrand).Contains(localFunction.spk) && !SPK.MusicSpkList().Contains( localFunction.spk)) { //MainPage.Log($"A鍗忚鏇存柊鐘舵��:鏈湴閾炬帴锛岄櫎浜嗘秱楦﹁澶囨暟鎹箣澶栫殑浜戠鏁版嵁涓嶅鐞�........"); + return; } } + + //if (SPK.MusicSpkList().Contains(localFunction.spk)) + //{ + // if (updateTemp.status.Count < 3) + // { + // ///鏄煶涔愬姛鑳界殑 + // ///涓婃姤灞炴�у皯3鏉′笉鍋氬鐞� + // return; + // } + //} //MainPage.Log($"A鍗忚鏇存柊鐘舵��:{revString}"); foreach (var attr in updateTemp.status) { localFunction.time_stamp = temp.time_stamp; localFunction.SetAttrState(attr.key, attr.value); + Console.WriteLine("闊充箰鎾斁鍣ㄦ坊鍔犵紦瀛樻暟鎹�=======" + revString); + } //鏇存柊鐣岄潰鐘舵�� @@ -1167,6 +1181,12 @@ //鐘舵�佹洿鏂� Stan.HdlDeviceStatuPushLogic.Current.UpdateDeviceStatu(updateTemp.sid, updateTemp.status); break; + case SPK.AvMusic: + case SPK.MusicStandard: + //UI.Music.MusicMain.mMusicMain.RefreshView(updateTemp); + Console.WriteLine("闊充箰鎾斁鍣ㄦ樉绀虹姸鎬�======="+ revString); + //wjc + break; } HomePage.UpdataFunctionStates(localFunction); -- Gitblit v1.8.0