blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
WJC
2019-10-14 b78a4d0ca90416d37fcbaf5e54b00f7eaab53919 
 ZigbeeApp/Shared/Common/Room.cs

old mode 100755
new mode 100644

@@ -383,20 +383,7 @@


                    beforeRoom.DeviceUIList.Clear();


                    foreach (var deviceFilePath in beforeRoom.DeviceUIFilePathList)


                    {


                        var jsonInfo = Encoding.UTF8.GetString(Global.ReadFileByHomeId(deviceFilePath));


                        var tempDeviceUI = Newtonsoft.Json.JsonConvert.DeserializeObject<DeviceUI>(jsonInfo);


                        if (tempDeviceUI != null)


                        {


                            var delCommon = tempDeviceUIList.Find((obj) => obj.CommonDevice != null && tempDeviceUI.CommonDevice != null && obj.CommonDevice.Type == tempDeviceUI.CommonDevice.Type && obj.CommonDevice.CommonDeviceAddrEpoint == tempDeviceUI.CommonDevice.CommonDeviceAddrEpoint);


                            if (delCommon != null)


                            {


                                beforeRoom.DeviceUIList.Add(delCommon);


                            }


                            else


                            {


                                beforeRoom.AddDevice(deviceFilePath);


                            }


                        }


                        beforeRoom.DeviceUIList.Add(Common.LocalDevice.Current.GetDeviceUI(deviceFilePath));


                    }


                    //场景(SceneUI)


                    beforeRoom.SceneUIList.Clear();