Merge remote-tracking branch 'origin/wxr0114' into wjc

wjc

2022-01-19 07b0239f824ddb5a0cadf93f20ff6247f72baca2

 HDL_ON/Common/ApiUtlis.cs

@@ -157,6 +157,7 @@
                    if (deviceResult.Code == StateCode.SUCCESS)
                    {
                        endTime = DateTime.Now.AddSeconds(100);

                        MainPage.Log($"读取设备信息成功");
                        var deviceList = Newtonsoft.Json.JsonConvert.DeserializeObject<DevcieApiPack>(deviceResult.Data.ToString());
                        if (deviceList == null)
@@ -170,11 +171,11 @@
                            for (int i = 0; i < FunctionList.List.GetDeviceFunctionList().Count;)
                            {
                                var localFunction = FunctionList.List.GetDeviceFunctionList()[i];
                                if (SPK.MusicSpkList().Contains(localFunction.spk))
                                {
                                    i++;
                                    continue;
                                }
                                //if (SPK.MusicSpkList().Contains(localFunction.spk))
                                //{
                                //    i++;
                                //    continue;
                                //}
                                var newFunction = deviceList.list.Find((obj) => obj.deviceId == localFunction.deviceId);

                                if (delFile == localFunction.savePath)