From e79b65b97a8ae1eae5ee172dea1b52d041006599 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期三, 02 九月 2020 17:24:32 +0800
Subject: [PATCH] 2020-09-02-3
---
ZigbeeApp/Shared/Phone/Device/Logic/Nightlight.cs | 10 ++--------
ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide | 0
2 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide b/ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide
index b7604d4..4e64cd4 100644
--- a/ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide
+++ b/ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide
Binary files differ
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/Nightlight.cs b/ZigbeeApp/Shared/Phone/Device/Logic/Nightlight.cs
index 8e854f7..8fef937 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());
@@ -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