合并了全部的代码

黄学彪

2019-11-04 c7698e163e43cea9e7f8ee45f8e3f91c9265cca4

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