2020-12-03-1

陈嘉乐

2020-12-03 0f2e0147e8990e913d16d99bc1b94fb6bc53abd7

 HDL_ON/Entity/FunctionList.cs

@@ -7,11 +7,6 @@
{
    public class FunctionList
    {
        public FunctionList()
        {

        }

        /// <summary>
        /// 空调列表
        /// </summary>
@@ -93,7 +88,6 @@
        {
            var fs = new List<Function>();
            fs.AddRange(GetAllDeviceFunctionList());
            fs.AddRange(scenes);
            return fs;
        }

@@ -102,7 +96,7 @@
        /// </summary>
        public List<Function> GetAllDeviceFunctionList()
        {
            if (deviceFunctionList == null)
            //if (deviceFunctionList == null || deviceFunctionList.Count == 0)
            {
                deviceFunctionList = new List<Function>();
                deviceFunctionList.AddRange(aCs);
@@ -113,7 +107,15 @@
                deviceFunctionList.AddRange(sensorsEnvironmentalScience);
                deviceFunctionList.AddRange(UI.Music.A31MusicModel.A31MusicModelList);
            }
            return deviceFunctionList.OrderByDescending(o => o.usageCount).ToList();
            try
            {
                deviceFunctionList.OrderByDescending(o => o.usageCount).ToList();
            }
            catch (Exception ex)
            {
                MainPage.Log($"设备功能排序异常：{ex.Message}");
            }
            return deviceFunctionList;
        }
        /// <summary>
        /// 清空设备功能列表
@@ -160,6 +162,8 @@
                    sidObj2.SaveFunctionData();
                    break;
                case FunctionType.Curtain:
                case FunctionType.RollingShutter:
                case FunctionType.MotorCurtain:
                    var sidObj3 =  Newtonsoft.Json.JsonConvert.DeserializeObject<Curtain>(Newtonsoft.Json.JsonConvert.SerializeObject(sidObj0));
                    DB_ResidenceData.functionList.curtains.Add(sidObj3 );
                    sidObj3.SaveFunctionData();