From 2ed75b8b337048e5d75e6d9ec8307633134f02fd Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 10 十月 2019 11:33:04 +0800
Subject: [PATCH] 个人中心添加楼层和创建房间，实装二级验证
---
ZigbeeApp/Shared/Phone/UserCenter/UserMain/SecondAuthenticationForm.cs | 38 +++++++++++++++++++++++++++++---------
1 files changed, 29 insertions(+), 9 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/UserMain/SecondAuthenticationForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/UserMain/SecondAuthenticationForm.cs
index a400080..705fdbd 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/UserMain/SecondAuthenticationForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/UserMain/SecondAuthenticationForm.cs
@@ -54,9 +54,7 @@
btnEffect.TextColor = UserCenterColor.Current.TextGrayColor1;
rowFinger.AddChidren(btnEffect, ChidrenBindMode.NotBind);
//寮�鍏虫寜閽�
- var btnFingerSwicth = rowFinger.AddMostRightEmptyIcon(104, 63);
- btnFingerSwicth.UnSelectedImagePath = "Item/Switch.png";
- btnFingerSwicth.SelectedImagePath = "Item/SwitchSelected.png";
+ var btnFingerSwicth = rowFinger.AddMostRightSwitchIcon();
btnFingerSwicth.IsSelected = UserCenterResourse.Option.FingerprintAuthentication;
//搴曠嚎
rowFinger.AddBottomLine();
@@ -132,9 +130,7 @@
btnUnLockByApp.TextColor = UserCenterColor.Current.TextGrayColor1;
rowLock.AddChidren(btnUnLockByApp, ChidrenBindMode.NotBind);
//寮�鍏虫寜閽�
- var btnLockSwicth = rowLock.AddMostRightEmptyIcon(104, 63);
- btnLockSwicth.UnSelectedImagePath = "Item/Switch.png";
- btnLockSwicth.SelectedImagePath = "Item/SwitchSelected.png";
+ var btnLockSwicth = rowLock.AddMostRightSwitchIcon();
//搴曠嚎
rowLock.AddBottomLine();
btnLockSwicth.IsSelected = UserCenterResourse.Option.DoorUnLockByRemote;
@@ -176,12 +172,34 @@
//瀵嗙爜楠岃瘉
rowPsw.ButtonClickEvent += (sender, e) =>
{
- var form = new Password.EditorSecondaryPasswordForm();
- form.AddForm();
+ //濡傛灉娌℃湁瀵嗙爜楠岃瘉
+ if (string.IsNullOrEmpty(UserCenterResourse.Option.PswAuthentication) == true)
+ {
+ //濡傛灉璁剧疆鏈夊叾浠栭獙璇佹柟寮�,鍒欓渶瑕侀獙璇�,鍚﹀垯鐩存帴璺宠繃楠岃瘉
+ HdlCheckLogic.Current.CheckSecondarySecurity(
+ () => { var form = new Password.EditorSecondaryPasswordForm(); form.AddForm(); },
+ () => { var form = new Password.EditorSecondaryPasswordForm(); form.AddForm(); });
+ }
+ else
+ {
+ var form = new Password.EditorSecondaryPasswordForm();
+ form.AddForm();
+ }
};
//鎵嬪娍楠岃瘉
rowGesture.ButtonClickEvent += (sender, e) =>
{
+ //濡傛灉娌℃湁鎵嬪娍楠岃瘉
+ if (string.IsNullOrEmpty(UserCenterResourse.Option.GestureAuthentication) == true)
+ {
+ //濡傛灉璁剧疆鏈夊叾浠栭獙璇佹柟寮�,鍒欓渶瑕侀獙璇�,鍚﹀垯鐩存帴璺宠繃楠岃瘉
+ HdlCheckLogic.Current.CheckSecondarySecurity(
+ () => { },
+ () => { });
+ }
+ else
+ {
+ }
};
//杩滅▼寮�閿�
btnLockSwicth.ButtonClickEvent += (sender, e) =>
@@ -289,10 +307,12 @@
/// <summary>
/// 鑷韩鐨勪笂灞傜晫闈㈠叧闂悗,瀹冭嚜韬浜庢渶涓婂眰鏃�,瑙﹀彂鐨勪簨浠�
/// </summary>
- public override void FormActionAgainEvent()
+ public override int FormActionAgainEvent()
{
//閲嶆柊鍒锋柊鐣岄潰
this.InitMiddleFrame();
+
+ return 1;
}
#endregion
--
Gitblit v1.8.0