From 2bf5ec775cb57d8015bee58c745a1e48081ff1b1 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期二, 15 十月 2019 11:06:05 +0800
Subject: [PATCH] 首次合并了全部的代码
---
ZigbeeApp/Shared/Phone/Device/AirSwitch/AirSwitchControl.cs | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/AirSwitch/AirSwitchControl.cs b/ZigbeeApp/Shared/Phone/Device/AirSwitch/AirSwitchControl.cs
index 3157a0d..2e777a0 100755
--- a/ZigbeeApp/Shared/Phone/Device/AirSwitch/AirSwitchControl.cs
+++ b/ZigbeeApp/Shared/Phone/Device/AirSwitch/AirSwitchControl.cs
@@ -204,7 +204,7 @@
public override void RemoveFromParent()
{
ZbGateway.StatusList.Remove(this);
- action();
+ action?.Invoke();
RemoveUpdateControlDeviceStatuAction();
base.RemoveFromParent();
}
@@ -490,7 +490,6 @@
Shared.Common.Room.Lists[0].AddDevice(device.FileName);
collectionBtn.IsSelected = true;
}
- action?.Invoke();
}
/// <summary>
--
Gitblit v1.8.0