From c7698e163e43cea9e7f8ee45f8e3f91c9265cca4 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 04 十一月 2019 19:11:41 +0800
Subject: [PATCH] 合并了全部的代码
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlSafeguardLogic.cs | 44 ++++++++++++++++++++++++++++++++++++++------
1 files changed, 38 insertions(+), 6 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlSafeguardLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlSafeguardLogic.cs
index 49549c2..e5b8bcd 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlSafeguardLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlSafeguardLogic.cs
@@ -969,13 +969,14 @@
/// <summary>
/// 淇敼鐢ㄦ埛瀵嗙爜(涓嶅瓨鍦ㄦ椂锛屽垯鏂板缓)
/// </summary>
- /// <param name="userId"></param>
- /// <param name="password"></param>
+ /// <param name="userId">鐢ㄦ埛ID</param>
+ /// <param name="password">瀵嗙爜</param>
+ /// <param name="passWordTips">瀵嗙爜鎻愮ず</param>
/// <returns></returns>
- public async Task<bool> ChangedUserPassword(int userId, string password)
+ public async Task<bool> ChangedUserPassword(int userId, string password, string passWordTips)
{
//鍒涘缓鏂扮敤鎴�
- var result = await Safeguard.SetUserPasswordAsync(userId, password, this.GetLoginToken());
+ var result = await Safeguard.SetUserPasswordAsync(userId, password, passWordTips, this.GetLoginToken());
if (result == null || result.setUserPasswordResponseData == null)
{
if (userId != 5)
@@ -1067,6 +1068,37 @@
}
}
return 0;
+ }
+
+ /// <summary>
+ /// 娣诲姞瀵嗙爜鐨勫娉�
+ /// </summary>
+ /// <param name="userId">鐢ㄦ埛ID</param>
+ /// <param name="password">缃戝叧璇撮渶瑕佸師鏉ョ殑瀵嗙爜,涔熶笉鐭ラ亾涓轰粈涔�</param>
+ /// <param name="passWordTips">瀵嗙爜澶囨敞</param>
+ /// <returns></returns>
+ public async Task<bool> AddPassWordTips(int userId, string password, string passWordTips)
+ {
+ var result = await Safeguard.SetPassWordTipsAsync(userId, password, passWordTips, this.GetLoginToken());
+ if (result == null || result.setUserPasswordResponseData == null)
+ {
+ //淇敼澶囨敞淇℃伅澶辫触
+ string msg = Language.StringByID(R.MyInternationalizationString.uEditorNoteInformationFail);
+ //鎷兼帴涓娿�愮綉鍏冲洖澶嶈秴鏃躲�戠殑Msg
+ msg = UserCenterLogic.CombineGatewayTimeOutMsg(msg, result);
+
+ this.ShowErrorMsg(msg);
+ return false;
+ }
+ if (result.setUserPasswordResponseData.Result != 0)
+ {
+ //淇敼澶囨敞淇℃伅澶辫触
+ string msg = Language.StringByID(R.MyInternationalizationString.uEditorNoteInformationFail);
+
+ this.ShowErrorMsg(msg);
+ return false;
+ }
+ return true;
}
#endregion
@@ -1635,7 +1667,7 @@
Dialogform = new DialogInputFrameControl(form, DialogFrameMode.OnlyPassword);
//鐢ㄦ埛瀵嗙爜
- Dialogform.SetTitleText(Language.StringByID(R.MyInternationalizationString.uUserPassword));
+ Dialogform.SetTitleText(Language.StringByID(R.MyInternationalizationString.uSafetyPassword));
//璁剧疆鎻愮ず淇℃伅:璇疯緭鍏ョ敤鎴峰瘑鐮�
Dialogform.SetTipText(Language.StringByID(R.MyInternationalizationString.uPleaseInputUserPassword));
//纭鎸夐挳
@@ -1920,7 +1952,7 @@
/// <returns></returns>
public string GetLightAlarmStatuText(List<Safeguard.TaskListInfo> listTaskInfo)
{
- if (listTaskInfo == null)
+ if (listTaskInfo == null || listTaskInfo.Count == 0)
{
//鏃犲姩浣�
return Language.StringByID(R.MyInternationalizationString.uNotAction);
--
Gitblit v1.8.0