From 7c543a7f222c7f70967cd94d658a35de4d1e4aa6 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期五, 22 十一月 2019 16:44:22 +0800
Subject: [PATCH] 2019.11.22
---
ZigbeeApp/Shared/Phone/Device/Logic/LogicCommunalPage.cs | 24 +++++-------------------
1 files changed, 5 insertions(+), 19 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/LogicCommunalPage.cs b/ZigbeeApp/Shared/Phone/Device/Logic/LogicCommunalPage.cs
index d6f3727..98ebe1a 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/LogicCommunalPage.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/LogicCommunalPage.cs
@@ -36,7 +36,7 @@
TextColor = ZigbeeColor.Current.LogicTextBlackColor,
TextAlignment = TextAlignment.CenterLeft,
X = Application.GetRealWidth(176),
- Width = Application.GetRealWidth(400),
+ Width = Application.GetRealWidth(600),
Height = Application.GetRealHeight(69),
Y = Application.GetRealHeight(92),
TextID = MyInternationalizationString.selection,
@@ -541,7 +541,7 @@
UserView.HomePage.Instance.AddChidren(memberList);
UserView.HomePage.Instance.PageIndex += 1;
MemberList.edit = true;
- memberList.Show(deviceinof);
+ memberList.Show(deviceinof, conditions);
}
};
@@ -718,13 +718,14 @@
break;
case DeviceType.DoorLock:
{
+ conditionIcon.UnSelectedImagePath = "ZigeeLogic/doorlock.png";
for (int a = 0; a < Common.Logic.CurrentLogic.Accounts.Count; a++)
{
if (Common.Logic.CurrentLogic.Accounts[a]["Type"] == "1")
{
if (Common.Logic.CurrentLogic.Accounts[a]["UserId"] == conditions["AttriButeData2"])
{
- devicestatus.Text = conditions["Account"];
+ devicestatus.Text = Common.Logic.CurrentLogic.Accounts[a]["Account"];
break;
}
@@ -1184,13 +1185,6 @@
///缂栬緫鐐瑰嚮浜嬩欢
deviceedit.MouseUpEventHandler += (sender, e) =>
{
- //var deviceStatePage = new DeviceStatePage();
- //UserView.HomePage.Instance.AddChidren(deviceStatePage);
- //UserView.HomePage.Instance.PageIndex += 1;
- //deviceStatePage.IsDeviceEditor = true;
- //deviceStatePage.Show(deviceinof);
-
- //ActionModifyDeviceStateView(deviceinof);
var flMain = new FrameLayout { BackgroundColor = ZigbeeColor.Current.LogicViewBackgroundColor };
this.AddChidren(flMain);
LogicDevicePage.CurrentDeviceStateView(flMain, deviceinof, true);
@@ -1913,10 +1907,6 @@
btnsave.MouseUpEventHandler += async (sender, e) =>
{
var name = logicTextBox.Text.Trim();
- //if (Common.Logic.CurrentLogic.Conditions.Count != 0 && Common.Logic.CurrentLogic.Actions.Count != 0)
- //{
- // AddChidren(btnsave);
- //}
if (string.IsNullOrEmpty(logicTextBox.Text.Trim()))
{
new Alert(Language.StringByID(MyInternationalizationString.Tip), Language.StringByID(MyInternationalizationString.PleaseEnterLogicName), Language.StringByID(MyInternationalizationString.Close)).Show();
@@ -1952,11 +1942,7 @@
CommonPage.Loading.Hide();
UserView.HomePage.Instance.RemoveViewByTag("Logic");
Category.Category.instance?.RefreshBodyView();
- //UserView.HomePage.Instance.RemoveAt("Logic1");
- //Category.Category category = new Category.Category();
- //UserView.HomePage.Instance.AddChidren(category);
- //UserView.HomePage.Instance.PageIndex += 1;
- //category.Show(2);
+
};
--
Gitblit v1.8.0