From 9dcd17ee7578c5a06bfcd960cc72ea2995716004 Mon Sep 17 00:00:00 2001 From: wxr <464027401@qq.com> Date: 星期三, 15 七月 2020 16:43:38 +0800 Subject: [PATCH] 20200715 --- HDL_ON/DAL/Server/HttpServerRequest.cs | 245 +++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 225 insertions(+), 20 deletions(-) diff --git a/HDL_ON/DAL/Server/HttpServerRequest.cs b/HDL_ON/DAL/Server/HttpServerRequest.cs index d7c2587..5a3edf9 100644 --- a/HDL_ON/DAL/Server/HttpServerRequest.cs +++ b/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); @@ -320,6 +318,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 #region 浣忓畢閮ㄥ垎 @@ -346,6 +356,31 @@ } 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")) { @@ -356,16 +391,19 @@ RegionName = homeJsonStr.GetValue("RegionName").ToString(), Name = homeJsonStr.GetValue("Name").ToString(), Address = homeJsonStr.GetValue("Address").ToString(), + IsOthreShare = (bool)homeJsonStr.GetValue("IsOthreShare"), }; 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; - - } /// <summary> /// 缂栬緫浣忓畢淇℃伅 @@ -390,6 +428,172 @@ return RequestHttps($"{severAddress}/App/EditHome", jsonString, false); } + /// <summary> + /// 鑾峰彇浣忓畢涓嬬殑鎴愬憳璐﹀彿 + /// </summary> + /// <returns></returns> + public ResponsePack GetResidenceMemberAccount() + { + Dictionary<string, object> d = new Dictionary<string, object>(); + d.Add("DistributedMark", DB_ResidenceData.residenceData.residecenInfo.RegionID); + string jsonString = Newtonsoft.Json.JsonConvert.SerializeObject(d); + return RequestHttps($"{severAddress}/ZigbeeUsers/GetSubAccountByDistributedMark", jsonString, true); + } + + /// <summary> + /// 鍒犻櫎浣忓畢涓嬬殑鎴愬憳璐﹀彿 + /// </summary> + /// <returns></returns> + public ResponsePack DeleteResidenceMemberAccount(string memberAccount) + { + Dictionary<string, object> d = new Dictionary<string, object>(); + d.Add("SubAccount", memberAccount); + d.Add("HouseDistributedMark", DB_ResidenceData.residenceData.residecenInfo.RegionID); + string jsonString = Newtonsoft.Json.JsonConvert.SerializeObject(d); + return RequestHttps($"{severAddress}/ZigbeeUsers/DeletedSubAccount", jsonString, true); + } + + /// <summary> + /// 淇敼瀛愯处鍙锋樀绉� + /// </summary> + /// <param name="nickName"></param> + /// <param name="subAccountGuid"></param> + /// <returns></returns> + public ResponsePack EditSubAccountNickName(string nickName,string subAccountGuid) + { + Dictionary<string, object> d = new Dictionary<string, object>(); + d.Add("SubAccountGuid", subAccountGuid); + d.Add("NickName", nickName); + string jsonString = Newtonsoft.Json.JsonConvert.SerializeObject(d); + return RequestHttps($"{severAddress}/ZigbeeUsers/EditSubAccountNickName", jsonString, true); + } + /// <summary> + /// 淇敼瀛愯处鍙峰垱寤哄満鏅潈闄� + /// </summary> + /// <param name="nickName"></param> + /// <param name="subAccountGuid"></param> + /// <returns></returns> + public ResponsePack ChangeCreateSceneState(string homeGuid, string subAccountGuid) + { + Dictionary<string, object> d = new Dictionary<string, object>(); + d.Add("SubAccountGuid", subAccountGuid); + d.Add("HomeGuid", homeGuid); + string jsonString = Newtonsoft.Json.JsonConvert.SerializeObject(d); + return RequestHttps($"{severAddress}/ZigbeeUsers/ChangeCreateSceneState", jsonString, true); + } + + /// <summary> + /// 鑾峰彇浣忓畢涓嬪瓙璐﹀彿鐨勫叡浜暟鎹垪琛� + /// </summary> + /// <returns></returns> + public ResponsePack GetShareDataByMemberAccount(string memberId) + { + Dictionary<string, object> d = new Dictionary<string, object>(); + d.Add("DistributedMark", memberId); + d.Add("HouseDistributedMark", DB_ResidenceData.residenceData.residecenInfo.RegionID); + string jsonString = Newtonsoft.Json.JsonConvert.SerializeObject(d); + return RequestHttps($"{severAddress}/ZigbeeDataShare/GetShareDataBySubAccount", jsonString, true); + } + + /// <summary> + /// 鑾峰彇浣忓畢涓嬪瓙璐﹀彿鐨勫叡浜暟鎹� + /// </summary> + /// <returns></returns> + public ResponsePack GetShareData(string memberId,string hId) + { + Dictionary<string, object> d = new Dictionary<string, object>(); + d.Add("DistributedMark", memberId); + d.Add("HouseDistributedMark", hId); + string jsonString = Newtonsoft.Json.JsonConvert.SerializeObject(d); + return RequestHttps($"{severAddress}/ZigbeeDataShare/GetOneShareData", jsonString, true); + } + + /// <summary> + /// 澧炲姞鍏变韩鏁版嵁鍒楄〃 + /// </summary> + /// <returns></returns> + public ResponsePack AddShareData(ShareData shareData) + { + Dictionary<string, object> d = new Dictionary<string, object>(); + d.Add("ShareName", shareData.ShareName); + d.Add("HouseDistributedMark", shareData.HouseDistributedMark); + d.Add("ShareDataBytes", shareData.ShareDataBytes); + d.Add("SubAccountDistributedMark", shareData.SubAccountDistributedMark); + string jsonString = Newtonsoft.Json.JsonConvert.SerializeObject(d); + return RequestHttps($"{severAddress}/ZigbeeDataShare/AddShareData", jsonString, true); + } + + /// <summary> + /// 澧炲姞鍏变韩鏁版嵁 + /// </summary> + /// <returns></returns> + public ResponsePack EditShareData(ShareData shareData) + { + Dictionary<string, object> d = new Dictionary<string, object>(); + d.Add("DistributedMark", shareData.DistributedMark); + d.Add("ShareName", shareData.ShareName); + d.Add("HouseDistributedMark", shareData.HouseDistributedMark); + d.Add("ShareDataBytes", shareData.ShareDataBytes); + d.Add("SubAccountDistributedMark", shareData.SubAccountDistributedMark); + string jsonString = Newtonsoft.Json.JsonConvert.SerializeObject(d); + return RequestHttps($"{severAddress}/ZigbeeDataShare/EditShareData", jsonString, true); + } + + /// <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> + /// <param name="nickName"></param> + /// <returns></returns> + public ResponsePack BindResidenceMemberAccount(string subAccount,string nickName) + { + Dictionary<string, object> d = new Dictionary<string, object>(); + d.Add("SubAccount", subAccount); + d.Add("HouseDistributedMark", DB_ResidenceData.residenceData.residecenInfo.RegionID); + d.Add("Nickname", nickName); + d.Add("IsAllowRemoteCtrl", true); + + string jsonString = Newtonsoft.Json.JsonConvert.SerializeObject(d); + return RequestHttps($"{severAddress}/ZigbeeUsers/BindSubAccount", jsonString, true); + } + + /// <summary> + /// 鑾峰彇浣忓畢涓嬬殑鎴愬憳璐﹀彿 + /// </summary> + /// <returns></returns> + public ResponsePack GetResidenceMemberAccountInfo(string account) + { + Dictionary<string, object> d = new Dictionary<string, object>(); + d.Add("Account", account); + string jsonString = Newtonsoft.Json.JsonConvert.SerializeObject(d); + return RequestHttps($"{severAddress}/ZigbeeUsers/GetSubAccountInfo", jsonString, true); + } #endregion @@ -433,9 +637,11 @@ responseString = Encoding.UTF8.GetString(webClient.DownloadData(url)); revertObj = Newtonsoft.Json.JsonConvert.DeserializeObject<ResponsePack>(responseString); jt = Newtonsoft.Json.JsonConvert.DeserializeObject<JObject>(revertObj.ResponseData.ToString()); - MainPage.cityInfo.temperature = jt.GetValue("Temperature").ToString()+ "掳"; - MainPage.cityInfo.humidity = jt.GetValue("Humidity").ToString()+"%"; + MainPage.cityInfo.temperature = jt.GetValue("Temperature").ToString(); + MainPage.cityInfo.humidity = jt.GetValue("Humidity").ToString(); MainPage.cityInfo.pm25 = jt.GetValue("Air_Quality").ToString(); + MainPage.cityInfo.windLevel = jt.GetValue("WindLevel").ToString(); + MainPage.cityInfo.weather = jt.GetValue("Weather").ToString(); break; } catch (Exception ex) @@ -456,7 +662,6 @@ } #endregion - #region 澶囦唤閮ㄥ垎 /// <summary> @@ -745,7 +950,7 @@ { sid = "000101" + guid + "0102010001AABB", name = ss.GetValue("Name").ToString(), - trait = new List<Trait>() { + function = new List<Trait>() { new Trait { attri="on_off", max=100,min = 0, value= new List<string> { "on","off"} }, }, roomIdList = roomIds, @@ -771,7 +976,7 @@ { sid = "000101" + guid + "0202020001AABB", name = ss.GetValue("Name").ToString(), - trait = new List<Trait>() { + function = new List<Trait>() { new Trait { attri="brightness", max=100,min = 0, value= new List<string> { "up","down"} }, }, roomIdList = roomIds, @@ -798,7 +1003,7 @@ { sid = "000101" + guid + "0202040001AABB", name = ss.GetValue("Name").ToString(), - trait = new List<Trait>() { + function = new List<Trait>() { new Trait { attri="brightness", max=100,min = 0, value= new List<string> { "on","off"} }, new Trait { attri="color", max=100,min = 0, value= new List<string> { "255", "255", "255" } }, }, @@ -827,7 +1032,7 @@ { sid = "000101" + guid + "0204010001AABB", name = ss.GetValue("Name").ToString(), - trait = new List<Trait>() { + function = new List<Trait>() { new Trait { attri="on_off", max=1,min = 0, value= new List<string> { "on","off"} }, new Trait { attri="mode", max = 2,min =0,value = new List<string>{ "auto", "heat", "cool","dry" } }, new Trait { attri = "fan",max = 3,min =0,value = new List<string>{ "low", "mid", "high" ,"auto"} }, @@ -859,7 +1064,7 @@ name = ss.GetValue("Name").ToString(), roomIdList = roomIds, //roomIdList = new List<string>() { roomSid }, - trait = new List<Trait>() { + function = new List<Trait>() { new Trait { attri="on_off", max=2,min = 0, value= new List<string> { "on","off","stop"} }, },// "curtain", lastState = "寮�", @@ -885,7 +1090,7 @@ name = ss.GetValue("Name").ToString(), roomIdList = roomIds, //roomIdList = new List<string>() { roomSid }, - trait = new List<Trait>() { + function = new List<Trait>() { new Trait { attri="on_off", max=100,min = 0, value= new List<string> { "on","off","stop"} }, },// "rollingshutter", lastState = "20%", @@ -911,7 +1116,7 @@ name = ss.GetValue("Name").ToString(), roomIdList = roomIds, //roomIdList = new List<string>() { roomSid }, - trait = new List<Trait>() { + function = new List<Trait>() { new Trait { attri="on_off", max=100,min = 0, value= new List<string> { "on","off","stop"} }, }, lastState = "20%", -- Gitblit v1.8.0