From f14dcfd967404e197e7ec995ca8d6f2b090d3b7d Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期五, 11 九月 2020 09:16:59 +0800
Subject: [PATCH] 优化多功能面板：绑定温湿度传感器目标，和设备列表回路显示。优化数据矫正功能温湿度度不设置的情况。优化门锁时间设置最后一天和最后最后一个月的时间显示等 细节
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlCheckLogic.cs | 30 +++++++++++++++---------------
1 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlCheckLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlCheckLogic.cs
index 2ca8eb4..5252653 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlCheckLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlCheckLogic.cs
@@ -215,14 +215,14 @@
/// 鎵ц浜屾瀹夊叏楠岃瘉(涓夌楠岃瘉鐨勬爣棰樹娇鐢ㄩ粯璁ゅ�硷細Touch ID楠岃瘉,瀵嗙爜楠岃瘉,鎵嬪娍楠岃瘉)
/// </summary>
/// <param name="SuccessAction">濡傛灉璁剧疆鏈夐獙璇佹柟寮�,骞朵笖楠岃瘉鎴愬姛鍚庢墠浼氳皟鐢ㄧ殑鍥炶皟鍑芥暟,涓嶇劧涓嶄細璋冪敤杩欎釜涓滆タ</param>
- /// <param name="FailAction">濡傛灉瀹屽叏娌℃湁璁剧疆鏈夐獙璇佹柟寮�,鎵嶄細璋冪敤鐨勫洖璋冨嚱鏁�,涓嶇劧涓嶄細璋冪敤杩欎釜涓滆タ(鍙栨秷杈撳叆涓嶄細璋冪敤杩欎釜涓滆タ)</param>
- public void CheckSecondarySecurity(Action SuccessAction, Action FailAction = null)
+ /// <param name="NotSettionAction">濡傛灉瀹屽叏娌℃湁璁剧疆鏈夐獙璇佹柟寮�,鎵嶄細璋冪敤鐨勫洖璋冨嚱鏁�,涓嶇劧涓嶄細璋冪敤杩欎釜涓滆タ(鍙栨秷杈撳叆涓嶄細璋冪敤杩欎釜涓滆タ)</param>
+ public void CheckSecondarySecurity(Action SuccessAction, Action NotSettionAction = null)
{
CheckSecondarySecurity(
Language.StringByID(R.MyInternationalizationString.uTouchIDCheck),
Language.StringByID(R.MyInternationalizationString.uPasswordAuthentication),
Language.StringByID(R.MyInternationalizationString.uGestureAuthentication),
- SuccessAction, FailAction);
+ SuccessAction, NotSettionAction);
}
/// <summary>
@@ -232,14 +232,14 @@
/// <param name="i_PasswordText">瀵嗙爜楠岃瘉鐨勬樉绀烘枃鏈�</param>
/// <param name="i_GestureText">鎵嬪娍楠岃瘉鐨勬樉绀烘枃鏈�</param>
/// <param name="SuccessAction">濡傛灉璁剧疆鏈夐獙璇佹柟寮�,骞朵笖楠岃瘉鎴愬姛鍚庢墠浼氳皟鐢ㄧ殑鍥炶皟鍑芥暟,涓嶇劧涓嶄細璋冪敤杩欎釜涓滆タ</param>
- /// <param name="FailAction">濡傛灉瀹屽叏娌℃湁璁剧疆鏈夐獙璇佹柟寮�,鎵嶄細璋冪敤鐨勫洖璋冨嚱鏁�,涓嶇劧涓嶄細璋冪敤杩欎釜涓滆タ(鍙栨秷杈撳叆涓嶄細璋冪敤杩欎釜涓滆タ)</param>
- public void CheckSecondarySecurity(string i_TouchText, string i_PasswordText, string i_GestureText, Action SuccessAction, Action FailAction = null)
+ /// <param name="NotSettionAction">濡傛灉瀹屽叏娌℃湁璁剧疆鏈夐獙璇佹柟寮�,鎵嶄細璋冪敤鐨勫洖璋冨嚱鏁�,涓嶇劧涓嶄細璋冪敤杩欎釜涓滆タ(鍙栨秷杈撳叆涓嶄細璋冪敤杩欎釜涓滆タ)</param>
+ public void CheckSecondarySecurity(string i_TouchText, string i_PasswordText, string i_GestureText, Action SuccessAction, Action NotSettionAction = null)
{
//鍏堟妸杩欎釜涓滆タ缃┖
TouchIDUtils.Instance.OnHDLTouchIDStateBackEvent = null;
TouchIDUtils.TouchIDSupperType type = TouchIDUtils.getTouchIDSupperType();
- if (type == TouchIDUtils.TouchIDSupperType.TouchID && UserCenterResourse.Option.FingerprintAuthentication == true)
+ if (type == TouchIDUtils.TouchIDSupperType.TouchID && UserCenterResourse.AccountOption.FingerprintAuthentication == true)
{
//Touch ID楠岃瘉
TouchIDUtils.Instance.OnHDLTouchIDStateBackEvent += (sender2, e2) =>
@@ -254,13 +254,13 @@
else if (e2 == TouchIDUtils.TouchIDState.InputPassword)
{
//瀵嗙爜楠岃瘉
- if (string.IsNullOrEmpty(UserCenterResourse.Option.PswAuthentication) == false)
+ if (string.IsNullOrEmpty(UserCenterResourse.AccountOption.PswAuthentication) == false)
{
var form = new PswSecondarySecurityForm();
form.AddForm(i_TouchText, i_PasswordText, i_GestureText, SuccessAction);
}
//鎵嬪娍楠岃瘉
- else if (string.IsNullOrEmpty(UserCenterResourse.Option.GestureAuthentication) == false)
+ else if (string.IsNullOrEmpty(UserCenterResourse.AccountOption.GestureAuthentication) == false)
{
var form = new PswGestureSecirityForm();
form.AddForm(i_TouchText, i_PasswordText, i_GestureText, SuccessAction);
@@ -274,28 +274,28 @@
}
};
TouchIDUtils.Instance.showTouchIDWithDescribe(null, null);
- FailAction = null;
+ NotSettionAction = null;
}
- else if (string.IsNullOrEmpty(UserCenterResourse.Option.PswAuthentication) == false)
+ else if (string.IsNullOrEmpty(UserCenterResourse.AccountOption.PswAuthentication) == false)
{
//瀵嗙爜楠岃瘉
var form = new PswSecondarySecurityForm();
form.AddForm(i_TouchText, i_PasswordText, i_GestureText, SuccessAction);
- FailAction = null;
+ NotSettionAction = null;
}
- else if (string.IsNullOrEmpty(UserCenterResourse.Option.GestureAuthentication) == false)
+ else if (string.IsNullOrEmpty(UserCenterResourse.AccountOption.GestureAuthentication) == false)
{
//鎵嬪娍楠岃瘉
var form = new PswGestureSecirityForm();
form.AddForm(i_TouchText, i_PasswordText, i_GestureText, SuccessAction);
- FailAction = null;
+ NotSettionAction = null;
}
else
{
//瀹屽叏娌℃湁璁剧疆鏈変换浣曢獙璇佹柟寮�
SuccessAction = null;
- FailAction?.Invoke();
- FailAction = null;
+ NotSettionAction?.Invoke();
+ NotSettionAction = null;
}
}
--
Gitblit v1.8.0