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/FunctionSettingSub.cs | 25 ++++---------------------
1 files changed, 4 insertions(+), 21 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/FunctionSettingSub.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/FunctionSettingSub.cs
index 62b22d3..9ab29f4 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/FunctionSettingSub.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/FunctionSettingSub.cs
@@ -72,24 +72,7 @@
public void BottomFrameLayout()
{
- #region UI
- //var bottomFrameLayout = new FrameLayout()
- //{
- // Height = Application.GetRealHeight(100),
- // Y = Application.GetRealHeight(418),
- // Radius = 17,
- // BackgroundColor = ZigbeeColor.Current.XMWhite,
- //};
- //this.midFrameLayout.AddChidren(bottomFrameLayout);
-
- //var bottomFrameLayout1 = new FrameLayout()
- //{
- // Height = Application.GetRealHeight(1319 - 50),
- // Y = Application.GetRealHeight(418 + 48),
- // BackgroundColor = ZigbeeColor.Current.XMWhite,
- //};
- //this.midFrameLayout.AddChidren(bottomFrameLayout1);
-
+ #region UI
var bottomFrameLayout = new FrameLayout()
{
Height = Application.GetRealHeight(1319),
@@ -256,7 +239,7 @@
btnNext.SelectedImagePath = "DoorLock/SwitchOn.png";
btnLine.Visible = true;
btnLine.Y = Application.GetRealHeight(714);
- if (doorLock.RemoteUnlockPassword == "")
+ if (string.IsNullOrEmpty(doorLock.RemoteUnlockPassword))
{
btnNext.IsSelected = false;
}
@@ -280,7 +263,7 @@
btnNext.IsSelected = !btnNext.IsSelected;
if (btnNext.IsSelected)
{
- if (doorLock.RemoteUnlockPassword == "")
+ if (string.IsNullOrEmpty(doorLock.RemoteUnlockPassword))
{
RemotePasswordDialog(doorLock, btnNext);
}
@@ -323,7 +306,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