From 6144d4267f92db9be96a7003f4352732bfe9bb3b Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期四, 19 三月 2020 17:49:31 +0800
Subject: [PATCH] 2020-03-19-1
---
ZigbeeApp/Shared/Phone/Device/Logic/CurrentDeviceState.cs | 109 ++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 101 insertions(+), 8 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/CurrentDeviceState.cs b/ZigbeeApp/Shared/Phone/Device/Logic/CurrentDeviceState.cs
index 19dbbc7..203f4c8 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/CurrentDeviceState.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/CurrentDeviceState.cs
@@ -22,7 +22,10 @@
completeView.Btntitle.Text = common.DeviceEpointName;
EventHandler<MouseEventArgs> clickcancel = (sender, e) =>
{
- UserView.HomePage.Instance.ScrollEnabled = true;
+ if (!edit)
+ {
+ UserView.HomePage.Instance.ScrollEnabled = true;
+ }
flMain.RemoveFromParent();
};
flMain.MouseUpEventHandler += clickcancel;
@@ -490,13 +493,96 @@
break;
case DeviceType.DoorLock:
{
+ if (_if[0] == "condition")
+ {
+ flMain.RemoveFromParent();
+ var memberList = new MemberList();
+ UserView.HomePage.Instance.AddChidren(memberList);
+ UserView.HomePage.Instance.PageIndex += 1;
+ MemberList.edit = false;
+ memberList.Show(common);
+ }
+ else
+ {
+ completeView.Btntitle.TextID = MyInternationalizationString.openmode;
+ completeView.Show(2).AddChidren(openView.Show());
+ completeView.Show(2).AddChidren(closeView.Show());
+ openView.titleBtn.TextID = MyInternationalizationString.logicopen;
+ closeView.titleBtn.TextID = MyInternationalizationString.logicclose;
+ //闂ㄩ攣鏁版嵁鐗规畩锛岃繘琛岀壒娈婂鐞�;
+ if (actionsInfo.ContainsKey("LinkType"))
+ {
+ actionsInfo.Remove("LinkType");
+ }
+ //鐩爣闂ㄩ攣绫诲瀷鏄�8锛�
+ actionsInfo.Add("LinkType", 8);
+ if (actionsInfo.ContainsKey("TaskList"))
+ {
+ actionsInfo.Remove("TaskList");
+ }
+ if (actionsInfo.ContainsKey("Time"))
+ {
+ actionsInfo.Remove("Time");
+ }
+ closeView.lineBtn.BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor;
+ ///
+ openView.clickviewBtn.MouseUpEventHandler += (sender, e) =>
+ {
+ openView.selectedIconBtn.Visible = true;
+ closeView.selectedIconBtn.Visible = false;
+ openView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
+ closeView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
+ SelectedDeviceStatus = "DoorLock";
+ if (actionsInfo.ContainsKey("PassData"))
+ {
+ actionsInfo.Remove("PassData");
+ }
+ actionsInfo.Add("PassData", "055704010112");//闂ㄩ攣甯稿紑
+ };
+ ///鐐瑰嚮鍙栨秷浜嬩欢
+ closeView.clickviewBtn.MouseUpEventHandler += (sender, e) =>
+ {
+ openView.selectedIconBtn.Visible = false;
+ closeView.selectedIconBtn.Visible = true;
+ openView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
+ closeView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
+ SelectedDeviceStatus = "DoorLock";
+ if (actionsInfo.ContainsKey("PassData"))
+ {
+ actionsInfo.Remove("PassData");
+ }
+ actionsInfo.Add("PassData", "055704010113");//闂ㄩ攣甯稿叧
- flMain.RemoveFromParent();
- var memberList = new MemberList();
- UserView.HomePage.Instance.AddChidren(memberList);
- UserView.HomePage.Instance.PageIndex += 1;
- MemberList.edit = false;
- memberList.Show(common);
+ };
+ if (edit)
+ {
+ foreach (var deviceinfo in Common.Logic.CurrentLogic.Actions)
+ {
+ if (deviceinfo["LinkType"].ToString() == "8")
+ {
+ if (deviceinfo["DeviceAddr"].ToString() == common.DeviceAddr && deviceinfo["Epoint"].ToString() == common.DeviceEpoint.ToString())
+ {
+ if (deviceinfo["PassData"].ToString() == "055704010112")
+ {//寮�鍚�
+ openView.selectedIconBtn.Visible = true;
+ closeView.selectedIconBtn.Visible = false;
+ openView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
+ closeView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
+ }
+ else
+ {//鍏抽棴
+ openView.selectedIconBtn.Visible = false;
+ closeView.selectedIconBtn.Visible = true;
+ openView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
+ closeView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
+
+ }
+ break;
+ }
+ }
+ }
+ }
+ }
}
break;
case DeviceType.TemperatureSensor:
@@ -1206,7 +1292,14 @@
}
else
{ //娣诲姞鐩爣
- LogicIfon.AddDeviceactions(common, actionsInfo);
+ if (SelectedDeviceStatus == "DoorLock")
+ {//闂ㄩ攣鏁版嵁鐗规畩,杩涜鐗规畩澶勭悊;
+ LogicIfon.AddDoorLockActions(common, actionsInfo);
+ }
+ else
+ {
+ LogicIfon.AddDeviceActions(common, actionsInfo);
+ }
}
}
else
--
Gitblit v1.8.0