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 | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/LogicCommunalPage.cs b/ZigbeeApp/Shared/Phone/Device/Logic/LogicCommunalPage.cs
index 8d5a0a6..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;
}
@@ -2002,13 +2002,18 @@
}
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
--
Gitblit v1.8.0