20200715

wxr

2020-07-15 9dcd17ee7578c5a06bfcd960cc72ea2995716004

 HDL_ON/DAL/Server/HttpServerRequest.cs

@@ -38,7 +38,7 @@

        public HttpServerRequest()
        {
#if DEBUG
#if DEBUG1
            severAddress = debugSever;
#else
            severAddress = relaseaSever;
@@ -68,7 +68,6 @@
            }
            return result;
        }



        #region 注册、登录部分
@@ -138,7 +137,7 @@
                                "\"Account\":" + "\"" + account + "\"" + "," +
                                "\"Password\":" + "\"" + password + "\"" + "," +
                                "\"EnterPassword\":" + "\"" + entryPassword + "\"" + "," +
                                "\"Language\":" + "\"" + MainPage.LoginUser.language.ToLower() + "\"" + "," +
                                "\"Language\":" + "\"" + Language.CurrentLanguage.ToLower() + "\"" + "," +
                                "\"Code\":" + "\"" + code + "\"" + "," +
                                "\"RegisterSoruce\":" + 0 + "," +
                                "\"AreaCode\":" + areaCode +
@@ -150,12 +149,12 @@
        /// <summary>
        /// 获取注册验证码
        /// </summary>
        public ResponsePack GetPhoneRegisterVerCode(string account)
        public ResponsePack GetRegisterVerCode(string account)
        {
            string jsonString = "{" +

                                "\"Account\":" + "\"" + account + "\"" + "," +
                                "\"Company\":" + MainPage.Company + "," +
                                "\"Language\":" + "\"" +  MainPage.LoginUser.language.ToLower() + "\"" + "," +
                                "\"Language\":" + "\"" + Language.CurrentLanguage.ToLower() + "\"" + "," +
                                "\"AreaCode\":" + OnAppConfig.Instance.CountryNumber +
                                "}";
            return RequestHttps($"{severAddress}/ZigbeeUsers/RegisterSendVerCode", jsonString, false);
@@ -168,12 +167,11 @@
        /// <summary>
        /// 获取登录验证码
        /// </summary>
        /// <param name="phoneNum">手机号码</param>
        public ResponsePack GetPhoneLoginVerCode(string phoneNum)
        public ResponsePack GetLoginVerCode(string account)
        {

            string jsonString = "{" +

                                "\"Account\":" + "\"" + phoneNum + "\"" + "," +
                                "\"Account\":" + "\"" + account + "\"" + "," +
                                "\"AreaCode\":" + "86" + 
                                "}";
            return RequestHttps($"{severAddress}/ZigbeeUsers/LoginSendVerCode", jsonString, false);
@@ -319,6 +317,18 @@

            var revertObj = RequestHttps($"{severAddress}/ZigbeeUsers/UpdateHeadImage", requestJson, true);
            return revertObj.StateCode;
        }

        /// <summary>
        /// 更改绑定账户的邮箱或者手机号
        /// </summary>
        /// <param name="account"></param>
        /// <returns></returns>
        public string BindAccount(string account)
        {
            string jsonString = "{" + "\"Account\":" + "\"" + account + "\"" + "}";
            var responsePack = RequestHttps($"{severAddress}/ZigbeeUsers/BindAccount", jsonString, true);
            return responsePack.StateCode;
        }
        #endregion

@@ -530,6 +540,32 @@
        }

        /// <summary>
        /// 删除共享数据
        /// </summary>
        /// <param name="shareData"></param>
        /// <returns></returns>
        public ResponsePack DeleteShareData(ShareData shareData)
        {
            Dictionary<string, string> d = new Dictionary<string, string>();
            d.Add("DistributedMark", shareData.DistributedMark);
            d.Add("HouseDistributedMark", shareData.HouseDistributedMark);
            string jsonString = Newtonsoft.Json.JsonConvert.SerializeObject(d);
            return RequestHttps($"{severAddress}/ZigbeeDataShare/DeleteShareData", jsonString, true);
        }
        /// <summary>
        /// 删除子账号当前住宅的所有共享数据
        /// </summary>
        /// <returns></returns>
        public ResponsePack DeleteCurrentResidenceSharedData(ShareData shareData)
        {
            Dictionary<string, string> d = new Dictionary<string, string>();
            d.Add("SubAccountDistributedMark", shareData.SubAccountDistributedMark);
            d.Add("HouseDistributedMark", shareData.HouseDistributedMark);
            string jsonString = Newtonsoft.Json.JsonConvert.SerializeObject(d);
            return RequestHttps($"{severAddress}/ZigbeeDataShare/DeleteShareData", jsonString, true);
        }

        /// <summary>
        /// 绑定子账号到住宅下
        /// </summary>
        /// <param name="subAccount"></param>
@@ -626,7 +662,6 @@
        }

        #endregion


        #region 备份部分
        /// <summary>