From 25429f085093d89d543a0b90e30d0d62d1b7dac9 Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期二, 30 八月 2022 09:37:38 +0800
Subject: [PATCH] 合并了IOS的代码
---
ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs | 20 +++++++++-----------
1 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs
index f1e2b56..e747af7 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs
@@ -130,7 +130,7 @@
public void SelectedUserID(Send.MembershipIfon user)
{
- int count = user.UserIdMode.Count;
+ int count = user.UserIdMode.Count;
#region -------鍙栨秷 瀹屾垚
var flMain = new FrameLayout { BackgroundColor = ZigbeeColor.Current.LogicTranslucentColor };
this.AddChidren(flMain);
@@ -143,9 +143,9 @@
flMain.RemoveFromParent();
};
flMain.MouseUpEventHandler += clickcancel;
- completeView.Btncancel.MouseUpEventHandler += clickcancel;
+ completeView.Btncancel.MouseUpEventHandler += clickcancel;
#endregion
- //鍏冪礌瓒呭嚭9涓氨鐢ㄤ笂涓嬫粦鍔ㄦ帶浠�;
+ //鍏冪礌瓒呭嚭9涓氨鐢ㄤ笂涓嬫粦鍔ㄦ帶浠�;
VerticalScrolViewLayout vV = null;
if (count > 9)
{
@@ -157,16 +157,16 @@
Y = Application.GetRealHeight(140 + 20),
Height = Application.GetRealHeight(160 * count),
};
- //娓呴櫎涔嬪墠鐨勬帶浠�;
- vV.RemoveAll();
+ //鍏冪礌瓒呭嚭9涓氨鐢ㄤ笂涓嬫粦鍔ㄦ帶浠�;
completeView.Show(count).AddChidren(vV);
+ //娓呴櫎涔嬪墠鐨勬帶浠�;
+ vV.RemoveAll();
}
///瀹氫袱涓彉閲忚褰曚箣鍓嶇殑鍙�硷紱
string userId = "";
string openMode = "";
string accountName = "";
string SelectedDeviceStatuscondition = "";
-
for (int i = 0; i < user.UserIdMode.Count; i++)
{
var userifon = user.UserIdMode[i];
@@ -174,7 +174,7 @@
mFunView lockView = new mFunView();
if (user.UserIdMode.Count > 9)
{
- //鍏冪礌瓒呭嚭9涓氨鐢ㄤ笂涓嬫粦鍔ㄦ帶浠�;
+
vV.AddChidren(lockView.Show());
}
else
@@ -243,8 +243,6 @@
}
}
-
-
completeView.Btncomplete.MouseUpEventHandler += (sender, e) =>
{
var lockConditionsInfo = new Dictionary<string, string>();
@@ -260,7 +258,7 @@
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());
@@ -333,7 +331,7 @@
{
if (conditionsIndex == -1)
{
- var alert = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Normal,
+ var alert = new UserCenter.ShowMsgControl(ShowMsgType.Normal,
Language.StringByID(MyInternationalizationString.usertip),
Language.StringByID(MyInternationalizationString.confrim));
alert.Show();
--
Gitblit v1.8.0