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/EntryStatusPage.cs | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/EntryStatusPage.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/EntryStatusPage.cs
index 3719595..e70341a 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/EntryStatusPage.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/EntryStatusPage.cs
@@ -66,7 +66,7 @@
TextColor = Shared.Common.ZigbeeColor.Current.XMBlack,
Gravity = Gravity.CenterHorizontal,
TextSize = 20,
- IsBold =true,
+ IsBold = true,
};
this.midFrameLayout.AddChidren(btnPicTip);
@@ -194,7 +194,7 @@
BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack,
Radius = (uint)Application.GetRealHeight(127 / 2),
TextSize = 16,
- IsBold =true,
+ IsBold = true,
};
bottomFrameLayout.AddChidren(completeBtn);
@@ -213,7 +213,8 @@
btnPasswordRemark.Text = Language.StringByID(R.MyInternationalizationString.ProximityRemark);
btnPasswordRemarkContent.PlaceholderText = Language.StringByID(R.MyInternationalizationString.ProximityCard) + "-" + doorLock.doorLockProgrammingEventNotificationCommand.UserID;
}
- if (curAccountObj.UserName != "" && curAccountObj.UserName != null)
+
+ if (!string.IsNullOrEmpty(curAccountObj.UserName))
{
btnMatchPersonContent.Text = curAccountObj.UserName;
}
@@ -244,7 +245,7 @@
addLockInfo.OpenLockMode = doorLock.doorLockProgrammingEventNotificationCommand.ProgramEventSoure;
addLockInfo.DoorLockLocalUserId = doorLock.doorLockProgrammingEventNotificationCommand.UserID.ToString();
addLockInfo.EntryTime = System.DateTime.Now;
- if (btnPasswordRemarkContent.Text != "")
+ if (!string.IsNullOrEmpty(btnPasswordRemarkContent.Text))
{
addLockInfo.UserIdRemarks = btnPasswordRemarkContent.Text;
}
--
Gitblit v1.8.0