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/LockLogicList.cs | 50 ++++++--------------------------------------------
1 files changed, 6 insertions(+), 44 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicList.cs b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicList.cs
index 8790293..8c94faa 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicList.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicList.cs
@@ -98,34 +98,8 @@
{
continue;
}
- Common.Logic.LockLogicList.Add(listlogic[j]);
- //bool yes = false;
- //for (int a = 0; a < logic.Accounts.Count; a++)
- //{
- // //Option4鏄澶噈ac锛汷ption2鏄澶囩鍙ｏ紱
- // if (logic.Accounts[a]["Option4"].ToString() != Send.CurrentDoorLock.DeviceAddr && logic.Accounts[a]["Option2"].ToString() != Send.CurrentDoorLock.DeviceEpoint.ToString())
- // {
- // //鏌ユ壘鏄惁鏄偅涓棬閿侊紱
- // //濡傛灉涓嶆槸璇ラ棬閿佽仈鍔ㄤ簨浠朵笉鏄剧ず鍑烘潵;
- // yes = false;
-
- // }
- // else
- // {
- // yes = true;
-
- // }
- // //if (logic.Accounts[a]["Account"].ToString() == Config.Instance.Guid)
- // //{
- // // //鏌ユ壘鑷繁璐﹀彿涓嬬殑鍒涘缓鑱斿姩浜嬩欢锛�
- // // yes = true;
- // // break;
- // //}
- //}
- //if (yes)
- //{
- // Common.Logic.LockLogicList.Add(listlogic[j]);
- //}
+ Common.Logic.LockLogicList.Add(logic);
+
}
}
}
@@ -272,7 +246,7 @@
logicRowlayout.AddRightView(del);
del.MouseUpEventHandler += (sender, e) =>
{
- var alert = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Confirm,
+ var alert = new UserCenter.ShowMsgControl(ShowMsgType.Confirm,
Language.StringByID(MyInternationalizationString.doyouwanttodelete),
Language.StringByID(MyInternationalizationString.confrim));
alert.Show();
@@ -320,29 +294,17 @@
/// <returns></returns>
private bool Exist(Common.Logic logic)
{
- bool yes = false;
for (int j = 0; j < logic.Accounts.Count; j++)
{
//Option4鏄澶噈ac锛汷ption2鏄澶囩鍙ｏ紱
- if (logic.Accounts[j]["Option4"].ToString() != Send.CurrentDoorLock.DeviceAddr && logic.Accounts[j]["Option2"].ToString() != Send.CurrentDoorLock.DeviceEpoint.ToString())
+ if (logic.Accounts[j]["Option4"].ToString() == Send.CurrentDoorLock.DeviceAddr)
{
//鏌ユ壘鏄惁鏄偅涓棬閿侊紱
//濡傛灉涓嶆槸璇ラ棬閿佽仈鍔ㄤ簨浠朵笉鏄剧ず鍑烘潵;
- yes = false;
+ return true;
}
- else
- {
- yes = true;
- }
- //if (logic.Accounts[j]["Account"].ToString() == Config.Instance.Guid)
- //{
- // //鏌ユ壘鑷繁璐﹀彿涓嬬殑鍒涘缓鑱斿姩浜嬩欢锛�
- // yes = true;
- // break;
- //}
-
}
- return yes;
+ return false;
}
}
}
--
Gitblit v1.8.0