2020-11-30-2

陈嘉乐

2020-11-30 ed3bfb7462d44747230437717e8673a5192f833f

 HDL_ON/DAL/Server/HttpServerRequest.cs

@@ -50,7 +50,7 @@
        /// <param name="nowMonth"></param>
        /// <param name="mac"></param>
        /// <returns></returns>
        public ResponsePack GetSensorHistory(int subnetId, int deviceId, int bigClass, int minClass, int queryType, int loopId, int nowMonth, string mac)
        public ResponsePack GetSensorHistory(int subnetId,int deviceId,int bigClass,int minClass,int queryType,int loopId,int nowMonth,string mac)
        {
            Dictionary<string, object> d = new Dictionary<string, object>();
            d.Add("SubnetID", subnetId);
@@ -63,7 +63,7 @@
            d.Add("MAC", DB_ResidenceData.residenceData.residenceGatewayMAC);
            d.Add("LocalTimeZone", 8);
            var jsonString = Newtonsoft.Json.JsonConvert.SerializeObject(d);
            return RequestHttps("https://developer.hdlcontrol.com/api/GetSensorPushHistory", jsonString, true);
            return RequestHttps("https://developer.hdlcontrol.com/api/GetSensorPushHistory", jsonString,true);

        }

@@ -91,166 +91,99 @@
            return result;
        }

        #region ■ 通用请求接口_______________________
        /// <summary>
        /// 根椐用户账号获取注册区域 免登录 // 检测账号是否注册也用这个接口
        /// </summary>
        /// <param name="account"></param>
        /// <returns></returns>
        public ResponsePackNew GetRegionByAccount(string account)
        {
            var requestJson = HttpUtil.GetSignRequestJson(new RegionByAccountObj() { account = account });
            return HttpUtil.RequestHttpsPost(NewAPI.API_POST_GetRegionByAccount, requestJson);
        }

        /// <summary>
        /// 刷新Token
        /// </summary>
        /// <returns></returns>
        public bool RefreshToken()
        {
            var requestJson = HttpUtil.GetSignRequestJson(new RefreshTokenObj()
            {
                refreshToken = MainPage.LoginUser.refreshToken,
            });
            var revertObj = HttpUtil.RequestHttpsPost(NewAPI.API_POST_Login, requestJson);
            if (revertObj.Code.ToUpper() == StateCode.SUCCESS)
            {
                var revertData = Newtonsoft.Json.JsonConvert.DeserializeObject<UserLoginRes>(revertObj.Data.ToString());
                MainPage.LoginUser.loginTokenString = revertData.headerPrefix + revertData.accessToken;
                MainPage.LoginUser.lastTime = DateTime.Now;
                MainPage.LoginUser.SaveUserInfo();
                return true;
            }
            return false;
        }

        #endregion


        #region 注册、登录部分
        /// <summary>
        /// 获取请求提交的语言参数
        /// </summary>
        public string GetPostLanguageType()
        {
            return Language.CurrentLanguage == "Chinese" ? LanguageTypeEnum.CHINESE.ToString() : LanguageTypeEnum.ENGLISH.ToString();
        }

        /// <summary>
        /// 通用 发送验证码方法
        /// </summary>
        /// <param name="verifyType">1:注册 2：找回密码 3：绑定4:验证码登陆 5:敏感数据</param>
        /// <param name="account">邮箱或者手机号</param>
        /// <param name="isPhone">是否手机</param>
        /// <param name="phoneZoneCode">手机国家区号</param>
        /// <returns></returns>
        public ResponsePackNew VerificationCodeSend(VerifyType verifyType, string account, bool isPhone = false, string phoneZoneCode = "86")
        {
            var requestObj = new VerifyCodeSendObj()
            {
                verifyType = (int)verifyType,
                languageType = GetPostLanguageType()
            };
            // 是否是手机 
            if (isPhone)
            {
                requestObj.phone = account;
                requestObj.phonePrefix = phoneZoneCode;
            }
            else
            {
                requestObj.mail = account;
            }
            // 超时时间设置为20秒，应该测试海外服务器发送验证码响应时间很久
            var requestJson = HttpUtil.GetSignRequestJson(requestObj);
            return HttpUtil.RequestHttpsPost(NewAPI.API_POST_Verification_Send, requestJson, "", "", HttpUtil.TIME_OUT_LONG);
        }

        /// <summary>
        /// 账号登录-使用密码
        /// </summary>
        /// <param name="account">账号</param>
        /// <param name="password">密码</param>
        /// <returns></returns>
        public ResponsePackNew LoginByPassword(string account, string password)
        public ResponsePack LoginByPassword(string account, string password)
        {
            var requestJson = HttpUtil.GetSignRequestJson(new LoginObj()
            {
                account = account,
                loginPwd = password
            });
            return HttpUtil.RequestHttpsPost(NewAPI.API_POST_Login, requestJson);
            string jsonString = "{" +

                                "\"Account\":" + "\"" + account + "\"" + "," +
                                "\"Password\":" + "\"" + password + "\"" + 
                                "}";
            return RequestHttps($"{severAddress}/ZigbeeUsers/Login", jsonString, false);
        }

        /// <summary>
        /// 验证码登录
        /// </summary>
        /// <param name="account">账号</param>
        /// <param name="vCode">验证码</param>
        /// <returns></returns>
        public ResponsePackNew LoginValidCode(string account, string vCode)
        public ResponsePack LoginValidCode(string account,string vCode)
        {
            var requestJson = HttpUtil.GetSignRequestJson(new LoginObj()
            {
                account = account,
                verifyCode = vCode,
                grantType = "verify"
            });
            return HttpUtil.RequestHttpsPost(NewAPI.API_POST_Login, requestJson);
            Dictionary<string, object> d = new Dictionary<string, object>();
            d.Add("Account", account);
            d.Add("Code", vCode);
            d.Add("Language", Language.CurrentLanguage);
            d.Add("AreaCode", "86");
            var jsonString = Newtonsoft.Json.JsonConvert.SerializeObject(d);
            return RequestHttps($"{severAddress}/ZigbeeUsers/LoginValidCode", jsonString, false);
        }

        /// <summary>
        /// 手机号码注册
        /// </summary>
        /// <param name="mobileNumber"></param>
        /// <param name="password"></param>
        /// <param name="language"></param>
        public ResponsePack RegisterPhone(string mobileNumber, string password, string language)
        {
            string jsonString = "{" +

                                "\"Account\":" + "\"" + mobileNumber + "\"" + "," +
                                "\"Password\":" + "\"" + password + "\"" + "," +
                                "\"Language\":" + "\"" + language + "\"" +
                                "\"AreaCode\":" + "\"" + "86" + "\"" +
                                "}";
            return RequestHttps($"{severAddress}/SignIn", jsonString, false);
        }

        public ResponsePack GetAreaCode()
        {
            string requestJson = "{}";
            return RequestHttps($"{severAddress}/ZigbeeUsers/GetAreaCode", requestJson, false);
        }

        /// <summary>
        /// 验证短信或者邮箱验证码，之后注册
        /// </summary>
        /// <param name="account">邮箱或者手机号</param>
        /// <param name="account">账号</param>
        /// <param name="password">密码</param>
        /// <param name="entryPassword">确认密码</param>
        /// <param name="code">验证码</param>
        /// <param name="isPhone">是否手机</param>
        /// <param name="areaCode"></param>
        /// <returns></returns>
        public ResponsePackNew ValidataCodeAndRegister(string account, string password, string code, bool isPhone = false)
        public ResponsePack ValidataCodeAndRegister(string account, string password, string entryPassword, string code, int areaCode)
        {
            var requestObj = new RegisterObj() { loginPwd = password, verifyCode = code, memberName = account };
            if (isPhone)
            {
                requestObj.memberPhone = account;
            }
            else
            {
                requestObj.memberEmail = account;
            }
            var requestJson = HttpUtil.GetSignRequestJson(requestObj);
            return HttpUtil.RequestHttpsPost(NewAPI.API_POST_Member_Register, requestJson);
            //var requestObj = new ValidateSmsCodeObj() { Phone = accout, Code = code };
            //var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(requestObj);
            string requestJson = "{" +

                                "\"Account\":" + "\"" + account + "\"" + "," +
                                "\"Password\":" + "\"" + password + "\"" + "," +
                                "\"EnterPassword\":" + "\"" + entryPassword + "\"" + "," +
                                "\"Language\":" + "\"" + Language.CurrentLanguage.ToLower() + "\"" + "," +
                                "\"Code\":" + "\"" + code + "\"" + "," +
                                "\"RegisterSoruce\":" + 0 + "," +
                                "\"AreaCode\":" + 86 +
                                "}";
            return RequestHttps($"{severAddress}/ZigbeeUsers/ValidataCodeAndRegisterAccount", requestJson, false);
        }


        /// <summary>
        /// 忘记密码，重置密码
        /// 获取注册验证码
        /// </summary>
        /// <param name="account">邮箱或者手机号</param>
        /// <param name="password">新密码</param>
        /// <param name="vCode">验证码</param>
        /// <param name="isPhone">是否手机账号</param>
        /// <returns></returns>
        public ResponsePackNew ForgetPassword(string account, string password, string vCode, bool isPhone)
        public ResponsePack GetRegisterVerCode(string account)
        {
            var requestObj = new ForgetPwdObj() { verifyCode = vCode, loginPwd = password };
            if (isPhone)
            {
                //手机忘记密码
                requestObj.memberPhone = account;
            }
            else
            {
                //邮箱忘记密码
                requestObj.memberEmail = account;
            }
            var requestJson = HttpUtil.GetSignRequestJson(requestObj);
            return HttpUtil.RequestHttpsPost(NewAPI.API_POST_Member_ForgetPwd, requestJson);
            string jsonString = "{" +

                                "\"Account\":" + "\"" + account + "\"" + "," +
                                "\"Company\":" + MainPage.Company + "," +
                                "\"Language\":" + "\"" + Language.CurrentLanguage.ToLower() + "\"" + "," +
                                "\"AreaCode\":" + 86 +
                                "}";
            return RequestHttps($"{severAddress}/ZigbeeUsers/RegisterSendVerCode", jsonString, false);

        }




        


        /// <summary>
@@ -261,7 +194,7 @@

            string jsonString = "{" +

                                "\"Account\":" + "\"" + account + "\"" + "," +
                                "\"AreaCode\":" + "86" +
                                "\"AreaCode\":" + "86" + 
                                "}";
            return RequestHttps($"{severAddress}/ZigbeeUsers/LoginSendVerCode", jsonString, false);
        }
@@ -297,8 +230,6 @@
            return RequestHttps($"{severAddress}/ZigbeeUsers/ValidatorCode", jsonString, false);
        }



        /// <summary>
        /// 重设密码
        /// </summary>
@@ -326,7 +257,7 @@
            var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(d);
            var revertObj = RequestHttps($"{severAddress}/ZigbeeUsers/GetAccountInfo", requestJson, true);

            if (revertObj.StateCode.ToUpper() == StateCode.SUCCESS)
            if (revertObj.StateCode.ToUpper() == "SUCCESS")
            {
                var dataStr = JObject.FromObject(revertObj.ResponseData);
                //"DistributedMark": "96439601-fd26-4768-8440-1d9dfa32c109",  < !--帐号Id-- >
@@ -347,8 +278,7 @@
                        fs.Flush();
                        MainPage.LoginUser.headImagePagePath = filePath;
                    }
                }
                catch (Exception ex)
                } catch (Exception ex)
                {
                    MainPage.Log($"download headImage error : {ex.Message}");
                }
@@ -424,39 +354,63 @@
        /// <summary>
        /// 获取住宅列表
        /// </summary>
        public string GetHomePager(HomeTypeEnum homeType = HomeTypeEnum.ALL)
        public string GetHomePager()
        {
            var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(new GetHomeListObj() { homeType = homeType.ToString() });
            var resultObj = HttpUtil.RequestHttpsPost(NewAPI.API_POST_Gethomepager, requestJson);
            if(resultObj.Code == StateCode.SUCCESS)
            {
                var homeList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<RegionInfoResNew>>(resultObj.Data.ToString());
                if (homeList == null || homeList.Count == 0) {
            string jsonString = "{" +

                                "\"RequestVersion\":" + "\"" + MainPage.VersionString + "\"" + "," +
                                "\"RequestSource\":" + "\"" + "2" + "\"" + "," +
                                "\"HomeType\":" + "\"" + "1" + "\"" + "," +
                                "\"LoginAccessToken\":" + "\"" + MainPage.LoginUser.loginTokenString + "\"" +
                                "}";
            var responsePack = RequestHttps($"{severAddress}/App/GetHomePager", jsonString,false);

            if (responsePack.StateCode.ToUpper() == "SUCCESS")
            {
                var dataStr = JObject.FromObject(responsePack.ResponseData);
                //没有住宅
                if (dataStr.GetValue("PageData").ToString() == "[]")
                {

                }
                else
                {
                    //{
                    // {
                    //  "Id": "1107487",
                    //  "HomeStatus": 2,
                    //  "UserGuid": "22980",
                    //  "Name": "啊",
                    //  "Address": null,
                    //  "Longitude": 0.0,
                    //  "Latitude": 0.0,
                    //  "RegionName": null,
                    //  "Company": null,
                    //  "ContactPerson": null,
                    //  "ContactPersonPhone": null,
                    //  "Remarks": null,
                    //  "ChangeDate": null,
                    //  "AccountType": 0,
                    //  "CreatedOnUtc": "2020-05-27T06:52:03",
                    //  "IsOthreShare": false,
                    //  "MainUserDistributedMark": null,
                    //  "HomeGateways": [
                    //    {
                    //      "GatewayUniqueId": "4E47323347591243"
                    //    }
                    //  ]
                    //}}
                    MainPage.LoginUser.regionList = new List<RegionInfoRes>();
                   
                    foreach (var mHome in homeList)
                    foreach (var jsonData in dataStr.GetValue("PageData"))
                    {
                        var homeJsonStr = JObject.FromObject(jsonData);
                        var home = new RegionInfoRes()
                        {
                            RegionID = mHome.Id,
                            Name = mHome.homeName,
                            IsOthreShare = mHome.IsOtherShare,
                            accountType = mHome.accountType,
                            isRemoteControl = mHome.isRemoteControl,
                            longitude = mHome.longitude,
                            latitude = mHome.latitude,
                            deliverstatus = mHome.deliverstatus,
                            homeType = mHome.homeType,
                            regionUrl = mHome.regionUrl,
                            emqUrl = mHome.emqUrl,
                            homeRegionName = mHome.homeRegionName,
                            homeRegionId = mHome.homeRegionId,
                            Address = mHome.homeAddress,
                            RegionID = homeJsonStr.GetValue("Id").ToString(),
                            RegionName = homeJsonStr.GetValue("RegionName").ToString(),
                            Name = homeJsonStr.GetValue("Name").ToString(),
                            Address = homeJsonStr.GetValue("Address").ToString(),
                            IsOthreShare = (bool)homeJsonStr.GetValue("IsOthreShare"),
                            homeGateways = Newtonsoft.Json.JsonConvert.DeserializeObject<List<HomeGateways>>(homeJsonStr.GetValue("HomeGateways").ToString()),
                        };
                        if (home.IsOthreShare)
                        {
@@ -471,82 +425,8 @@
                    DB_ResidenceData.residenceData.SaveResidenceData();
                    MainPage.LoginUser.SaveUserInfo();
                }
               
            }

            return resultObj.Code;

            //string jsonString = "{" +

            //                    "\"RequestVersion\":" + "\"" + MainPage.VersionString + "\"" + "," +
            //                    "\"RequestSource\":" + "\"" + "2" + "\"" + "," +
            //                    "\"HomeType\":" + "\"" + "1" + "\"" + "," +
            //                    "\"LoginAccessToken\":" + "\"" + MainPage.LoginUser.loginTokenString + "\"" +
            //                    "}";
            //var responsePack = RequestHttps($"{severAddress}/App/GetHomePager", jsonString, false);

            //if (responsePack.StateCode.ToUpper() == StateCode.SUCCESS_CODE)
            //{
            //    var dataStr = JObject.FromObject(responsePack.ResponseData);
            //    //没有住宅
            //    if (dataStr.GetValue("PageData").ToString() == "[]")
            //    {

            //    }
            //    else
            //    {
            //        //{
            //        // {
            //        //  "Id": "1107487",
            //        //  "HomeStatus": 2,
            //        //  "UserGuid": "22980",
            //        //  "Name": "啊",
            //        //  "Address": null,
            //        //  "Longitude": 0.0,
            //        //  "Latitude": 0.0,
            //        //  "RegionName": null,
            //        //  "Company": null,
            //        //  "ContactPerson": null,
            //        //  "ContactPersonPhone": null,
            //        //  "Remarks": null,
            //        //  "ChangeDate": null,
            //        //  "AccountType": 0,
            //        //  "CreatedOnUtc": "2020-05-27T06:52:03",
            //        //  "IsOthreShare": false,
            //        //  "MainUserDistributedMark": null,
            //        //  "HomeGateways": [
            //        //    {
            //        //      "GatewayUniqueId": "4E47323347591243"
            //        //    }
            //        //  ]
            //        //}}
            //        MainPage.LoginUser.regionList = new List<RegionInfoRes>();
            //        foreach (var jsonData in dataStr.GetValue("PageData"))
            //        {
            //            var homeJsonStr = JObject.FromObject(jsonData);
            //            var home = new RegionInfoRes()
            //            {
            //                RegionID = homeJsonStr.GetValue("Id").ToString(),
            //                RegionName = homeJsonStr.GetValue("RegionName").ToString(),
            //                Name = homeJsonStr.GetValue("Name").ToString(),
            //                Address = homeJsonStr.GetValue("Address").ToString(),
            //                IsOthreShare = (bool)homeJsonStr.GetValue("IsOthreShare"),
            //                homeGateways = Newtonsoft.Json.JsonConvert.DeserializeObject<List<HomeGateways>>(homeJsonStr.GetValue("HomeGateways").ToString()),
            //            };
            //            if (home.IsOthreShare)
            //            {
            //                continue;
            //            }
            //            MainPage.LoginUser.regionList.Add(home);
            //            if (string.IsNullOrEmpty(DB_ResidenceData.residenceData.CurReginID))
            //            {
            //                DB_ResidenceData.residenceData.CurReginID = MainPage.LoginUser.regionList[0].RegionID;
            //            }
            //        }
            //        DB_ResidenceData.residenceData.SaveResidenceData();
            //        MainPage.LoginUser.SaveUserInfo();
            //    }
            //}
            //return responsePack.StateCode;
            return responsePack.StateCode;
        }
        /// <summary>
        /// 编辑住宅信息
@@ -602,7 +482,7 @@
        /// <param name="nickName"></param>
        /// <param name="subAccountGuid"></param>
        /// <returns></returns>
        public ResponsePack EditSubAccountNickName(string nickName, string subAccountGuid)
        public ResponsePack EditSubAccountNickName(string nickName,string subAccountGuid)
        {
            Dictionary<string, object> d = new Dictionary<string, object>();
            d.Add("SubAccountGuid", subAccountGuid);
@@ -642,7 +522,7 @@
        /// 获取住宅下子账号的共享数据
        /// </summary>
        /// <returns></returns>
        public ResponsePack GetShareData(string memberId, string hId)
        public ResponsePack GetShareData(string memberId,string hId)
        {
            Dictionary<string, object> d = new Dictionary<string, object>();
            d.Add("DistributedMark", memberId);
@@ -714,7 +594,7 @@
        /// <param name="subAccount"></param>
        /// <param name="nickName"></param>
        /// <returns></returns>
        public ResponsePack BindResidenceMemberAccount(string subAccount, string nickName)
        public ResponsePack BindResidenceMemberAccount(string subAccount,string nickName)
        {
            Dictionary<string, object> d = new Dictionary<string, object>();
            d.Add("SubAccount", subAccount);
@@ -794,8 +674,7 @@
                    }
                    System.Threading.Thread.Sleep(1000);
                }
                Shared.Application.RunOnMainThread(() =>
                {
                Shared.Application.RunOnMainThread(() => {
                    try
                    {
                        HDL_ON.UI.HomePage.LoadEvent_RefreshAir();
@@ -812,7 +691,7 @@
        /// 请求Mqtt数据
        /// </summary>
        /// <param name="dataStringJson">请求的参数.</param>
        public ResponsePack RequestMqttInfo(string dataStringJson)
        public ResponsePack RequestMqttInfo( string dataStringJson)
        {
            ResponsePack revertObj = null;

@@ -858,7 +737,7 @@
        /// <summary>
        /// 获取住宅备份列表
        /// </summary>
        public Dictionary<int, string> GetRegionLastBackupId()
        public Dictionary<int,string> GetRegionLastBackupId()
        {
            //Dialog dialog = new Dialog();
            //dialog.Show();
@@ -868,7 +747,7 @@
            d.Add("LevelID", DB_ResidenceData.residenceData.residecenInfo.RegionID);// 199200);
            var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(d);
            var revertObj = RequestHttps("https://developer.hdlcontrol.com/api/GetUserFolder", requestJson, true);
            if (revertObj == null || revertObj.ResponseData == null)
            if(revertObj == null || revertObj.ResponseData == null)
            {
                return new Dictionary<int, string>();
            }