From eed381ca472abb06e386281e604569ebf80bbfe3 Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期四, 26 三月 2020 17:51:41 +0800
Subject: [PATCH] 2020-03-26
---
ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs | 87 +++++++++++++++----------------------------
1 files changed, 31 insertions(+), 56 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs
old mode 100755
new mode 100644
index 76e071f..061dbcc
--- a/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs
@@ -17,13 +17,12 @@
public void Show()
{
-
- #region 涓婇潰鐨勫竷灞�浠ｇ爜
+
+ #region 鐣岄潰甯冨眬浠ｇ爜
TopView view = new TopView();
this.AddChidren(view.TopRowView());
view.toptitleNameBtn.TextID = MyInternationalizationString.userlist;
view.clickBtn.MouseDownEventHandler += (sender, e) => { RemoveFromParent(); };
- #endregion
middle = new VerticalRefreshLayout
{
Y = view.topRowLayout.Bottom,
@@ -31,6 +30,7 @@
BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor,
};
this.AddChidren(middle);
+ #endregion
middle.BeginHeaderRefreshingAction += () =>
{
//閲嶆柊鍒锋柊logic鍒楄〃
@@ -95,7 +95,6 @@
/// </summary>
public void UserAllView(string macport)
{
- middle.RemoveAll();
for (int i = 0; i < Send.LockList.Count; i++)
{
var user = Send.LockList[i];
@@ -103,55 +102,24 @@
{
continue;
}
- var userFramelayout = new FrameLayout
+
+ FunView userView = new FunView();
+ userView.iconBtn.Visible = false;
+ userView.funnameBtn.X = Application.GetRealWidth(81);
+ userView.funnameBtn.Text = user.UserName;
+ userView.funnextBtn.X = Application.GetRealWidth(1080 - 81 - 58);
+ userView.lineBtn.X = Application.GetRealWidth(81);
+ userView.lineBtn.Width = Application.GetRealWidth(1080 - 81 - 58);
+ if (Send.LockList.Count - 1 == i)
{
- Height = Application.GetRealHeight(160),
- BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
- };
- middle.AddChidren(userFramelayout);
-
- var userRow = new RowLayout
- {
- Y = Application.GetRealHeight(30),
- Width = Application.GetRealWidth(1080 - 58 - 58),
- Height = Application.GetRealHeight(130),
- X = Application.GetRealWidth(58),
- LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
- };
- userFramelayout.AddChidren(userRow);
-
- var usernameBtn = new Button
- {
- Text = user.UserName,
- TextAlignment = TextAlignment.CenterLeft,
- TextColor = ZigbeeColor.Current.LogicTextBlackColor,
- Width = Application.GetRealWidth(600),
- Height = Application.GetRealHeight(130),
- Tag = Send.LockList[i],
- TextSize = 14,
- };
- userRow.AddChidren(usernameBtn);
-
- var btntimeback = new Button
- {
- Width = Application.GetRealWidth(58),
- Height = Application.GetRealHeight(58),
- UnSelectedImagePath = "ZigeeLogic/next.png",
- X = userRow.Width - Application.GetRealWidth(58),
- Gravity = Gravity.CenterVertical,
- };
- userRow.AddChidren(btntimeback);
-
-
- EventHandler<MouseEventArgs> userclick = (sender, e) =>
+ userView.funFrameLayout.Height = Application.GetRealHeight(160 + 20);//鏈�鍚庝竴琛屽鍔�20楂樺害;
+ userView.lineBtn.BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor;
+ }
+ middle.AddChidren(userView.FunFrameView());
+ userView.clickviewBtn.MouseUpEventHandler += (sender, e) =>
{
SelectedUserID(user);
};
- usernameBtn.MouseUpEventHandler += userclick;
- btntimeback.MouseUpEventHandler += userclick;
- userFramelayout.MouseUpEventHandler += userclick;
- userRow.MouseUpEventHandler += userclick;
-
}
}
@@ -249,6 +217,12 @@
string attriButeId = "";
string attriButeData2 = "";
string modeName = "";
+
+ ///瀹氫袱涓彉閲忚褰曚箣鍓嶇殑鍙�硷紱
+ string userId = "";
+ string openMode = "";
+ string accountName = "";
+ string SelectedDeviceStatuscondition = "";
for (int j = 0; j < membershipIfon.UserIdMode.Count; j++)
{
@@ -364,7 +338,8 @@
lockConditionsInfo.Add("Range", "0");
var accounts = new Dictionary<string, string>();
accounts.Add("Type", "1");
- accounts.Add("Account", membershipIfon.UserName + modeName);
+ accounts.Add("Account", Config.Instance.Guid);
+ accounts.Add("AccountName", membershipIfon.UserName + modeName);
accounts.Add("UserId", attriButeData2);
if (SelectedLockStatus != "")
{
@@ -386,10 +361,6 @@
}
}
}
- if (!addCondition)
- {
- Common.Logic.CurrentLogic.Conditions.Add(lockConditionsInfo);
- }
for (int i = 0; i < Common.Logic.CurrentLogic.Accounts.Count; i++)
{
@@ -402,8 +373,12 @@
}
}
}
+ if (!addCondition)
+ {//娌℃湁瀛樺湪鏁版嵁鏂板姞
+ Common.Logic.CurrentLogic.Conditions.Add(lockConditionsInfo);
+ }
if (!addAccount)
- {
+ {//娌℃湁瀛樺湪鏁版嵁鏂板姞
Common.Logic.CurrentLogic.Accounts.Add(accounts);
}
}
@@ -447,6 +422,6 @@
lockLogicCommunalPage.Show(() => { });
};
}
-
+
}
}
--
Gitblit v1.8.0