From 82a773d1783549caca563831aac8affc059deedf Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 07 十一月 2019 10:56:13 +0800
Subject: [PATCH] 合并了全部的代码，IOS 图片需要从新引入工程
---
ZigbeeApp/Shared/Phone/Device/Logic/MemberList.cs | 84 +++++++++++++++++++-----------------------
1 files changed, 38 insertions(+), 46 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/MemberList.cs b/ZigbeeApp/Shared/Phone/Device/Logic/MemberList.cs
index c5f558d..9077c94 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/MemberList.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/MemberList.cs
@@ -16,23 +16,12 @@
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 async void Show(CommonDevice common, Dictionary<string, string> editdeviceConditionsInfo=null)
{
- if (!edit)
- {
- deviceConditionsInfo.Add("Type", "1");
- deviceConditionsInfo.Add("IsValid", "1");
- deviceConditionsInfo.Add("MacAddr", common.DeviceAddr);
- deviceConditionsInfo.Add("Epoint", common.DeviceEpoint.ToString());
- deviceConditionsInfo.Add("Cluster_ID", "64529");
- deviceConditionsInfo.Add("AttriButeData1", "2");
- deviceConditionsInfo.Add("Range", "0");
- editdeviceConditionsInfo = deviceConditionsInfo;
- }
+
UserView.HomePage.Instance.ScrollEnabled = false;
this.BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor;
#region 鏈�涓婇潰鐨勫竷灞�浠ｇ爜
@@ -214,8 +203,8 @@
};
lockRow.AddChidren(Btncomplete);
#endregion
-
- string SelectedDeviceStatuscondition = "";
+ ///瀹氫袱涓彉閲忚褰曚箣鍓嶇殑鍙�硷紱
+ string userId = "", openMode = "", accountname="", SelectedDeviceStatuscondition = "";
lockcolorfra1.Y = Application.GetRealHeight(1920 - 140 - (160 * user.UserIdMode.Count) - 20 - 50);
lockcolorfra1.Height = Application.GetRealHeight(140 + (160 * user.UserIdMode.Count) + 20 + 50);
for (int i = 0; i < user.UserIdMode.Count; i++)
@@ -285,48 +274,27 @@
selectedIcon.Visible = false;
selectedIcon = doorlockSelected;
doorlockSelected.Visible = true;
+ userId = userifon.UserId;
+ openMode = userifon.OpenMode.ToString();
+ accountname = Btntitle.Text + doorlockBtn.Text;
//doorlockBtn.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
- if (deviceConditionsInfo.ContainsKey("AttriButeId"))
- {
- deviceConditionsInfo.Remove("AttriButeId");
- }
- if (deviceConditionsInfo.ContainsKey("AttriButeData2"))
- {
- deviceConditionsInfo.Remove("AttriButeData2");
- }
- deviceConditionsInfo.Add("AttriButeId", userifon.OpenMode.ToString());
- deviceConditionsInfo.Add("AttriButeData2", userifon.UserId);
- if (userdictionary.ContainsKey("Account"))
- {
- userdictionary.Remove("Account");
- }
- if (userdictionary.ContainsKey("Type"))
- {
- userdictionary.Remove("Type");
- }
- if (userdictionary.ContainsKey("UserId"))
- {
- userdictionary.Remove("UserId");
- }
- userdictionary.Add("Account", Btntitle.Text+doorlockBtn.Text);
- userdictionary.Add("Type", "1");
- userdictionary.Add("UserId", userifon.UserId);
};
doorlockRow.MouseUpEventHandler += doorlockclick;
doorlockBtn.MouseUpEventHandler += doorlockclick;
doorlockSelected.MouseUpEventHandler += doorlockclick;
doorlockfra.MouseUpEventHandler += doorlockclick;
- if (edit&&editdeviceConditionsInfo!=null)
+
+ if (edit && editdeviceConditionsInfo != null)
{
- deviceConditionsInfo = editdeviceConditionsInfo;
+
if (editdeviceConditionsInfo["AttriButeData2"] == userifon.UserId.ToString())
{
selectedIcon.Visible = false;
selectedIcon = doorlockSelected;
doorlockSelected.Visible = true;
}
-
+
}
}
@@ -334,7 +302,31 @@
Btncomplete.MouseUpEventHandler += (sender3, e3) =>
{
-
+ string userIdstr = "", openModestr="";
+ var deviceConditionsInfo = new Dictionary<string, string>();
+ var userdictionary = new Dictionary<string, string>();
+ deviceConditionsInfo.Add("Type", "1");
+ deviceConditionsInfo.Add("IsValid", "1");
+ deviceConditionsInfo.Add("MacAddr", common.DeviceAddr);
+ deviceConditionsInfo.Add("Epoint", common.DeviceEpoint.ToString());
+ deviceConditionsInfo.Add("Cluster_ID", "64529");
+ deviceConditionsInfo.Add("AttriButeData1", "2");
+ deviceConditionsInfo.Add("Range", "0");
+ deviceConditionsInfo.Add("AttriButeId", openMode);
+ deviceConditionsInfo.Add("AttriButeData2", userId);
+ userdictionary.Add("Account",accountname);
+ userdictionary.Add("Type", "1");
+ userdictionary.Add("UserId", userId);
+ if (edit)
+ {
+ openModestr = editdeviceConditionsInfo["AttriButeId"];
+ userIdstr = editdeviceConditionsInfo["AttriButeData2"];
+ }
+ else
+ {
+ openModestr = deviceConditionsInfo["AttriButeId"];
+ userIdstr = deviceConditionsInfo["AttriButeData2"];
+ }
if (SelectedDeviceStatuscondition != "")
{
bool add = false;
@@ -344,13 +336,13 @@
{
if ((Common.Logic.CurrentLogic.Conditions[i]["MacAddr"] == common.DeviceAddr) && (Common.Logic.CurrentLogic.Conditions[i]["Epoint"] == common.DeviceEpoint.ToString()))
{
- if (Common.Logic.CurrentLogic.Conditions[i]["AttriButeId"] == editdeviceConditionsInfo["AttriButeId"] && Common.Logic.CurrentLogic.Conditions[i]["AttriButeData2"] == editdeviceConditionsInfo["AttriButeData2"])
+ if (Common.Logic.CurrentLogic.Conditions[i]["AttriButeId"] == openModestr && Common.Logic.CurrentLogic.Conditions[i]["AttriButeData2"] == userIdstr)
{
Common.Logic.CurrentLogic.Conditions.RemoveAt(i);
Common.Logic.CurrentLogic.Conditions.Insert(i, deviceConditionsInfo);
for (int j = 0; j < Common.Logic.CurrentLogic.Accounts.Count; j++)
{
- if (Common.Logic.CurrentLogic.Accounts[j]["UserId"] == editdeviceConditionsInfo["AttriButeData2"])
+ if (Common.Logic.CurrentLogic.Accounts[j]["UserId"] == userIdstr)
{
Common.Logic.CurrentLogic.Accounts.RemoveAt(j);
Common.Logic.CurrentLogic.Accounts.Insert(j, userdictionary);
--
Gitblit v1.8.0