From 1f6f024bddf48dea1c17c54ade1535a10ef7b39b Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期一, 23 三月 2020 17:16:37 +0800
Subject: [PATCH] 2020-03-23-2
---
ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs | 283 ++++++++++++++++++++++++++++++++------------------------
1 files changed, 163 insertions(+), 120 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs
old mode 100644
new mode 100755
index ea49ce1..76e071f
--- a/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs
@@ -9,73 +9,53 @@
{
public AddCondition()
{
- Tag = "LockLogic";
+ Tag = "Logic";
}
Button selectedIcon = new Button();
-
+ VerticalRefreshLayout middle;
public int conditionsIndex = -1;
- public async void Show()
+
+ public void Show()
{
- #region 鏈�涓婇潰鐨勫竷灞�浠ｇ爜
- var topRowLayout = new RowLayout
- {
- BackgroundColor = ZigbeeColor.Current.LogicTopBackgroundColor,
- Height = Application.GetRealHeight(184),
- LineColor = ZigbeeColor.Current.LogicRowLayoutTopLineColor,
- };
- this.AddChidren(topRowLayout);
-
- var titleName = new Button
- {
- TextSize = 16,
- TextColor = ZigbeeColor.Current.LogicTextBlackColor,
- TextAlignment = TextAlignment.CenterLeft,
- X = Application.GetRealWidth(176),
- Width = Application.GetRealWidth(600),
- Height = Application.GetRealHeight(69),
- Y = Application.GetRealHeight(92),
- TextID = MyInternationalizationString.userlist,
- //Text = "閫夋嫨鐢ㄦ埛",
- };
- topRowLayout.AddChidren(titleName);
-
- var clickBtn = new Button
- {
- Width = Application.GetRealWidth(81 + 51),
- Height = Application.GetRealHeight(58 + 40),
- Y = Application.GetRealHeight(98 - 40),
- };
- topRowLayout.AddChidren(clickBtn);
- clickBtn.MouseDownEventHandler += (sender, e) =>
- {
- RemoveFromParent();
- };
-
- var back = new Button
- {
- Width = Application.GetRealWidth(30),
- Height = Application.GetRealHeight(51),
- X = Application.GetRealWidth(81),
- Y = Application.GetRealHeight(98),
- //Gravity = Gravity.CenterVertical;
- UnSelectedImagePath = "ZigeeLogic/back.png",
- };
- topRowLayout.AddChidren(back);
- back.MouseDownEventHandler += (sender, e) =>
- {
- RemoveFromParent();
- };
-
+
+ #region 涓婇潰鐨勫竷灞�浠ｇ爜
+ TopView view = new TopView();
+ this.AddChidren(view.TopRowView());
+ view.toptitleNameBtn.TextID = MyInternationalizationString.userlist;
+ view.clickBtn.MouseDownEventHandler += (sender, e) => { RemoveFromParent(); };
#endregion
-
- var middle = new VerticalScrolViewLayout
+ middle = new VerticalRefreshLayout
{
- Y = topRowLayout.Bottom,
+ Y = view.topRowLayout.Bottom,
Height = Application.GetRealHeight(1920 - 184),
BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor,
};
this.AddChidren(middle);
+ middle.BeginHeaderRefreshingAction += () =>
+ {
+ //閲嶆柊鍒锋柊logic鍒楄〃
+ string macport = Send.CurrentDoorLock.DeviceAddr + "_" + Send.CurrentDoorLock.DeviceEpoint.ToString();
+ for (int i = 0; i < Send.LockList.Count; i++)
+ {
+ if (Send.LockList[i].DoorLockMacPort == macport)
+ {
+ ///浠庡垪琛ㄧЩ闄ゅ綋鍓嶉棬閿佸叏閮ㄧ殑鏃ф暟鎹紱
+ Send.LockList.Remove(Send.LockList[i]);
+ i--;
+ }
+ }
+ Read();
+ //鍏抽棴鍒锋柊View锛�
+ middle.EndHeaderRefreshing();
+ };
+ Read();
+ }
+ /// <summary>
+ /// 璇诲彇褰撳墠闂ㄩ攣鐨勪簯绔暟鎹紱
+ /// </summary>
+ public void Read()
+ {
bool d = false;
string macport = Send.CurrentDoorLock.DeviceAddr + "_" + Send.CurrentDoorLock.DeviceEpoint.ToString();
for (int i = 0; i < Send.LockList.Count; i++)
@@ -86,25 +66,36 @@
d = true;
break;
}
-
}
-
- if (!d)
+ CommonPage.Loading.Start();
+ middle.RemoveAll();
+ System.Threading.Tasks.Task.Run(async () =>
{
-
- var allMemberslist = await Send.AllMembers(Send.CurrentDoorLock.DeviceAddr);
- Send.LockList.AddRange(allMemberslist);
- }
- UserAllView(middle, macport);
-
+ try
+ {
+ if (!d)
+ {
+ var allMemberslist = await Send.AllMembers(macport);
+ Send.LockList.AddRange(allMemberslist);
+ }
+ }
+ catch { }
+ finally
+ {
+ Application.RunOnMainThread(() =>
+ {
+ CommonPage.Loading.Hide();
+ UserAllView(macport);
+ });
+ }
+ });
}
/// <summary>
/// 鏄剧ず鎵�鏈夌敤鎴�
/// </summary>
- /// <param name="middle"></param>
- void UserAllView(VerticalScrolViewLayout middle,string macport)
+ public void UserAllView(string macport)
{
-
+ middle.RemoveAll();
for (int i = 0; i < Send.LockList.Count; i++)
{
var user = Send.LockList[i];
@@ -137,6 +128,7 @@
Width = Application.GetRealWidth(600),
Height = Application.GetRealHeight(130),
Tag = Send.LockList[i],
+ TextSize = 14,
};
userRow.AddChidren(usernameBtn);
@@ -153,7 +145,7 @@
EventHandler<MouseEventArgs> userclick = (sender, e) =>
{
- SelectedUserID(user.UserIdMode, usernameBtn.Text);
+ SelectedUserID(user);
};
usernameBtn.MouseUpEventHandler += userclick;
btntimeback.MouseUpEventHandler += userclick;
@@ -167,10 +159,10 @@
/// 閫夋嫨鏌愪釜鐢ㄦ埛
/// </summary>
/// <param name="membershipIfon">瑙﹀彂婧愬垪琛�</param>
- /// <param name="userName">鐢ㄦ埛鍚嶅瓧</param>
- void SelectedUserID(List<Send.UnlockingMode> membershipIfon, string userName) {
+ public void SelectedUserID(Send.MembershipIfon membershipIfon)
+ {
- var flMain = new FrameLayout { BackgroundColor = ZigbeeColor.Current.LogicViewBackgroundColor };
+ var flMain = new FrameLayout { BackgroundColor = ZigbeeColor.Current.LogicViewBackgroundColor };
this.AddChidren(flMain);
flMain.MouseUpEventHandler += (sender1, e1) =>
@@ -178,14 +170,7 @@
flMain.RemoveFromParent();
};
- var lockcolorfra = new FrameLayout
- {
- Width = Application.GetRealWidth(1080),
- Height = Application.GetRealHeight(100),
- Y = Application.GetRealHeight(1920 - 100),
- BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
- };
- flMain.AddChidren(lockcolorfra);
+
var lockcolorfra1 = new FrameLayout
{
@@ -197,12 +182,14 @@
Radius = (uint)Application.GetRealHeight(60),
};
flMain.AddChidren(lockcolorfra1);
+ lockcolorfra1.SetCornerWithSameRadius(Application.GetRealHeight(58), HDLUtils.RectCornerTopLeft | HDLUtils.RectCornerTopRight);
#region -------鍙栨秷 瀹屾垚
var lockRow = new RowLayout
{
Height = Application.GetRealHeight(140),
LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
+
};
lockcolorfra1.AddChidren(lockRow);
var Btncancel = new Button
@@ -213,6 +200,7 @@
Width = Application.GetRealWidth(200),
X = Application.GetRealWidth(80),
TextAlignment = TextAlignment.CenterLeft,
+ TextSize = 14,
};
lockRow.AddChidren(Btncancel);
Btncancel.MouseUpEventHandler += (sender16, e16) =>
@@ -230,7 +218,7 @@
TextAlignment = TextAlignment.Center,
X = Btncancel.Right + Application.GetRealWidth(100),
TextSize = 16,
- Text =userName,
+ Text = membershipIfon.UserName,
};
lockRow.AddChidren(Btntitle);
var Btncomplete = new Button
@@ -241,19 +229,30 @@
Width = Application.GetRealWidth(200),
TextAlignment = TextAlignment.CenterRight,
X = Btntitle.Right + Application.GetRealWidth(100),
+ TextSize = 14,
};
lockRow.AddChidren(Btncomplete);
#endregion
- string SelectedLockStatus = "";
- lockcolorfra1.Y = Application.GetRealHeight(1920 - 140 - (160 * membershipIfon.Count) - 20 - 50);
- lockcolorfra1.Height = Application.GetRealHeight(140 + (160 * membershipIfon.Count) + 20 + 50);
- ///瀹氫箟涓や釜鍙橀噺璁板綍閫変腑鐘舵�侊紱
- string attriButeId ="", attriButeData2 ="";
- for (int j = 0; j < membershipIfon.Count; j++)
+
+ lockcolorfra1.Y = Application.GetRealHeight(1920 - 140 - (160 * membershipIfon.UserIdMode.Count) - 20 - 50);
+ lockcolorfra1.Height = Application.GetRealHeight(140 + (160 * membershipIfon.UserIdMode.Count) + 20 + 50);
+ if (membershipIfon.UserIdMode.Count > 9)
{
- var userIdmode = membershipIfon[j];
+ ///鍏冪礌瓒呭嚭10涓紝鏆傛椂榛樿鏄剧ず10;
+ lockcolorfra1.Y = Application.GetRealHeight(1920 - 140 - (160 * 9) - 20 - 50);
+ lockcolorfra1.Height = Application.GetRealHeight(140 + (160 * 9) + 20 + 50);
+ }
+ string SelectedLockStatus = "";
+ ///瀹氫箟涓や釜鍙橀噺璁板綍閫変腑鐘舵�侊紱
+ string attriButeId = "";
+ string attriButeData2 = "";
+ string modeName = "";
+
+ for (int j = 0; j < membershipIfon.UserIdMode.Count; j++)
+ {
+ var userIdmode = membershipIfon.UserIdMode[j];
var doorlockfra = new FrameLayout
{
Height = Application.GetRealHeight(160),
@@ -277,28 +276,9 @@
TextAlignment = TextAlignment.CenterLeft,
TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
Text = userIdmode.ModeName,
+ TextSize = 14,
};
doorlockRow.AddChidren(doorlockBtn);
- //(0鎸夐敭/3鍗�/15鎸囩汗)
- //switch (userIdmode.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
{
@@ -311,7 +291,7 @@
};
doorlockRow.AddChidren(doorlockSelected);
- if ((membershipIfon.Count - 1) == j)
+ if ((membershipIfon.UserIdMode.Count - 1) == j)
{
doorlockRow.LineColor = ZigbeeColor.Current.LogicBackgroundColor;
}
@@ -321,14 +301,39 @@
selectedIcon.Visible = false;
selectedIcon = doorlockSelected;
doorlockSelected.Visible = true;
- //doorlockBtn.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
- attriButeId = userIdmode.OpenMode.ToString();
+ //doorlockBtn.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
+ attriButeId = userIdmode.OpenMode.ToString();
attriButeData2 = userIdmode.UserId;
+ modeName = userIdmode.ModeName;
};
doorlockRow.MouseUpEventHandler += doorlockclick;
doorlockBtn.MouseUpEventHandler += doorlockclick;
doorlockSelected.MouseUpEventHandler += doorlockclick;
doorlockfra.MouseUpEventHandler += doorlockclick;
+
+ if (string.IsNullOrEmpty(doorlockBtn.Text))
+ {
+ string strname = "";
+ switch (userIdmode.OpenMode)
+ {
+ case 0:
+ {
+ strname = Language.StringByID(MyInternationalizationString.lockpassword);
+ }
+ break;
+ case 3:
+ {
+ strname = Language.StringByID(MyInternationalizationString.ic);
+ }
+ break;
+ case 15:
+ {
+ strname = Language.StringByID(MyInternationalizationString.fingerprint);
+ }
+ break;
+ }
+ doorlockBtn.Text = userIdmode.UserId + strname;
+ }
///鏄剧ず涔嬪墠鐨勭姸鎬�
if (conditionsIndex != -1)
{
@@ -339,9 +344,12 @@
selectedIcon = doorlockSelected;
doorlockSelected.Visible = true;
}
+
+
}
}
-
+
+
Btncomplete.MouseUpEventHandler += (sender, e) =>
{
var lockConditionsInfo = new Dictionary<string, string>();
@@ -354,11 +362,16 @@
lockConditionsInfo.Add("AttriButeData2", attriButeData2);
lockConditionsInfo.Add("AttriButeData1", "2");
lockConditionsInfo.Add("Range", "0");
+ var accounts = new Dictionary<string, string>();
+ accounts.Add("Type", "1");
+ accounts.Add("Account", membershipIfon.UserName + modeName);
+ accounts.Add("UserId", attriButeData2);
if (SelectedLockStatus != "")
{
if (conditionsIndex == -1)
{
- bool add = false;
+ bool addCondition = false;
+ bool addAccount = false;
for (int i = 0; i < Common.Logic.CurrentLogic.Conditions.Count; i++)
{
if (Common.Logic.CurrentLogic.Conditions[i]["Type"] == "1")
@@ -367,23 +380,53 @@
{
if (Common.Logic.CurrentLogic.Conditions[i]["AttriButeId"] == lockConditionsInfo["AttriButeId"] && Common.Logic.CurrentLogic.Conditions[i]["AttriButeData2"] == lockConditionsInfo["AttriButeData2"])
{
- add = true;
+ addCondition = true;
break;
}
}
}
}
-
- if (!add)
+ if (!addCondition)
{
Common.Logic.CurrentLogic.Conditions.Add(lockConditionsInfo);
}
+ for (int i = 0; i < Common.Logic.CurrentLogic.Accounts.Count; i++)
+ {
+ if (Common.Logic.CurrentLogic.Accounts[i]["Type"] == "1")
+ {
+ if (Common.Logic.CurrentLogic.Accounts[i]["UserId"] == attriButeData2)
+ {
+ addAccount = true;
+ break;
+ }
+ }
+ }
+ if (!addAccount)
+ {
+ Common.Logic.CurrentLogic.Accounts.Add(accounts);
+ }
}
else
{
+ ///鎵惧嚭涔嬪墠鐨勬棫鏁版嵁绉婚櫎鎺夛紝鍐嶉噸鏂版坊鍔犳柊鏁版嵁锛�
+ string accountuserId = Common.Logic.CurrentLogic.Conditions[conditionsIndex]["AttriButeData2"];
Common.Logic.CurrentLogic.Conditions.RemoveAt(conditionsIndex);
Common.Logic.CurrentLogic.Conditions.Insert(conditionsIndex, lockConditionsInfo);
+ for (int i = 0; i < Common.Logic.CurrentLogic.Accounts.Count; i++)
+ {
+ if (Common.Logic.CurrentLogic.Accounts[i]["Type"] == "1")
+ {
+ ///鎵惧嚭涔嬪墠鐨勬棫鏁版嵁绉婚櫎鎺夛紝鍐嶉噸鏂版坊鍔犳柊鏁版嵁锛�
+ if (Common.Logic.CurrentLogic.Accounts[i]["UserId"] == accountuserId)
+ {
+ Common.Logic.CurrentLogic.Accounts.RemoveAt(i);
+ Common.Logic.CurrentLogic.Accounts.Insert(i, accounts);
+ break;
+ }
+ }
+ }
+
}
}
@@ -391,9 +434,9 @@
{
if (conditionsIndex == -1)
{
- var alert = new Alert(Language.StringByID(MyInternationalizationString.Prompt),
- Language.StringByID(MyInternationalizationString.selectdevicestatuscondition),
- Language.StringByID(MyInternationalizationString.complete));
+ var alert = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Normal,
+ Language.StringByID(MyInternationalizationString.usertip),
+ Language.StringByID(MyInternationalizationString.confrim));
alert.Show();
return;
}
@@ -404,6 +447,6 @@
lockLogicCommunalPage.Show(() => { });
};
}
-
+
}
}
--
Gitblit v1.8.0