wei
2020-12-16 dcf60777c9346ff058f06298d03173f0c53d1902
HDL_ON/Entity/FunctionList.cs
@@ -382,9 +382,16 @@
                    var deviceList = Newtonsoft.Json.JsonConvert.DeserializeObject<DevcieApiPack>(pack.Data.ToString());
                    if (deviceList != null)
                    {
                        if (List.GetDeviceFunctionList().Count > 0)
                        {
                        for (int i =0;i < List.GetDeviceFunctionList().Count;)
                        {
                            var localFunction = List.GetDeviceFunctionList()[i];
                                if (localFunction.functionCategory == FunctionCategory.Music)
                                {
                                    i++;
                                    continue;
                                }
                            var newFunction = deviceList.list.Find((obj) => obj.deviceId == localFunction.deviceId);
                            if (newFunction == null)//如果云端最新数据没有该条数据,则本地需要删掉该数据记录
                            {
@@ -404,6 +411,7 @@
                                    localFunction.SaveFunctionData(false);
                                }
                                deviceList.list.Remove(newFunction);//操作完的数据清理掉,剩下的就是新增的功能
                                }
                            }
                        }
                        //处理剩下的新增功能
@@ -636,7 +644,7 @@
                case FunctionAttributeKey.Brightness:
                    text = Language.StringByID(StringId.Brightness);
                    break;
                case FunctionAttributeKey.Color:
                case FunctionAttributeKey.RGB:
                    text = Language.StringByID(StringId.ColorValue);
                    break;
                case FunctionAttributeKey.Mode: