From 66a9965c44ecc32a6696abca876ab9d1cd091584 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期五, 28 二月 2020 15:25:13 +0800
Subject: [PATCH] 2020.2.28
---
ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UnLockMethod.cs | 33 +++++++++++++++------------------
1 files changed, 15 insertions(+), 18 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UnLockMethod.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UnLockMethod.cs
index 0f80521..a9e6361 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UnLockMethod.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UnLockMethod.cs
@@ -25,10 +25,6 @@
var doorLock = tempDevice as ZigBee.Device.DoorLock;
if (doorLock.doorLockProgrammingEventNotificationCommand != null)
{
-
- Application.RunOnMainThread(() =>
- {
- });
}
}
}
@@ -214,10 +210,12 @@
};
midTopFrameLayout.AddChidren(btnNext);
- btnNext.MouseUpEventHandler += (sender, e) =>
+ EventHandler<MouseEventArgs> handerSideLip = (sender, e) =>
{
SideslipFramelayout();
};
+ btnNext.MouseUpEventHandler += handerSideLip;
+ btnAllMethod.MouseUpEventHandler += handerSideLip;
var btnLine = new Button
{
Y = midTopFrameLayout.Bottom,
@@ -302,7 +300,7 @@
{
var curDoorLockUser = doorLock.localDoorLockUserList[curUserId];
- if (curDoorLockUser.ConnectedAccount == "" || curDoorLockUser.ConnectedAccount != curAccountObj.SubAccountDistributedMark)
+ if (string.IsNullOrEmpty(curDoorLockUser.ConnectedAccount) || curDoorLockUser.ConnectedAccount != curAccountObj.SubAccountDistributedMark)
{
continue;
}
@@ -364,8 +362,7 @@
break;
}
- #region UI
-
+ #region UI
var rowFrameLayout = new RowLayoutControl(bodyView.rowSpace / 2);
rowFrameLayout.BackgroundColor = ZigbeeColor.Current.XMWhite;
bodyView.AddChidren(rowFrameLayout);
@@ -374,7 +371,7 @@
btnicon.UnSelectedImagePath = "DoorLock/DoorLockUserPic.png";
//涓婇潰闂ㄩ攣鐢ㄦ埛鍚嶇О涓�琛�
var memberText = "";
- if (curAccountObj.UserName == "" || curAccountObj.UserName == null)
+ if (string.IsNullOrEmpty(curAccountObj.UserName))
{
memberText = curAccountObj.Account;
}
@@ -446,8 +443,8 @@
}
else
{
- //寮�鍏冲浘鏍�
- new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.RemoveFailed), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnDoorlockUser);
+ //寮�鍏冲浘鏍�
+ new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.RemoveFailed), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnDoorlockUser);
}
}
else
@@ -522,7 +519,7 @@
{
CommonPage.Loading.Hide();
}
- };
+ };
};
#endregion
@@ -536,7 +533,7 @@
switch (curDoorLockUser.UnlockType)
{
case 0:
- if (curDoorLockUser.UserName != "" && curDoorLockUser.UserName != null)
+ if (!string.IsNullOrEmpty(curDoorLockUser.UserName))
{
btnDoorlockUser.Text = curDoorLockUser.UserName;
}
@@ -546,7 +543,7 @@
}
break;
case 3:
- if (curDoorLockUser.UserName != "" && curDoorLockUser.UserName != null)
+ if (!string.IsNullOrEmpty(curDoorLockUser.UserName))
{
btnDoorlockUser.Text = curDoorLockUser.UserName;
}
@@ -556,7 +553,7 @@
}
break;
case 15:
- if (curDoorLockUser.UserName != "" && curDoorLockUser.UserName != null)
+ if (!string.IsNullOrEmpty(curDoorLockUser.UserName))
{
btnDoorlockUser.Text = curDoorLockUser.UserName;
}
@@ -612,10 +609,10 @@
new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.CloudServerResponseOvertime), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnDoorlockUser);
}
};
- btnDoorlockUser.EditorEnterAction += action;
+ btnDoorlockUser.EditorEnterAction += action;
#endregion
i++;
- }
+ }
}
}
@@ -733,7 +730,7 @@
break;
}
- if (doorLock.currentUserDisplayMethod == "" && i == 0)
+ if (string.IsNullOrEmpty(doorLock.currentUserDisplayMethod) && i == 0)
{
btnAllMethod.IsSelected = true;
btnMethodText.TextColor = Shared.Common.ZigbeeColor.Current.XMBlack;
--
Gitblit v1.8.0