From fa6bcb2e9907772480f99205f36ec2a1ce735a22 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 09 一月 2020 14:11:07 +0800
Subject: [PATCH] 合并代码
---
ZigbeeApp/Shared/Phone/UserCenter/DoorLock/MemberFrozenPage.cs | 32 ++++++++++++++++----------------
1 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/MemberFrozenPage.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/MemberFrozenPage.cs
index 28e15de..f66abcf 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/MemberFrozenPage.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/MemberFrozenPage.cs
@@ -219,25 +219,25 @@
unLockMethod.Show();
}
else if (currentIndex == 1)
- {
+ {
if (!btnRight.IsSelected)
{
- FreezeUser(true);
+ FreezeUser(true);
}
else
{
- FreezeUser(false);
+ FreezeUser(false);
}
}
else if (currentIndex == 2)
- {
+ {
if (!btnRight.IsSelected)
{
- HasRemoteUnlockAccessMethod(true);
+ HasRemoteUnlockAccessMethod(true);
}
else
{
- HasRemoteUnlockAccessMethod(false);
+ HasRemoteUnlockAccessMethod(false);
}
}
};
@@ -299,8 +299,8 @@
foreach (var curDoorLockUser in curAccountDoorLockUserList)
{
// 璐︽埛涓病鏈夐棬閿佺敤鎴�
- if (curDoorLockUser.DoorLockLocalUserId == null || curDoorLockUser.DoorLockLocalUserId == "")
- {
+ if (string.IsNullOrEmpty(curDoorLockUser.DoorLockLocalUserId))
+ {
}
else
{
@@ -325,16 +325,16 @@
}
//鍐荤粨/瑙ｅ喕鐢ㄦ埛
int count1 = tempGroupId.Count;
- if (tempGroupId.Count==1)
+ if (tempGroupId.Count == 1)
{
foreach (var a in tempGroupId)
{
- if(a.Count ==0)
+ if (a.Count == 0)
{
count1 = 0;
break;
}
- }
+ }
}
int count2 = 0;
@@ -357,8 +357,8 @@
else if (resultData.defaultControlResponseData.status == 33)
{
count2++;
- }
- System.Threading.Thread.Sleep(1000);
+ }
+ System.Threading.Thread.Sleep(1000);
}
else
{
@@ -370,7 +370,7 @@
}
tempCount++;
}
-
+
// 鎵归噺鍐荤粨闂ㄩ攣涓殑璐︽埛鍚庯紝鍑嗗鍐荤粨浜戠璐︽埛
if (count2 == count1)
{
@@ -565,7 +565,7 @@
});
}
});
- };
+ };
}
//鏄惁缁欏瓙璐︽埛鎷ユ湁杩滅▼寮�閿佺殑鏉′欢
@@ -761,7 +761,7 @@
});
}
});
- };
+ };
}
#region 鈼� 鎺ュ彛瀹炵幇__________________________
--
Gitblit v1.8.0