From 737c036a39176fd2085ce82b7c60391da8cb508c Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期二, 31 十二月 2019 19:17:47 +0800
Subject: [PATCH] 合并了代码
---
ZigbeeApp/Shared/Common/Room.cs | 25 +++++++++++++++++++++++++
1 files changed, 25 insertions(+), 0 deletions(-)
diff --git a/ZigbeeApp/Shared/Common/Room.cs b/ZigbeeApp/Shared/Common/Room.cs
index 0c202a7..5d8d500 100755
--- a/ZigbeeApp/Shared/Common/Room.cs
+++ b/ZigbeeApp/Shared/Common/Room.cs
@@ -943,6 +943,31 @@
this.DeleteDevice(device);
}
+ /// <summary>
+ /// 鍒犻櫎鎴戠殑鍠滅埍鐨勮澶�
+ /// </summary>
+ /// <param name="device">瑕佸垹闄ょ殑璁惧瀵硅薄</param>
+ public void DeleteLoveDevice(CommonDevice device)
+ {
+ if (device == null)
+ {
+ return;
+ }
+ //鎴戠殑鍠滅埍
+ var loveRoom = this.GetLoveRoom();
+ if (loveRoom != null)
+ {
+ string deviceFile = device.FilePath;
+ //绉婚櫎缂撳瓨
+ if (loveRoom.DeviceUIFilePathList.Contains(deviceFile) == false)
+ {
+ return;
+ }
+ loveRoom.DeviceUIFilePathList.Remove(deviceFile);
+ loveRoom.DeviceUIList.RemoveAll((obj) => obj.FileName == deviceFile);
+ }
+ }
+
#endregion
#region 鈼� 鑾峰彇璁惧_________________________
--
Gitblit v1.8.0