From 59ab4de7a58a8da55f2136440269c60a1172e16d Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期三, 20 十一月 2019 17:29:06 +0800
Subject: [PATCH] 2019-11-20-1
---
ZigbeeApp/Shared/Phone/Device/Logic/MemberList.cs | 72 ++++++++++++++++-------------------
1 files changed, 33 insertions(+), 39 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/MemberList.cs b/ZigbeeApp/Shared/Phone/Device/Logic/MemberList.cs
index c69ca44..423a369 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/MemberList.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/MemberList.cs
@@ -14,7 +14,6 @@
Tag = "Logic";
}
Button selectedIcon = new Button();
- public static Action action;
public static bool edit=false;
@@ -35,7 +34,7 @@
var titleName = new Button
{
- TextSize = 16,
+ TextSize = 17,
TextColor = ZigbeeColor.Current.LogicTextBlackColor,
TextAlignment = TextAlignment.CenterLeft,
X = Application.GetRealWidth(176),
@@ -56,7 +55,6 @@
clickBtn.MouseDownEventHandler += (sender, e) =>
{
RemoveFromParent();
- action();
};
var back = new Button
@@ -110,11 +108,11 @@
{
continue;
}
- var userFramelayout = new RowLayout
+ var userFramelayout = new FrameLayout
{
Height = Application.GetRealHeight(160),
BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
- LineColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
+ // LineColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
};
middle.AddChidren(userFramelayout);
@@ -134,6 +132,7 @@
Text = user.UserName,
TextAlignment = TextAlignment.CenterLeft,
TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+ TextSize = 14,
};
userRow.AddChidren(userBtn);
@@ -191,6 +190,7 @@
Width = Application.GetRealWidth(200),
X = Application.GetRealWidth(80),
TextAlignment = TextAlignment.CenterLeft,
+ TextSize = 14,
};
lockRow.AddChidren(Btncancel);
Btncancel.MouseUpEventHandler += (sender16, e16) =>
@@ -219,12 +219,16 @@
Width = Application.GetRealWidth(200),
TextAlignment = TextAlignment.CenterRight,
X = Btntitle.Right + Application.GetRealWidth(100),
+ TextSize = 14,
};
lockRow.AddChidren(Btncomplete);
#endregion
///瀹氫袱涓彉閲忚褰曚箣鍓嶇殑鍙�硷紱
- string userId = "", openMode = "", accountname="", SelectedDeviceStatuscondition = "";
+ string userId = "";
+ string openMode = "";
+ string accountname = "";
+ string 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++)
@@ -253,27 +257,10 @@
TextAlignment = TextAlignment.CenterLeft,
TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
Text= userifon.ModeName,
+ TextSize = 14,
};
doorlockRow.AddChidren(doorlockBtn);
- //(1鎸夐敭/3鍗�/15鎸囩汗)
- //switch (userifon.OpenMode.ToString())
- //{
- // case "0":
- // {
- // doorlockBtn.Text = Language.StringByID(MyInternationalizationString.lockpassword);
- // }
- // break;
- // case "3":
- // {
- // doorlockBtn.Text = Language.StringByID(MyInternationalizationString.ic);
- // }
- // break;
- // case "15":
- // {
- // doorlockBtn.Text = Language.StringByID(MyInternationalizationString.fingerprint);
- // }
- // break;
- //}
+
var doorlockSelected = new Button
{
X = Application.GetRealWidth(860),
@@ -299,7 +286,6 @@
openMode = userifon.OpenMode.ToString();
accountname = Btntitle.Text + doorlockBtn.Text;
//doorlockBtn.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
-
};
doorlockRow.MouseUpEventHandler += doorlockclick;
doorlockBtn.MouseUpEventHandler += doorlockclick;
@@ -350,7 +336,8 @@
}
if (SelectedDeviceStatuscondition != "")
{
- bool add = false;
+ bool addConditions = false;
+ bool addAccounts = false;
for (int i = 0; i < Common.Logic.CurrentLogic.Conditions.Count; i++)
{
if (Common.Logic.CurrentLogic.Conditions[i]["Type"] == "1")
@@ -361,26 +348,33 @@
{
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"] == userIdstr)
- {
- Common.Logic.CurrentLogic.Accounts.RemoveAt(j);
- Common.Logic.CurrentLogic.Accounts.Insert(j, userdictionary);
- }
- }
- add = true;
+ addConditions = true;
break;
}
}
}
}
- if (!add)
+ for (int j = 0; j < Common.Logic.CurrentLogic.Accounts.Count; j++)
{
- Common.Logic.CurrentLogic.Accounts.Add(userdictionary);
+ if (Common.Logic.CurrentLogic.Accounts[j]["Type"] == "1")
+ {
+ if (Common.Logic.CurrentLogic.Accounts[j]["UserId"] == userIdstr)
+ {
+ Common.Logic.CurrentLogic.Accounts.RemoveAt(j);
+ Common.Logic.CurrentLogic.Accounts.Insert(j, userdictionary);
+ addAccounts = true;
+ break;
+ }
+ }
+ }
+ if (!addConditions)
+ {
Common.Logic.CurrentLogic.Conditions.Add(deviceConditionsInfo);
}
-
+ if (!addAccounts)
+ {
+ Common.Logic.CurrentLogic.Accounts.Add(userdictionary);
+ }
}
else
{
--
Gitblit v1.8.0