优化地暖界面、音乐入口界面

wei

2021-04-28 b13a98b48df67d902da843a3bd3d5659e3737d17

 HDL_ON/Entity/FunctionList.cs

@@ -108,8 +108,19 @@
        {
            return Functions.FindAll((obj) => obj.spk == SPK.IrModule);
        }

        #endregion

        /// <summary>
        /// 音乐列表
        /// </summary>
        /// <returns></returns>
        public List<Function> GetMusicList()
        {
            var spkList = SPK.MusicSpkList();
            return Functions.FindAll((obj) => spkList.Contains(obj.spk));
        }


        /// <summary>
        /// 环境传感器列表
        /// </summary>
@@ -140,7 +151,7 @@
        /// <summary>
        /// 安防列表
        /// </summary>
        public List<Security> securities = new List<Security>();
        public List<SecurityAlarm> securities = new List<SecurityAlarm>();

        /// <summary>
        /// 加载功能列表
@@ -164,6 +175,11 @@
                    FileUtlis.Files.DeleteFile(filePath);
                    return;
                }
                //音乐部分要修改
                //if(tempFunction.spk.ToString() == SPK.MusicStandard)
                //{
                //    UI.Music.A31MusicModel.A31MusicModelList.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<UI.Music.A31MusicModel>(functionDataString));
                //}
                if (checkRepeat == true)

                {

                    //检测重复

@@ -191,7 +207,7 @@
            {
                var dataBytes = FileUtlis.Files.ReadFile(filePath);
                var dataString = System.Text.Encoding.UTF8.GetString(dataBytes);
                var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<Security>(dataString);
                var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<SecurityAlarm>(dataString);
                if (temp == null)
                {
                    MainPage.Log("null");