Merge branch 'WJC' into NewFilePath

wxr

2020-12-22 a56a485926a8927f904d7f4795c371c25b35753a

 HDL_ON/Entity/FunctionList.cs

@@ -91,10 +91,18 @@
        /// </summary>
        public List<Sensor> sensorsEnvironmentalScience = new List<Sensor>();

        public List<Scene> scenes = new List<Scene>();
        /// <summary>
        /// 场景列表
        /// </summary>
        public List<Scene> scenes = new List<Scene>();
        //public List<Scene> Scenes
        //{
        //    get
        //    {
        //        List.scenes = List.scenes.OrderByDescending(o => o.createTime).ToList();
        //        return List.scenes;
        //    }
        //}
        /// <summary>
        /// 功能列表
        /// </summary>
@@ -207,7 +215,7 @@
            }
            try
            {
                deviceFunctionList.OrderByDescending(o => o.usageCount).ToList();
                deviceFunctionList = deviceFunctionList.OrderByDescending(o => o.controlCounter).ToList();
            }
            catch (Exception ex)
            {
@@ -399,10 +407,10 @@
                                }
                                else
                                {
                                    MainPage.Log($"deviceType:{localFunction.spk} local:{localFunction.modifyTime} server:{newFunction.modifyTime}");
                                    i++;
                                    if (localFunction.modifyTime != newFunction.modifyTime)
                                    {
                                        MainPage.Log($"local:{localFunction.modifyTime}\r\n server:{newFunction.modifyTime}");
                                        localFunction.name = newFunction.name;
                                        localFunction.collect = newFunction.collect;
                                        localFunction.modifyTime = newFunction.modifyTime;
@@ -590,12 +598,21 @@
                {
                    if (DriverLayer.Control.Ins.IsRemote)
                    {
                        var functionIds = new List<string>();
                        var page = new List<string>();
                        int count = 0;

                        foreach (var function in GetDeviceFunctionList())
                        {
                            functionIds.Add(function.deviceId);
                            page.Add(function.deviceId);
                            count++;
                            if (count > 9)
                            {
                                DriverLayer.Control.Ins.SendApiReadCommand(page);
                                page.Clear();
                                count = 0;
                            }
                        }
                        DriverLayer.Control.Ins.SendApiReadCommand(functionIds);
                        DriverLayer.Control.Ins.SendApiReadCommand(page);
                    }
                    else
                    {
@@ -687,6 +704,9 @@
                case FunctionAttributeKey.Percent:
                    text = Language.StringByID(StringId.PercentAdjustment);
                    break;
                case FunctionAttributeKey.FadeTime:
                    text = Language.StringByID(StringId.FadeSpeed);
                    break;
            }
            return text;
        }