From 3793a9a38ac6c4c4111c2bba3a35a71c30601e82 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 13 四月 2020 19:38:24 +0800
Subject: [PATCH] 上传个东西
---
ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonLayout.cs | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonLayout.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonLayout.cs
index a589934..8574e46 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonLayout.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonLayout.cs
@@ -341,9 +341,9 @@
/// </summary>
/// <param name="doorLock">闂ㄩ攣璁惧</param>
/// <param name="action">浜屾楠岃瘉鐨勭粨鏋滄垚鍔熷悗鐨勯�氱煡</param>
- public static void SecurityRequest(ZigBee.Device.DoorLock doorLock, Action action)
+ public static void SecurityRequest(ZigBee.Device.DoorLock doorLock)
{
- string msg = Language.StringByID(R.MyInternationalizationString.GoPersonalCenter).Replace("{0}", "\r\n");
+ string msg = Language.StringByID(R.MyInternationalizationString.SetSecondarySecurityVerificationMode).Replace("{0}", "\r\n");
var alert = new ShowDoorLockMsgControl(ShowDoorLockMsgControl.DoorLockMsgType.Confirm, msg, Language.StringByID(R.MyInternationalizationString.GoSetting));
alert.Show();
//浣跨敤纭鍨嬪脊妗嗘椂,鐨勫洖璋冨嚱鏁�
@@ -359,15 +359,16 @@
/// </summary>
/// <param name="doorLock"></param>
/// <param name="btnDoorLockTitle"></param>
- public void BindRemoteUnlockDoorlock(ZigBee.Device.DoorLock doorLock, Button btnDoorLockTitle = null)
+ public void BindRemoteUnlockDoorlock(Room room, CommonDevice devDoorLock, Button btnDoorLockTitle = null)
{
+ ZigBee.Device.DoorLock doorLock = devDoorLock as ZigBee.Device.DoorLock;
string msgRemoteUnlockRequest = Language.StringByID(R.MyInternationalizationString.BindRemoteUnlockDoorlock);
var alertRemoteUnlockRequest = new ShowDoorLockMsgControl(ShowDoorLockMsgControl.DoorLockMsgType.Confirm, msgRemoteUnlockRequest, Language.StringByID(R.MyInternationalizationString.GoSetting));
alertRemoteUnlockRequest.Show();
//浣跨敤纭鍨嬪脊妗嗘椂,鐨勫洖璋冨嚱鏁�
alertRemoteUnlockRequest.ConfirmClickEvent += () =>
{
- var functionSetting = new Shared.Phone.UserCenter.DoorLock.FunctionSetting(doorLock);
+ var functionSetting = new Shared.Phone.UserCenter.DoorLock.FunctionSetting(room, devDoorLock);
Shared.Phone.UserView.HomePage.Instance.AddChidren(functionSetting);
Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
functionSetting.Show();
@@ -385,7 +386,7 @@
}
/// <summary>
- /// 绯荤粺浜屾纭绐楀彛
+ /// 鍘讳釜浜轰腑蹇冿紝寮�鍚繙绋嬪紑閿侀獙璇�
/// </summary>
public void SystemSecondAuthentication()
{
@@ -407,11 +408,12 @@
/// <param name="action">浜屾楠岃瘉鐨勭粨鏋滄垚鍔熷悗鐨勯�氱煡</param>
/// <param name="progressButton">闂ㄩ攣寮�鎴栧叧鏃惰繘搴︽樉绀�</param>
/// <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)
+ public void RemoteUnlockRequest(Room room, CommonDevice devDoorLock, Action action, Button progressButton = null, Button btnDoorLockPic = null, Button btnStatus = null, Button btnDoorLockTitle = null)
{
+ ZigBee.Device.DoorLock doorLock = devDoorLock as ZigBee.Device.DoorLock;
if (string.IsNullOrEmpty(doorLock.RemoteUnlockPassword))
{
- BindRemoteUnlockDoorlock(doorLock, btnDoorLockTitle);
+ BindRemoteUnlockDoorlock(room, devDoorLock, btnDoorLockTitle);
return;
}
@@ -499,7 +501,7 @@
{
this.ShowMassage(ShowMsgType.Tip, Language.StringByID(R.MyInternationalizationString.DoorlockPasswordDispear));
doorLock.RemoteUnlockPassword = "";
- var functionSetting = new Shared.Phone.UserCenter.DoorLock.FunctionSetting(doorLock);
+ var functionSetting = new Shared.Phone.UserCenter.DoorLock.FunctionSetting(room, devDoorLock);
Shared.Phone.UserView.HomePage.Instance.AddChidren(functionSetting);
Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
functionSetting.Show();
@@ -544,6 +546,7 @@
}
});
};
+
HdlCheckLogic.Current.CheckSecondarySecurity(action);
};
}
--
Gitblit v1.8.0