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/LogicCommunalPage.cs | 21 +++++++++------------
1 files changed, 9 insertions(+), 12 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/LogicCommunalPage.cs b/ZigbeeApp/Shared/Phone/Device/Logic/LogicCommunalPage.cs
index b70c646..583a56f 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/LogicCommunalPage.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/LogicCommunalPage.cs
@@ -763,7 +763,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;
}
@@ -1984,7 +1984,7 @@
custompushback.MouseUpEventHandler += customclick;
custompushRowLayout.MouseUpEventHandler += customclick;
bool tag = false;//鏍囪寮�鍏崇姸鎬�;
- btnswitch.MouseUpEventHandler += (sender1, e1) =>
+ btnswitch.MouseUpEventHandler +=(sender1, e1) =>
{
btnswitch.IsSelected = !btnswitch.IsSelected;
if (btnswitch.IsSelected)
@@ -1992,10 +1992,6 @@
tag = true;
custompushFrameLayout.Height = Application.GetRealHeight(160);
Common.Logic.CurrentLogic.LogicIsCustomPushText = 1;
- if (Common.Logic.CurrentLogic.LogicId != 0)
- {
- Send.Data("娣诲姞/鏇存柊", "/App/HomeLogicConfig", "POST");
- }
}
else
@@ -2003,20 +1999,21 @@
tag = false;
custompushFrameLayout.Height = Application.GetRealHeight(0);
Common.Logic.CurrentLogic.LogicIsCustomPushText = 0;
- if (Common.Logic.CurrentLogic.LogicId != 0)
- {
- Send.Data("鍒犻櫎", "/App/DelHomeLogicConfig", "POST");
- }
-
}
+ 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);
}
#endregion
@@ -2056,7 +2053,7 @@
Common.Logic.LogicList.Add(Common.Logic.CurrentLogic);
if (tag)
{
- Send.Data("娣诲姞/鏇存柊", "/App/HomeLogicConfig", "POST");
+ Send.Zj(tag, Common.Logic.CurrentLogic);
}
}
}
--
Gitblit v1.8.0