From 652243206427f35a256400a149a1734085824cb9 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期三, 02 九月 2020 17:35:03 +0800
Subject: [PATCH] 2020-09-02-4
---
ZigbeeApp/Shared/Phone/Device/Logic/Nightlight.cs | 12 +++---------
1 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/Nightlight.cs b/ZigbeeApp/Shared/Phone/Device/Logic/Nightlight.cs
index 8e854f7..aaa1c90 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/Nightlight.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/Nightlight.cs
@@ -19,9 +19,6 @@
public void Show(CommonDevice common, bool edit,string str_if,Dictionary<string, object> editdeviceActionInfo = null)
{
#region 甯冨眬鐣岄潰
- actionsInfo = editdeviceActionInfo;
-
-
this.BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor;
TopView view = new TopView();
this.AddChidren(view.TopRowView());
@@ -90,7 +87,7 @@
//淇濆瓨鐐瑰嚮浜嬩欢
saveView.clickviewBtn.MouseUpEventHandler += (sender, e) =>
{
- if (selectedDeviceStatus != "" && actionsInfo != null)
+ if (selectedDeviceStatus != ""&& TaskList.Count!=0)
{
LogicIfon.AddDeviceActions(common, actionsInfo);
}
@@ -194,12 +191,9 @@
actionsInfo.Add("DeviceAddr", common.DeviceAddr);
actionsInfo.Add("Epoint", common.DeviceEpoint);
actionsInfo.Add("Time", 0);
+ actionsInfo.Add("TaskList", TaskList);
}
- if (actionsInfo.ContainsKey("TaskList"))
- {
- actionsInfo.Remove("TaskList");
- }
- actionsInfo.Add("TaskList", TaskList);
+
}
public void CurrentDeviceView(string if_str, CommonDevice common, bool edit, Button button)
{
--
Gitblit v1.8.0