From 3272ca5b51e19f7f8a827b0f68400570a547fe60 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期二, 28 四月 2020 15:02:44 +0800
Subject: [PATCH] 2020-04-28-1
---
ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs | 36 +++++++++++++++++++++---------------
1 files changed, 21 insertions(+), 15 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs b/ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs
index d616479..57a5a58 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs
@@ -155,7 +155,8 @@
TextSize = 15,
TextColor = ZigbeeColor.Current.LogicTextBlackColor,
TextAlignment = TextAlignment.CenterLeft,
- Text = "鏃舵晥鎬у父寮�璁剧疆",
+ // Text = "鏃舵晥鎬у父寮�璁剧疆",
+ TextID=MyInternationalizationString.timeSetSone,
};
modeFl.AddChidren(modeTextBtn);
///涓嬩竴绾ц彍鍗曞浘鏍囨帶浠�
@@ -168,6 +169,21 @@
UnSelectedImagePath = "ZigeeLogic/next.png",
};
modeFl.AddChidren(nextIconBtn);
+
+ var clickBtn = new Button
+ {
+ Y = Application.GetRealHeight(478),
+ X = Application.GetRealWidth(58),
+ Height = Application.GetRealHeight(138),
+ Width = Application.GetRealWidth(1022),
+ };
+ modeFl.AddChidren(clickBtn);
+
+
+ clickBtn.MouseUpEventHandler += async (sender, e) =>
+ {
+ var d = await SkipView.LockAddModifyLogic(12, Send.CurrentDoorLock);
+ };
}
#endregion
@@ -202,7 +218,8 @@
TextSize = 24,
TextColor = ZigbeeColor.Current.LogicTextBlackColor,
TextAlignment = TextAlignment.CenterLeft,
- Text = "甯稿紑鑷姩鍖�",
+ //Text = "甯稿紑鑷姩鍖�",
+ TextID = MyInternationalizationString.openAutomationSone,
};
addLogicfL.AddChidren(addTextBtn);
///娣诲姞鑷姩鍖栧浘鏍囩殑鎺т欢
@@ -217,18 +234,7 @@
addLogicfL.AddChidren(addIconBtn);
addIconBtn.MouseUpEventHandler += (sender, e) =>
{
- ZigBee.Device.DoorLock doorLock = null;
- if (doorLock == null)
- {
- ///闃叉鎶涘紓甯�
- doorLock = new ZigBee.Device.DoorLock();
- }
- Send.CurrentDoorLock = doorLock;
- Common.Logic.LogicDviceList.Clear();
- if (Common.Logic.LogicDviceList.Count == 0)
- {
- Common.Logic.LogicDviceList.AddRange(LocalDevice.Current.listAllDevice.ToArray());
- }
+
//璇诲彇绯荤粺褰撳墠鏃堕棿锛氭椂-鍒�
//璇诲彇绯荤粺褰撳墠鏃堕棿锛氭椂-鍒�
var h = DateTime.Now.ToString("HH");
@@ -245,7 +251,7 @@
timeConditionsInfo.Add("StartMin", m);
Dictionary<string, object> actionsInfo = new Dictionary<string, object>();
actionsInfo.Add("LinkType", 8);
- actionsInfo.Add("DeviceAddr", doorLock.DeviceAddr);
+ actionsInfo.Add("DeviceAddr", Send.CurrentDoorLock.DeviceAddr);
actionsInfo.Add("Epoint", "200");
actionsInfo.Add("PassData", "055704010113");//榛樿闂ㄩ攣甯稿叧
//new涓�涓柊閫昏緫瀵硅薄锛�
--
Gitblit v1.8.0