From 9cc8fd11b13813adbdd3c6c31554e5c0bebf4026 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期五, 21 八月 2020 19:53:49 +0800
Subject: [PATCH] 发布到商店的版本
---
ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs | 43 ++++++++++++++++++++++---------------------
1 files changed, 22 insertions(+), 21 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs
index 79ba027..f1e2b56 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs
@@ -130,23 +130,7 @@
public void SelectedUserID(Send.MembershipIfon user)
{
- //鍏冪礌瓒呭嚭9涓氨鐢ㄤ笂涓嬫粦鍔ㄦ帶浠�;
- VerticalScrolViewLayout vV = null;
- int count = user.UserIdMode.Count;
- if (count > 9)
- {
- ///鍏冪礌瓒呭嚭9涓�;
- count = 6;
- //鍏冪礌瓒呭嚭9涓氨鐢ㄤ笂涓嬫粦鍔ㄦ帶浠�;
- vV = new VerticalScrolViewLayout
- {
- Y = Application.GetRealHeight(140 + 20),
- Height = Application.GetRealHeight(160 * count),
- };
- //娓呴櫎涔嬪墠鐨勬帶浠�;
- vV.RemoveAll();
- }
-
+ int count = user.UserIdMode.Count;
#region -------鍙栨秷 瀹屾垚
var flMain = new FrameLayout { BackgroundColor = ZigbeeColor.Current.LogicTranslucentColor };
this.AddChidren(flMain);
@@ -159,9 +143,24 @@
flMain.RemoveFromParent();
};
flMain.MouseUpEventHandler += clickcancel;
- completeView.Btncancel.MouseUpEventHandler += clickcancel;
+ completeView.Btncancel.MouseUpEventHandler += clickcancel;
#endregion
-
+ //鍏冪礌瓒呭嚭9涓氨鐢ㄤ笂涓嬫粦鍔ㄦ帶浠�;
+ VerticalScrolViewLayout vV = null;
+ if (count > 9)
+ {
+ ///鍏冪礌瓒呭嚭9涓�;
+ count = 6;
+ //鍏冪礌瓒呭嚭9涓氨鐢ㄤ笂涓嬫粦鍔ㄦ帶浠�;
+ vV = new VerticalScrolViewLayout
+ {
+ Y = Application.GetRealHeight(140 + 20),
+ Height = Application.GetRealHeight(160 * count),
+ };
+ //娓呴櫎涔嬪墠鐨勬帶浠�;
+ vV.RemoveAll();
+ completeView.Show(count).AddChidren(vV);
+ }
///瀹氫袱涓彉閲忚褰曚箣鍓嶇殑鍙�硷紱
string userId = "";
string openMode = "";
@@ -176,7 +175,6 @@
if (user.UserIdMode.Count > 9)
{
//鍏冪礌瓒呭嚭9涓氨鐢ㄤ笂涓嬫粦鍔ㄦ帶浠�;
- completeView.Show(count).AddChidren(vV);
vV.AddChidren(lockView.Show());
}
else
@@ -262,7 +260,10 @@
var accounts = new Dictionary<string, string>();
accounts.Add("Type", "1");
accounts.Add("Account", Config.Instance.Guid);
- accounts.Add("AccountName",accountName);
+ accounts.Add("AccountName",accountName);
+ ///mac+绔彛鏄负璇嗗埆鏄偅涓棬閿�;
+ accounts.Add("Option4", Send.CurrentDoorLock.DeviceAddr);
+ accounts.Add("Option2", Send.CurrentDoorLock.DeviceEpoint.ToString());
accounts.Add("UserId", userId);
if (SelectedDeviceStatuscondition != "")
{
--
Gitblit v1.8.0