From c0021397eeb8335d6d1f20990c71533c3d94e7af Mon Sep 17 00:00:00 2001 From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local> Date: 星期五, 10 一月 2020 17:02:38 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/dev-tzy' into DEV_GXC --- ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs index cdc7424..8be3906 100755 --- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs +++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs @@ -208,7 +208,7 @@ { foreach (var curDoorLockUser in getDoorLockInfoAllList) { - if (curDoorLockUser.DoorLockLocalUserId == null || curDoorLockUser.DoorLockLocalUserId == "") + if (string.IsNullOrEmpty(curDoorLockUser.DoorLockLocalUserId)) { continue; } @@ -296,7 +296,7 @@ { foreach (var curDoorLockUser in getDoorLockInfoList.PageData) { - if (curDoorLockUser.DoorLockLocalUserId == null || curDoorLockUser.DoorLockLocalUserId == "") + if (string.IsNullOrEmpty(curDoorLockUser.DoorLockLocalUserId)) { continue; } @@ -398,7 +398,7 @@ { foreach (var curDoorLockUser in getDoorLockInfoAllList) { - if (curDoorLockUser.DoorLockLocalUserId == null || curDoorLockUser.DoorLockLocalUserId == "") + if (string.IsNullOrEmpty(curDoorLockUser.DoorLockLocalUserId)) { continue; } @@ -438,7 +438,7 @@ //鑾峰彇浜戠瀛樺偍鐨勯棬閿佹垚鍛樹俊鎭� foreach (var curDoorLockUser in getDoorLockInfoList.PageData) { - if (curDoorLockUser.CloudAccountId == "" || curDoorLockUser.CloudAccountId != subAccountDistributedMark) + if (string.IsNullOrEmpty(curDoorLockUser.CloudAccountId) || curDoorLockUser.CloudAccountId != subAccountDistributedMark) { continue; } @@ -596,7 +596,7 @@ { var curDoorLockUser = doorLock.localDoorLockAccountList[curUserId]; - if (curDoorLockUser.ConnectedAccount == "" || curDoorLockUser.ConnectedAccount != curAccountObj.SubAccountDistributedMark) + if (string.IsNullOrEmpty(curDoorLockUser.ConnectedAccount) || curDoorLockUser.ConnectedAccount != curAccountObj.SubAccountDistributedMark) { continue; } -- Gitblit v1.8.0