From e5f993f52e09eb46878baced83bb8492f147d41c Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期一, 04 十一月 2019 17:58:40 +0800
Subject: [PATCH] 2019-11-04-1
---
ZigbeeApp/Shared/Phone/Device/Logic/MemberList.cs | 36 +++++++++++++++++++++++++-----------
1 files changed, 25 insertions(+), 11 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/MemberList.cs b/ZigbeeApp/Shared/Phone/Device/Logic/MemberList.cs
index 763516c..c5f558d 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/MemberList.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/MemberList.cs
@@ -9,14 +9,19 @@
{
public class MemberList : FrameLayout
{
+ public MemberList()
+ {
+ Tag = "Logic";
+ }
Button selectedIcon = new Button();
public static Action action;
public static bool edit=false;
Dictionary<string, string> deviceConditionsInfo = new Dictionary<string, string>();
Dictionary<string, string> userdictionary = new Dictionary<string, string>();
- public void Show(CommonDevice common, Dictionary<string, string> editdeviceConditionsInfo=null)
+ public async void Show(CommonDevice common, Dictionary<string, string> editdeviceConditionsInfo=null)
{
+
if (!edit)
{
deviceConditionsInfo.Add("Type", "1");
@@ -45,7 +50,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.userlist,
@@ -88,7 +93,11 @@
BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor,
};
this.AddChidren(middle);
-
+ if (Send.UserList.Count == 0)
+ {
+ var allMemberslist = await Send.AllMembers(common.DeviceAddr);
+ Send.UserList.AddRange(allMemberslist);
+ }
foreach (var user in Send.UserList)
{
@@ -308,14 +317,14 @@
doorlockBtn.MouseUpEventHandler += doorlockclick;
doorlockSelected.MouseUpEventHandler += doorlockclick;
doorlockfra.MouseUpEventHandler += doorlockclick;
- if (edit)
+ if (edit&&editdeviceConditionsInfo!=null)
{
- if (editdeviceConditionsInfo["AttriButeData2"] == userifon.OpenMode.ToString())
+ deviceConditionsInfo = editdeviceConditionsInfo;
+ if (editdeviceConditionsInfo["AttriButeData2"] == userifon.UserId.ToString())
{
selectedIcon.Visible = false;
selectedIcon = doorlockSelected;
doorlockSelected.Visible = true;
-
}
}
@@ -325,9 +334,10 @@
Btncomplete.MouseUpEventHandler += (sender3, e3) =>
{
+
if (SelectedDeviceStatuscondition != "")
{
-
+ bool add = false;
for (int i = 0; i < Common.Logic.CurrentLogic.Conditions.Count; i++)
{
if (Common.Logic.CurrentLogic.Conditions[i]["Type"] == "1")
@@ -346,14 +356,17 @@
Common.Logic.CurrentLogic.Accounts.Insert(j, userdictionary);
}
}
- return;
+ add = true;
+ break;
}
}
}
}
-
- Common.Logic.CurrentLogic.Accounts.Add(userdictionary);
- Common.Logic.CurrentLogic.Conditions.Add(deviceConditionsInfo);
+ if (!add)
+ {
+ Common.Logic.CurrentLogic.Accounts.Add(userdictionary);
+ Common.Logic.CurrentLogic.Conditions.Add(deviceConditionsInfo);
+ }
}
else
@@ -384,5 +397,6 @@
}
}
+
}
}
--
Gitblit v1.8.0