Merge branch 'dev-tzy' into DEV_GXC

gxc

2019-11-07 a4924de3136289d10cabbf2f61a228387d44ded7

 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,13 +1667,13 @@


                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));

                //确认按钮

                Dialogform.ComfirmClickEvent += (() =>

                Dialogform.ComfirmClickEvent += ((textValue) =>

                {

                    if (Dialogform.InputText == string.Empty)

                    if (textValue == string.Empty)

                    {

                        this.ShowErrorMsg(Language.StringByID(R.MyInternationalizationString.uPleaseInputUserPassword));

                        return;

@@ -1649,7 +1681,7 @@
                    Dialogform.CloseDialog();



                    //用户密码

                    pasword = Dialogform.InputText;

                    pasword = textValue;

                    //加密密码

                    this.UserPassword = pasword;

                });

@@ -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);