From 135e148183e066795c487c62ef387ba40a621efd Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期一, 23 十一月 2020 10:25:11 +0800
Subject: [PATCH] Merge branch 'CJL'
---
HDL_ON/DAL/Server/HttpServerRequest.cs | 300 +++++++++++++++++++++++++++++++++++-------------------------
1 files changed, 175 insertions(+), 125 deletions(-)
diff --git a/HDL_ON/DAL/Server/HttpServerRequest.cs b/HDL_ON/DAL/Server/HttpServerRequest.cs
index 86ad582..f33c54d 100644
--- a/HDL_ON/DAL/Server/HttpServerRequest.cs
+++ b/HDL_ON/DAL/Server/HttpServerRequest.cs
@@ -248,21 +248,6 @@
return HttpUtil.RequestHttpsPost(NewAPI.API_POST_Member_ForgetPwd, requestJson);
}
-
-
- ///// <summary>
- ///// 鑾峰彇鐧诲綍楠岃瘉鐮�
- ///// </summary>
- //public ResponsePack GetLoginVerCode(string account)
- //{
-
- // string jsonString = "{" +
- // "\"Account\":" + "\"" + account + "\"" + "," +
- // "\"AreaCode\":" + "86" +
- // "}";
- // return RequestHttps($"{severAddress}/ZigbeeUsers/LoginSendVerCode", jsonString, false);
- //}
-
/// <summary>
/// 楠岃瘉楠岃瘉鐮�
/// </summary>
@@ -289,22 +274,6 @@
return HttpUtil.RequestHttpsPost(NewAPI.API_POST_Verification_Check, requestJson);
}
-
-
- /// <summary>
- /// 閲嶈瀵嗙爜
- /// </summary>
- /// <returns></returns>
- public ResponsePack ResetPassword(string account, string password, string rePassword, int countryIndex)
- {
- string jsonString = "{" +
- "\"Account\":" + "\"" + account + "\"" + "," +
- "\"Password\":" + "\"" + password + "\"" + "," +
- "\"AgainPassword\":" + "\"" + rePassword + "\"" + "," +
- "\"AreaCode\":" + countryIndex +
- "}";
- return RequestHttps($"{severAddress}/ZigbeeUsers/ResetPassword", jsonString, false);
- }
#endregion
#region 涓汉淇℃伅閮ㄥ垎
@@ -613,27 +582,71 @@
//}
//return responsePack.StateCode;
}
+
/// <summary>
/// 缂栬緫浣忓畢淇℃伅
/// </summary>
+ /// <param name="editId">0 淇敼浣忓畢鍚嶅瓧銆�1 淇敼浣忓畢鍦板潃</param>
+ /// <param name="editName"></param>
/// <returns></returns>
- public ResponsePack EditResidenceInfo()
+ public ResponsePackNew EditResidenceInfo(int editId, string editName)
{
- //鍒涘缓瀛楀吀
- Dictionary<string, object> d = new Dictionary<string, object>();
- //娣诲姞鍏冪礌
- d.Add("RequestVersion", MainPage.VersionString);
- d.Add("RequestSource", "2");
- d.Add("LoginAccessToken", UserInfo.Current.loginTokenString);
- d.Add("HomeId", DB_ResidenceData.residenceData.residecenInfo.RegionID);
- d.Add("HomeType", 1);
- d.Add("Name", DB_ResidenceData.residenceData.residecenInfo.Name);
- d.Add("Address", DB_ResidenceData.residenceData.residecenInfo.Address);
- //娣诲姞瀹屾垚浠ュ悗鎶婂瓧鍏哥被涓暟鎹牸寮忓寲涓簀son瀛楃涓�
- //灏嗗璞¤浆涓簀son瀛楃涓�
+ var requestObj = new AddOrUpdateHomeObj()
+ {
+ homeId = DB_ResidenceData.residenceData.residecenInfo.RegionID,
+ };
- string jsonString = Newtonsoft.Json.JsonConvert.SerializeObject(d);
- return RequestHttps($"{severAddress}/App/EditHome", jsonString, false);
+ if(editId == 0)
+ {
+ requestObj.homeName = editName;
+ }
+ else if(editId == 1)
+ {
+ requestObj.Address = editName;
+ }
+
+ var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(requestObj);
+ return HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_Home_UpdateHome, requestJson);
+ }
+
+ /// <summary>
+ /// 鑾峰彇鍒锋柊褰撳墠浣忓畢缃戝叧鎺ュ彛
+ /// </summary>
+ public void GetHomeGatewayList()
+ {
+ if (string.IsNullOrEmpty(DB_ResidenceData.residenceData.residecenInfo.RegionID)) return;
+ var nowhomeId = DB_ResidenceData.residenceData.residecenInfo.RegionID;
+ var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(new HomeIdObj() { homeId = nowhomeId });
+ var revertObj = HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_GetGatewayList, requestJson);
+ if (revertObj.Code == StateCode.SUCCESS)
+ {
+ var mHomeGatewayRes = Newtonsoft.Json.JsonConvert.DeserializeObject<List<HomeGatewayInfo>>(revertObj.Data.ToString());
+ if (nowhomeId == DB_ResidenceData.residenceData.residecenInfo.RegionID)
+ {
+ if(mHomeGatewayRes != null)
+ {
+ if (mHomeGatewayRes.Count > 0)
+ {
+ DB_ResidenceData.residenceData.residenceGatewayMAC = mHomeGatewayRes[0].mac;
+ }
+ else
+ {
+ DB_ResidenceData.residenceData.residenceGatewayMAC = "";
+
+ }
+ DB_ResidenceData.residenceData.SaveResidenceData();
+ }
+
+ if (mHomeGatewayRes != null)
+ {
+ //Utlis.WriteLine ("鑾峰緱褰撳墠浣忓畢缃戝叧涓暟锛�" + mHomeGatewayRes.content.Count);
+ }
+ }
+ }
+ else
+ {
+ //鎻愮ず閿欒
+ }
}
/// <summary>
@@ -642,11 +655,8 @@
/// <returns></returns>
public ResponsePackNew GetResidenceMemberAccount()
{
- var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(new HomeIdObj() { homeId = DB_ResidenceData.residenceData.residecenInfo.RegionID });
- var replaceToken = UserInfo.Current.loginTokenString;
- //濡傛灉褰撳墠鎵�鍒嗕韩浣忓畢鍜屼负绠＄悊鍛橈紝鏇挎崲涓轰富浜簍oken
- //寰呭鐞�...
- return HttpUtil.RequestHttpsPost(NewAPI.API_POST_Child_FindAll, requestJson, DB_ResidenceData.residenceData.residecenInfo.regionUrl, replaceToken);
+ var requestJson = HttpUtil.GetSignRequestJson(new HomeIdObj() { homeId = DB_ResidenceData.residenceData.residecenInfo.RegionID });
+ return HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_Child_FindAll, requestJson);
}
/// <summary>
@@ -660,11 +670,8 @@
childAccountId = subaccount.childAccountId,
homeId = subaccount.homeId
};
- var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(requestObj);
- var replaceToken = UserInfo.Current.loginTokenString;
- //濡傛灉褰撳墠鎵�鍒嗕韩浣忓畢鍜屼负绠＄悊鍛橈紝鏇挎崲涓轰富浜簍oken
- //寰呭鐞�...
- return HttpUtil.RequestHttpsPost(NewAPI.API_POST_Child_Delete, requestJson, DB_ResidenceData.residenceData.residecenInfo.regionUrl, replaceToken);
+ var requestJson = HttpUtil.GetSignRequestJson(requestObj);
+ return HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_Child_Delete, requestJson);
}
/// <summary>
@@ -673,13 +680,16 @@
/// <param name="nickName"></param>
/// <param name="subAccountGuid"></param>
/// <returns></returns>
- public ResponsePack EditSubAccountNickName(string nickName, string subAccountGuid)
+ public ResponsePackNew EditSubAccountNickName(string nickName, string childAccountId)
{
- 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);
+ var requestJson = HttpUtil.GetSignRequestJson(new UpdateChildNickNameObj()
+ {
+ homeId = DB_ResidenceData.residenceData.residecenInfo.RegionID,
+ childAccountId = childAccountId,
+ nickName = nickName,
+ });
+ return HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_Child_Update, requestJson);
+
}
/// <summary>
/// 淇敼瀛愯处鍙峰垱寤哄満鏅潈闄�
@@ -687,70 +697,105 @@
/// <param name="nickName"></param>
/// <param name="subAccountGuid"></param>
/// <returns></returns>
- public ResponsePack ChangeCreateSceneState(string homeGuid, string subAccountGuid)
+ public ResponsePackNew ChangeCreateSceneState(bool isAllow, string childAccountId)
{
- 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);
+ var requestJson = HttpUtil.GetSignRequestJson(new UpdateChildAllowCreateSceneObj()
+ {
+ homeId = DB_ResidenceData.residenceData.residecenInfo.RegionID,
+ childAccountId = childAccountId,
+ isAllowCreateScene = isAllow,
+ });
+ return HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_Child_Update, requestJson);
}
/// <summary>
/// 鑾峰彇浣忓畢涓嬪瓙璐﹀彿鐨勫叡浜暟鎹垪琛�
/// </summary>
/// <returns></returns>
- public ResponsePack GetShareDataByMemberAccount(string memberId)
+ public ResponsePackNew GetShareDataByMemberAccount(string childAccountId)
{
- 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);
+ //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);
+
+ var requestJson = HttpUtil.GetSignRequestJson(new HomeShareFindAll()
+ {
+ homeId = DB_ResidenceData.residenceData.residecenInfo.RegionID,
+ childAccountId = childAccountId
+ });
+ return HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_Home_Share_FindAll, requestJson);
+
}
/// <summary>
- /// 鑾峰彇浣忓畢涓嬪瓙璐﹀彿鐨勫叡浜暟鎹�
+ /// 涓嬭浇鍗曚釜鍒嗕韩鏂囦欢
/// </summary>
/// <returns></returns>
- public ResponsePack GetShareData(string memberId, string hId)
+ public byte[] GetShareData(ShareData shareData)
{
- 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);
+ //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);
+
+ var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(new ShareFileDownObj()
+ {
+ homeId = shareData.homeId,
+ homeShareId = shareData.id
+ });
+ var replaceToken = "";
+ if (DB_ResidenceData.residenceData.residecenInfo.IsOthreShare)
+ {
+ replaceToken = DB_ResidenceData.residenceData.MasterToken;
+ }
+ return HttpUtil.RequestHttpsDownload(NewAPI.API_POST_Home_Share_DownOne, requestJson, null, DB_ResidenceData.residenceData.residecenInfo.regionUrl, replaceToken);
+
}
/// <summary>
/// 澧炲姞鍏变韩鏁版嵁鍒楄〃
/// </summary>
/// <returns></returns>
- public ResponsePack AddShareData(ShareData shareData)
+ public ResponsePackNew 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);
+ //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);
+
+ var queryDic = new Dictionary<string, object>();
+ queryDic.Add("homeId", DB_ResidenceData.residenceData.residecenInfo.RegionID);
+ queryDic.Add("childAccountId", shareData.childAccountId);
+ queryDic.Add("fileName", shareData.fileName);
+ var replaceToken = "";
+ if (DB_ResidenceData.residenceData.residecenInfo.IsOthreShare)
+ {
+ replaceToken = DB_ResidenceData.residenceData.MasterToken;
+ }
+ return HttpUtil.RequestHttpsUpload(RestSharp.Method.POST, NewAPI.API_POST_Home_Share_Add, shareData.ShareDataBytes, queryDic, null, DB_ResidenceData.residenceData.residecenInfo.regionUrl, replaceToken);
}
/// <summary>
/// 澧炲姞鍏变韩鏁版嵁
/// </summary>
/// <returns></returns>
- public ResponsePack EditShareData(ShareData shareData)
+ public ResponsePackNew 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);
+ return AddShareData(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>
@@ -758,26 +803,32 @@
/// </summary>
/// <param name="shareData"></param>
/// <returns></returns>
- public ResponsePack DeleteShareData(ShareData shareData)
+ public ResponsePackNew 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);
+ var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(new ShareFileDownObj()
+ {
+ homeId = shareData.homeId,
+ homeShareId = shareData.id
+ });
+ return HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_Home_Share_Delete, requestJson);
+ //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>
+ ///// <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>
/// 缁戝畾瀛愯处鍙峰埌浣忓畢涓�
@@ -785,20 +836,17 @@
/// <param name="subAccount"></param>
/// <param name="nickName"></param>
/// <returns></returns>
- public ResponsePack BindResidenceMemberAccount(string subAccount, string nickName)
+ public ResponsePackNew 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);
+ //娣诲姞瀛愯处鍙�
+ var requestObj = new ChildAddObj() { homeId = DB_ResidenceData.residenceData.residecenInfo.RegionID, account = subAccount, nickName = nickName };
+ var requestJson = HttpUtil.GetSignRequestJson(requestObj);
+ return HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_Child_Add, requestJson);
- string jsonString = Newtonsoft.Json.JsonConvert.SerializeObject(d);
- return RequestHttps($"{severAddress}/ZigbeeUsers/BindSubAccount", jsonString, true);
}
/// <summary>
- /// 鑾峰彇浣忓畢涓嬬殑鎴愬憳璐﹀彿
+ /// 鑾峰彇浣忓畢涓嬬殑鎴愬憳璐﹀彿淇℃伅
/// </summary>
/// <returns></returns>
public ResponsePack GetResidenceMemberAccountInfo(string account)
@@ -1396,5 +1444,7 @@
*/
#endregion
+
+
}
}
\ No newline at end of file
--
Gitblit v1.8.0