From b74c052b43d7c4a830386940a036eb7c2ec9abc2 Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期二, 14 一月 2020 13:37:26 +0800
Subject: [PATCH] 2020-1-14-01
---
ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicCommunalPage.cs | 30 ++++++++++++++++++------------
1 files changed, 18 insertions(+), 12 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicCommunalPage.cs b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicCommunalPage.cs
index b54990f..3ab6c4f 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicCommunalPage.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicCommunalPage.cs
@@ -353,7 +353,7 @@
{
if (Common.Logic.CurrentLogic.Accounts[a]["UserId"] == conditions["AttriButeData2"])
{
- devicestatus.Text = Common.Logic.CurrentLogic.Accounts[a]["Account"];
+ devicestatus.Text = Common.Logic.CurrentLogic.Accounts[a]["Option3"];
break;
}
}
@@ -1069,24 +1069,29 @@
{
tag = true;
custompushFrameLayout.Height = Application.GetRealHeight(160);
- if (Common.Logic.CurrentLogic.LogicId != 0)
- {
- Send.Data("娣诲姞/鏇存柊", "/App/HomeLogicConfig", "POST");
- }
+ Common.Logic.CurrentLogic.LogicIsCustomPushText = 1;
}
else
{
tag = false;
custompushFrameLayout.Height = Application.GetRealHeight(0);
- if (Common.Logic.CurrentLogic.LogicId != 0)
- {
- Send.Data("鍒犻櫎", "/App/DelHomeLogicConfig", "POST");
- }
-
+ Common.Logic.CurrentLogic.LogicIsCustomPushText = 0;
}
+ Send.Zj(tag, Common.Logic.CurrentLogic);
};
-
+ if (Common.Logic.CurrentLogic.LogicIsCustomPushText == 0)
+ {
+ tag = false;
+ btnswitch.IsSelected = false;
+ custompushFrameLayout.Height = Application.GetRealHeight(0);
+ }
+ else
+ {
+ tag = true;
+ btnswitch.IsSelected = true;
+ custompushFrameLayout.Height = Application.GetRealHeight(160);
+ }
var saveFrameLayout = new FrameLayout
{
Y = middle.Bottom,
@@ -1139,7 +1144,7 @@
Common.Logic.LockLogicList.Add(Common.Logic.CurrentLogic);
if (tag)
{
- Send.Data("娣诲姞/鏇存柊", "/App/HomeLogicConfig", "POST");
+ Send.Zj(tag, Common.Logic.CurrentLogic);
}
}
}
@@ -1161,6 +1166,7 @@
}
public void AddCondition(int value)
{
+ Common.Logic.CurrentLogic.LogicName = logicTextBox.Text.Trim();
var addCondition = new AddCondition();
addCondition.conditionsIndex = value;
UserView.HomePage.Instance.AddChidren(addCondition);
--
Gitblit v1.8.0