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/DoorLockCommonLayout.cs | 23 ++++++++++++++++-------
1 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonLayout.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonLayout.cs
index 95da582..8b4e4d4 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonLayout.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonLayout.cs
@@ -19,7 +19,7 @@
public FrameLayout bottomRadiusFrameLayout = new FrameLayout()
{
- Height = Application.GetRealHeight(906),
+ Height = Application.GetRealHeight(806),
Y = Application.GetRealHeight(930),
BackgroundColor = ZigbeeColor.Current.XMWhite,
};
@@ -56,6 +56,14 @@
TextColor = Shared.Common.ZigbeeColor.Current.XMOrange,
TextSize = 14,
};
+
+ public Button line = new Button()
+ {
+ Y = Application.GetRealHeight(138),
+ Height = 1,
+ BackgroundColor = Shared.Common.ZigbeeColor.Current.XMRowLine,
+ };
+
#endregion
/// <summary>
@@ -181,6 +189,7 @@
this.bottomRadiusFrameLayout.AddChidren(btnCancel);
this.bottomRadiusFrameLayout.AddChidren(btnBottomTitle);
this.bottomRadiusFrameLayout.AddChidren(btnFinish);
+ this.bottomRadiusFrameLayout.AddChidren(line);
}
/// <summary>
@@ -288,8 +297,8 @@
alert.ConfirmClickEvent += () =>
{
var form = new UserCenter.UserMain.SecondAuthenticationForm();
- form.AddForm();
- };
+ form.AddForm();
+ };
}
doorLock.ReSave();
}
@@ -334,7 +343,7 @@
{
var form = new UserCenter.UserMain.SecondAuthenticationForm();
form.AddForm();
- };
+ };
}
/// <summary>
@@ -346,7 +355,7 @@
/// <param name="btnDoorLockPic">闂ㄩ攣鍥剧墖寮�/鍏虫樉绀�</param>
public void RemoteUnlockRequest(ZigBee.Device.DoorLock doorLock, Action action, Button progressButton = null, Button btnDoorLockPic = null, Button btnStatus = null, Button btnDoorLockTitle = null)
{
- if (doorLock.RemoteUnlockPassword == "")
+ if (string.IsNullOrEmpty(doorLock.RemoteUnlockPassword))
{
string msgRemoteUnlockRequest = Language.StringByID(R.MyInternationalizationString.BindRemoteUnlockDoorlock);
var alertRemoteUnlockRequest = new Shared.Phone.UserCenter.ShowMsgControl(ShowMsgType.Confirm, msgRemoteUnlockRequest, Language.StringByID(R.MyInternationalizationString.GoSetting));
@@ -405,7 +414,7 @@
{
var form = new UserCenter.UserMain.SecondAuthenticationForm();
form.AddForm();
- };
+ };
return;
}
@@ -600,7 +609,7 @@
});
};
HdlCheckLogic.Current.CheckSecondarySecurity(action);
- };
+ };
}
// 鑾峰彇鍒板埌鍚嶇О鏇存敼鍥炶皟閫氱煡
public Action<string> devicNameSecAction;
--
Gitblit v1.8.0