2020-12-21 1.修改密码错误锁定提示，增加时间提示。

JLChen

2020-12-21 b253e7c13fab85912af2ee8494a19b42b607fd7a

 HDL_ON/DAL/Server/HttpServerRequest.cs

@@ -131,17 +131,40 @@
        /// 绑定调试人员提交的住宅,一个住宅只能绑定一次
        /// </summary>
        /// <returns></returns>
        public ResponsePackNew BindingResidence(string key)
        public ResponsePackNew BindingResidence(string strUrl)
        {
            Dictionary<string, object> d = new Dictionary<string, object>();
            //d.Add("homeId", homeId);
            d.Add("secretKey", key);
            var requestJson = HttpUtil.GetSignRequestJson(d);
            return HttpUtil.RequestHttpsPost(NewAPI.Api_Post_BindlingResidence, requestJson, HttpUtil.GlobalRequestHttpsHost);
            try
            {
                if (strUrl.Contains("app/home/deliver") == false)
                {
                    //非法的URL 返回一个自定义的状态码
                    return new ResponsePackNew() { Code = "-100" };
                }
                var client = new RestSharp.RestClient(strUrl);

                var request = new RestSharp.RestRequest(RestSharp.Method.GET);
                request.Timeout = 5 * 1000;
                request.AddHeader("content-type", "application/json");
                request.AddHeader("Authorization", UserInfo.Current.LoginTokenString);

                var response = client.Execute(request);
                if (response.StatusCode == HttpStatusCode.OK)
                {
                    return Newtonsoft.Json.JsonConvert.DeserializeObject<ResponsePackNew>(response.Content);
                }
                else
                {
                    return null;
                }
            }
            catch
            {
                return null;
            }
        }

        #region 注册、登录部分
       


        /// <summary>
        /// 通用 发送验证码方法
@@ -297,6 +320,7 @@
                UserInfo.Current.userEmailInfo = info.memberEmail;
                UserInfo.Current.userMobileInfo = info.memberPhone;
                UserInfo.Current.userName = info.memberName;
                
                if (!string.IsNullOrEmpty(info.memberPhonePrefix))
                {
                    UserInfo.Current.areaCode = info.memberPhonePrefix;
@@ -304,14 +328,16 @@
                //是否需要获取头像
                if (bGetHeadImage)
                {
                    var imageKey = ImageUtlis.Current.GetHeadImageKey(info.memberId);
                   
                    var headImageBytes = ImageUtlis.Current.DownHeadImage(info.memberId);

                    if (headImageBytes != null && headImageBytes.Length > 0)
                    //2020-12-15 修改头像方案
                    if (!string.IsNullOrEmpty(info.memberHeadIcon))
                    {
                        //UserInfo.Current.headImagePageBytes = headImageBytes;
                        UserInfo.Current.headImagePagePath = imageKey;
                        var headImageBytes = ImageUtlis.Current.DownHeadImageByImageKey(info.memberHeadIcon);

                        if (headImageBytes != null && headImageBytes.Length > 0)
                        {
                            UserInfo.Current.headImagePagePath = info.memberHeadIcon;
                            //UserInfo.Current.headImagePagePath = imageKey;
                        }
                    }
                }

@@ -375,11 +401,9 @@
        /// 获取用户头像
        /// </summary>
        /// <param name="userId"></param>
        public void GetUserHeadImage(string userId)
        public void GetUserHeadImageByKey(string imageKey)
        {
            var imageKey = ImageUtlis.Current.GetHeadImageKey(userId);

            var headImageBytes = ImageUtlis.Current.DownHeadImage(userId);
            var headImageBytes = ImageUtlis.Current.DownHeadImageByImageKey(imageKey);

            if (headImageBytes != null && headImageBytes.Length > 0)
            {
@@ -401,6 +425,20 @@
            });
            return HttpUtil.RequestHttpsPost(NewAPI.API_POST_Member_UpdateMemberInfo, requestJson);
        }

        ///// <summary>
        ///// 更新用户头像
        ///// </summary>
        ///// <param name="userName"></param>
        ///// <returns></returns>
        //public ResponsePackNew UpdateMemberHeadIcon(string memberHeadIcon)
        //{
        //    var requestJson = HttpUtil.GetSignRequestJson(new UpdateMemberHeadIconRes()
        //    {
        //        memberHeadIcon = memberHeadIcon
        //    });
        //    return HttpUtil.RequestHttpsPost(NewAPI.API_POST_Member_UpdateMemberInfo, requestJson);
        //}

        ///// <summary>
        ///// 更新用户头像
@@ -488,6 +526,7 @@
                            homeRegionName = mHome.homeRegionName,
                            homeRegionId = mHome.homeRegionId,
                            Address = mHome.homeAddress,
                            isAllowCreateScene = mHome.isAllowCreateScene,
                        };
                        UserInfo.Current.regionList.Add(home);
                    }
@@ -583,7 +622,7 @@
                            if (mHomeGatewayRes.Count > 0)
                            {
                                DB_ResidenceData.Instance.HomeGateway = mHomeGatewayRes[0];
                                if(mHomeGatewayRes[0].gatewayStatus == "ON_LINE")
                                if(mHomeGatewayRes[0].gatewayStatus)
                                {
                                    //DriverLayer.Control.Ins.IsRemote = true;
                                    DriverLayer.Control.Ins.GatewayOnline = true;
@@ -1930,7 +1969,11 @@
            d.Add("scenes", new List<Scene>() { scene });

            var requestJson = HttpUtil.GetSignRequestJson(d);
            return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_AddSecne, requestJson);
            var pack = HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_AddSecne, requestJson);

            MainPage.Log($"{pack.Data}");

            return pack;
        }
        /// <summary>
        /// 编辑场景
@@ -2016,6 +2059,7 @@
            {
                d.Add("roomType", GetType);
            }
            d.Add("pageSize", "1000");
            var requestJson = HttpUtil.GetSignRequestJson(d);
            var pack = HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_GetRoomList, requestJson);