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/FunctionSetting.cs | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/FunctionSetting.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/FunctionSetting.cs
index 2fdcbd5..49c6b4d 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/FunctionSetting.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/FunctionSetting.cs
@@ -113,10 +113,10 @@
Height = Application.GetRealHeight(1319),
Y = Application.GetRealHeight(418),
BackgroundColor = ZigbeeColor.Current.XMWhite,
- };
+ };
this.midFrameLayout.AddChidren(bottomFrameLayout);
bottomFrameLayout.SetCornerWithSameRadius(Application.GetRealHeight(58), HDLUtils.RectCornerTopLeft | HDLUtils.RectCornerTopRight);
-
+
var informationEdit = new Button()
{
Height = Application.GetRealHeight(60),
@@ -284,7 +284,7 @@
btnNext.SelectedImagePath = "DoorLock/SwitchOn.png";
btnLine.Visible = true;
btnLine.Y = Application.GetRealHeight(853);
- if (doorLock.RemoteUnlockPassword == "")
+ if (string.IsNullOrEmpty(doorLock.RemoteUnlockPassword))
{
btnNext.IsSelected = false;
}
@@ -333,7 +333,7 @@
btnNext.IsSelected = !btnNext.IsSelected;
if (btnNext.IsSelected)
{
- if (doorLock.RemoteUnlockPassword == "")
+ if (string.IsNullOrEmpty(doorLock.RemoteUnlockPassword))
{
RemotePasswordDialog(doorLock, btnNext);
}
@@ -358,7 +358,7 @@
btnNext.IsSelected = !btnNext.IsSelected;
if (btnNext.IsSelected)
{
- if (doorLock.RemoteUnlockPassword == "")
+ if (string.IsNullOrEmpty(doorLock.RemoteUnlockPassword))
{
RemotePasswordDialog(doorLock, btnNext);
}
@@ -407,7 +407,7 @@
BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack,
TextColor = Shared.Common.ZigbeeColor.Current.XMWhite,
TextSize = 16,
- IsBold =true,
+ IsBold = true,
};
this.midFrameLayout.AddChidren(btnFinifh);
btnFinifh.MouseUpEventHandler += (sender, e) =>
--
Gitblit v1.8.0