Merge remote-tracking branch 'origin/temp-wxr' into dev-tzy

tzy

2021-03-26 3cebdfad56d78ba04a214fccd1b942a010aeba77

 HDL_ON/Entity/FunctionList.cs

@@ -70,6 +70,16 @@
            var spkList = SPK.FhSpkList();
            return Functions.FindAll((obj) => spkList.Contains(obj.spk));
        }

        /// <summary>
        /// 新风列表
        /// </summary>
        /// <returns></returns>
        public List<Function> GetAirFreshList()
        {
            var spkList = SPK.AirFreshSpkList();
            return Functions.FindAll((obj) => spkList.Contains(obj.spk));
        }
        #region 家电列表 electricals
        /// <summary>
        /// 家电列表
@@ -127,6 +137,8 @@
                var tempFunction = Newtonsoft.Json.JsonConvert.DeserializeObject<Function>(functionDataString);
                if (tempFunction == null)
                {
                    MainPage.Log("null");

                    FileUtlis.Files.DeleteFile(filePath);
                    return;
                }
@@ -144,6 +156,7 @@
                        }

                    }

                }
                    MainPage.Log("add");
                Functions.Add(tempFunction);
            }
            if (filePath.StartsWith("SceneData_"))