From 5efaaab958a0f4a91ad9d76b5d5fea0ea3fc3f41 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期二, 01 十二月 2020 16:24:19 +0800
Subject: [PATCH] 2020-12-01 1.请求路径修改。 2.切换住宅或者查询住宅列表增加获取网关列表。 3.房间增加默认图片选择、比例调整为16：9。4.优化图片裁剪。
---
HDL_ON/DAL/Server/HttpServerRequest.cs | 274 +++++++++++++++++++++++++++++++-----------------------
1 files changed, 156 insertions(+), 118 deletions(-)
diff --git a/HDL_ON/DAL/Server/HttpServerRequest.cs b/HDL_ON/DAL/Server/HttpServerRequest.cs
index a88d67d..d5347e1 100644
--- a/HDL_ON/DAL/Server/HttpServerRequest.cs
+++ b/HDL_ON/DAL/Server/HttpServerRequest.cs
@@ -1,9 +1,9 @@
-锘縰sing System;
+锘縰sing System;
using System.Collections.Generic;
using System.IO;
-using System.Net;
+using System.Net;
using System.Text;
-using HDL_ON.DAL.Net;
+using HDL_ON.DAL.Mqtt;
using HDL_ON.Entity;
using Newtonsoft.Json.Linq;
using Shared;
@@ -112,15 +112,15 @@
{
var requestJson = HttpUtil.GetSignRequestJson(new RefreshTokenObj()
{
- refreshToken = UserInfo.Current.refreshToken,
+ refreshToken = UserInfo.Current.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());
- UserInfo.Current.loginTokenString = revertData.headerPrefix + revertData.accessToken;
- UserInfo.Current.refreshToken = revertData.refreshToken;
- UserInfo.Current.lastTime = DateTime.Now;
+ UserInfo.Current.LoginTokenString = revertData.headerPrefix + revertData.accessToken;
+ UserInfo.Current.RefreshToken = revertData.refreshToken;
+ UserInfo.Current.LastTime = DateTime.Now;
UserInfo.Current.SaveUserInfo();
return true;
}
@@ -131,13 +131,7 @@
#region 娉ㄥ唽銆佺櫥褰曢儴鍒�
- /// <summary>
- /// 鑾峰彇璇锋眰鎻愪氦鐨勮瑷�鍙傛暟
- /// </summary>
- public string GetPostLanguageType()
- {
- return Language.CurrentLanguage == "Chinese" ? LanguageTypeEnum.CHINESE.ToString() : LanguageTypeEnum.ENGLISH.ToString();
- }
+
/// <summary>
/// 閫氱敤 鍙戦�侀獙璇佺爜鏂规硶
@@ -152,7 +146,7 @@
var requestObj = new VerifyCodeSendObj()
{
verifyType = (int)verifyType,
- languageType = GetPostLanguageType()
+ languageType = Utlis.GetPostLanguageType()
};
// 鏄惁鏄墜鏈�
if (isPhone)
@@ -293,7 +287,10 @@
UserInfo.Current.userEmailInfo = info.memberEmail;
UserInfo.Current.userMobileInfo = info.memberPhone;
UserInfo.Current.userName = info.memberName;
- UserInfo.Current.areaCode = info.memberPhonePrefix;
+ if (!string.IsNullOrEmpty(info.memberPhonePrefix))
+ {
+ UserInfo.Current.areaCode = info.memberPhonePrefix;
+ }
//鏄惁闇�瑕佽幏鍙栧ご鍍�
if (bGetHeadImage)
{
@@ -411,9 +408,7 @@
/// <returns></returns>
public string UpdataUserHeadImage(string fileName)
{
- FileStream fs = new FileStream(fileName, FileMode.Open, FileAccess.Read);
- byte[] bytes = new byte[fs.Length];
- fs.Read(bytes, 0, bytes.Length);
+ byte[] bytes = Shared.IO.FileUtils.ReadFile(fileName);
var revertObj = HttpUtil.RequestHttpsUpload(RestSharp.Method.POST, NewAPI.API_POST_Head_Upload, bytes);
return revertObj.Code;
}
@@ -463,7 +458,7 @@
/// </summary>
public string GetHomePager(HomeTypeEnum homeType = HomeTypeEnum.ALL)
{
- var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(new GetHomeListObj() { homeType = homeType.ToString() });
+ var requestJson = HttpUtil.GetSignRequestJson(new GetHomeListObj() { homeType = homeType.ToString() });
var resultObj = HttpUtil.RequestHttpsPost(NewAPI.API_POST_Gethomepager, requestJson);
if (resultObj.Code == StateCode.SUCCESS)
{
@@ -509,13 +504,16 @@
}
DB_ResidenceData.residenceData.SaveResidenceData();
UserInfo.Current.SaveUserInfo();
+
+ //鍒锋柊涓�娆′綇瀹呯綉鍏�
+ GetHomeGatewayList();
}
}
return resultObj.Code;
- //string jsonString = "{" +
+ //string jsonString = "{" +
// "\"RequestVersion\":" + "\"" + MainPage.VersionString + "\"" + "," +
// "\"RequestSource\":" + "\"" + "2" + "\"" + "," +
// "\"HomeType\":" + "\"" + "1" + "\"" + "," +
@@ -610,47 +608,48 @@
requestObj.Address = editName;
}
- var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(requestObj);
+ var requestJson = HttpUtil.GetSignRequestJson(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)
+ try
{
- var mHomeGatewayRes = Newtonsoft.Json.JsonConvert.DeserializeObject<List<HomeGatewayInfo>>(revertObj.Data.ToString());
- if (nowhomeId == DB_ResidenceData.residenceData.residecenInfo.RegionID)
+ if (string.IsNullOrEmpty(DB_ResidenceData.residenceData.residecenInfo.RegionID)) return;
+ var nowhomeId = DB_ResidenceData.residenceData.residecenInfo.RegionID;
+ var requestJson = HttpUtil.GetSignRequestJson(new HomeIdObj() { homeId = nowhomeId });
+ var revertObj = HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_GetGatewayList, requestJson);
+ if (revertObj.Code == StateCode.SUCCESS)
{
- if (mHomeGatewayRes != null)
+ var mHomeGatewayRes = Newtonsoft.Json.JsonConvert.DeserializeObject<List<HomeGatewayInfo>>(revertObj.Data.ToString());
+ if (nowhomeId == DB_ResidenceData.residenceData.residecenInfo.RegionID)
{
- if (mHomeGatewayRes.Count > 0)
+ if (mHomeGatewayRes != null)
{
- DB_ResidenceData.residenceData.residenceGatewayMAC = mHomeGatewayRes[0].mac;
+ if (mHomeGatewayRes.Count > 0)
+ {
+ DB_ResidenceData.residenceData.HomeGateway = mHomeGatewayRes[0];
+ DB_ResidenceData.residenceData.SaveResidenceData();
+ return;
+ }
}
- else
- {
- DB_ResidenceData.residenceData.residenceGatewayMAC = "";
-
- }
+ //鍏朵綑鎯呭喌娓呯┖缃戝叧淇℃伅
+ DB_ResidenceData.residenceData.HomeGateway = null;
DB_ResidenceData.residenceData.SaveResidenceData();
}
-
- if (mHomeGatewayRes != null)
- {
- //Utlis.WriteLine ("鑾峰緱褰撳墠浣忓畢缃戝叧涓暟锛�" + mHomeGatewayRes.content.Count);
- }
+ }
+ else
+ {
+ //鎻愮ず閿欒
}
}
- else
+ catch
{
- //鎻愮ず閿欒
+
}
}
@@ -660,7 +659,7 @@
/// <returns></returns>
public ResponsePackNew GetResidenceMemberAccount()
{
- var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(new HomeIdObj() { homeId = DB_ResidenceData.residenceData.residecenInfo.RegionID });
+ var requestJson = HttpUtil.GetSignRequestJson(new HomeIdObj() { homeId = DB_ResidenceData.residenceData.residecenInfo.RegionID });
return HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_Child_FindAll, requestJson);
}
@@ -675,7 +674,7 @@
childAccountId = subaccount.childAccountId,
homeId = subaccount.homeId
};
- var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(requestObj);
+ var requestJson = HttpUtil.GetSignRequestJson(requestObj);
return HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_Child_Delete, requestJson);
}
@@ -687,7 +686,7 @@
/// <returns></returns>
public ResponsePackNew EditSubAccountNickName(string nickName, string childAccountId)
{
- var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(new UpdateChildNickNameObj()
+ var requestJson = HttpUtil.GetSignRequestJson(new UpdateChildNickNameObj()
{
homeId = DB_ResidenceData.residenceData.residecenInfo.RegionID,
childAccountId = childAccountId,
@@ -704,7 +703,7 @@
/// <returns></returns>
public ResponsePackNew ChangeCreateSceneState(bool isAllow, string childAccountId)
{
- var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(new UpdateChildAllowCreateSceneObj()
+ var requestJson = HttpUtil.GetSignRequestJson(new UpdateChildAllowCreateSceneObj()
{
homeId = DB_ResidenceData.residenceData.residecenInfo.RegionID,
childAccountId = childAccountId,
@@ -712,6 +711,44 @@
});
return HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_Child_Update, requestJson);
}
+
+ #region 鏂版暟鎹垎浜�
+ /// <summary>
+ /// 娣诲姞鍒嗕韩
+ /// </summary>
+ /// <param name="addShareObj"></param>
+ /// <returns></returns>
+ public ResponsePackNew AddShare(AddShareObj addShareObj)
+ {
+ var requestJson = HttpUtil.GetSignRequestJson(addShareObj);
+
+ return HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_Share_Add, requestJson);
+ }
+
+ /// <summary>
+ /// 鍒犻櫎鍒嗕韩
+ /// </summary>
+ /// <param name="deleteShareObj"></param>
+ /// <returns></returns>
+ public ResponsePackNew DeleteShare(DeleteShareObj deleteShareObj)
+ {
+ var requestJson = HttpUtil.GetSignRequestJson(deleteShareObj);
+
+ return HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_Share_Delete, requestJson);
+ }
+
+ /// <summary>
+ /// 鑾峰彇鍒嗕韩
+ /// </summary>
+ /// <param name="addShareObj"></param>
+ /// <returns></returns>
+ public ResponsePackNew GetShare(GetShareObj getShareObj)
+ {
+ var requestJson = HttpUtil.GetSignRequestJson(getShareObj);
+
+ return HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_Share_Delete, requestJson);
+ }
+ #endregion
/// <summary>
/// 鑾峰彇浣忓畢涓嬪瓙璐﹀彿鐨勫叡浜暟鎹垪琛�
@@ -725,7 +762,7 @@
//string jsonString = Newtonsoft.Json.JsonConvert.SerializeObject(d);
//return RequestHttps($"{severAddress}/ZigbeeDataShare/GetShareDataBySubAccount", jsonString, true);
- var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(new HomeShareFindAll()
+ var requestJson = HttpUtil.GetSignRequestJson(new HomeShareFindAll()
{
homeId = DB_ResidenceData.residenceData.residecenInfo.RegionID,
childAccountId = childAccountId
@@ -810,7 +847,7 @@
/// <returns></returns>
public ResponsePackNew DeleteShareData(ShareData shareData)
{
- var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(new ShareFileDownObj()
+ var requestJson = HttpUtil.GetSignRequestJson(new ShareFileDownObj()
{
homeId = shareData.homeId,
homeShareId = shareData.id
@@ -845,7 +882,7 @@
{
//娣诲姞瀛愯处鍙�
var requestObj = new ChildAddObj() { homeId = DB_ResidenceData.residenceData.residecenInfo.RegionID, account = subAccount, nickName = nickName };
- var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(requestObj);
+ var requestJson = HttpUtil.GetSignRequestJson(requestObj);
return HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_Child_Add, requestJson);
}
@@ -892,7 +929,7 @@
{
try
{
- var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(new GetMqttRemoteInfoObj()
+ var requestJson = HttpUtil.GetSignRequestJson(new GetMqttRemoteInfoObj()
{
attachClientId = attachClientId,
homeType = HomeTypeEnum.BUSPRO.ToString()
@@ -926,13 +963,16 @@
#if __IOS__
deviceType = PhoneDeviceType.IOS.ToString();
#endif
- //鏄惁鐢熸垚妯″紡
+ //鏄惁鐢熶骇妯″紡
bool isProduce = true;
#if DEBUG
isProduce = false;
#endif
- if (string.IsNullOrEmpty(OnAppConfig.Instance.PushDeviceToken)) return false;
+ if (string.IsNullOrEmpty(OnAppConfig.Instance.PushDeviceToken)) {
+ Utlis.WriteLine("PushDeviceToken 涓虹┖");
+ return false;
+ }
var mAddpushinfoObj = new AddpushinfoObj()
{
@@ -940,9 +980,10 @@
deviceName = OnAppConfig.Instance.PhoneName,
deviceType = deviceType,
produce = isProduce,
-
};
+
var mAddpushinfoJson = Newtonsoft.Json.JsonConvert.SerializeObject(mAddpushinfoObj);
+ //var mAddpushinfoJson = HttpUtil.GetSignRequestJson(mAddpushinfoObj);
var revertObj = HttpUtil.RequestHttpsPost(NewAPI.API_POST_PushSerivce_AddToken, mAddpushinfoJson);
if (revertObj.Code == StateCode.SUCCESS)
{
@@ -953,14 +994,15 @@
{
OnAppConfig.Instance.PushId = pushId;
OnAppConfig.Instance.SaveUserConfig();
+
return true;
}
}
- Utlis.WriteLine("AddToken 鎴愬姛");
+
}
else
{
- Utlis.WriteLine("AddToken 澶辫触");
+ //Utlis.WriteLine("AddToken 澶辫触");
}
return false;
}
@@ -970,13 +1012,14 @@
}
}
+
/// <summary>
/// 鏌ヨ鎺ㄩ�佷俊鎭垪琛�
/// </summary>
/// <returns></returns>
- public ResponsePackNew PushSerivceGetpushmessagelist()
+ public ResponsePackNew PushSerivceGetPushmessagelist()
{
- var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(new GetMessageListObj()
+ var requestJson = HttpUtil.GetSignRequestJson(new GetMessageListObj()
{
pushId = OnAppConfig.Instance.PushId
});
@@ -991,7 +1034,7 @@
{
if (string.IsNullOrEmpty(OnAppConfig.Instance.PushId)) return false;
- var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(new PushIdObj()
+ var requestJson = HttpUtil.GetSignRequestJson(new PushIdObj()
{
pushId = OnAppConfig.Instance.PushId
});
@@ -1017,7 +1060,7 @@
if (string.IsNullOrEmpty(OnAppConfig.Instance.PushId)) return false;
try
{
- var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(new PushIdObj() {
+ var requestJson = HttpUtil.GetSignRequestJson(new PushIdObj() {
pushId = OnAppConfig.Instance.PushId
});
@@ -1049,7 +1092,7 @@
try
{
- var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(new PushIdObj()
+ var requestJson = HttpUtil.GetSignRequestJson(new PushIdObj()
{
pushId = OnAppConfig.Instance.PushId
});
@@ -1081,7 +1124,7 @@
try
{
- var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(new PushMsgIdObj()
+ var requestJson = HttpUtil.GetSignRequestJson(new PushMsgIdObj()
{
msgId = msgId
});
@@ -1114,7 +1157,7 @@
try
{
- var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(new PushMsgIdObj()
+ var requestJson = HttpUtil.GetSignRequestJson(new PushMsgIdObj()
{
msgId = msgId
});
@@ -1135,6 +1178,47 @@
return false;
}
}
+
+ /// <summary>
+ /// 娉ㄥ唽鎺ㄩ��
+ /// </summary>
+ public void RegisteredPush()
+ {
+ new System.Threading.Thread(() =>
+ {
+ var success = PushSerivceAddPushInfo();
+ if (success)
+ {
+ Utlis.WriteLine("鎺ㄩ�佹敞鍐屾垚鍔�");
+ }
+ else
+ {
+ Utlis.WriteLine("鎺ㄩ�佹敞鍐屽け璐�");
+ }
+ })
+ { IsBackground = true }.Start();
+ }
+
+ /// <summary>
+ /// 娉ㄩ攢鎺ㄩ��
+ /// </summary>
+ public void SignOutPush()
+ {
+ new System.Threading.Thread(() =>
+ {
+ var success = PushSerivceSignOut();
+ if (success)
+ {
+ Utlis.WriteLine("鎺ㄩ�佹敞閿�鎴愬姛");
+ }
+ else
+ {
+ Utlis.WriteLine("鎺ㄩ�佹敞閿�澶辫触");
+ }
+ })
+ { IsBackground = true }.Start();
+ }
+
#endregion
#region 妫�娴嬫洿鏂�
@@ -1146,12 +1230,12 @@
{
var requestObj = new ForceUpdateObj()
{
-
+ LanguageType = Utlis.GetPostLanguageType()
};
-#if Android
- requestObj.DeviceType = 1;
+#if __IOS__
+ requestObj.DeviceType = PhoneDeviceType.IOS.ToString();
#endif
- var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(requestObj);
+ var requestJson = HttpUtil.GetSignRequestJson(requestObj);
return HttpUtil.RequestHttpsPost(NewAPI.API_POST_CheckAppVersion, requestJson);
}
@@ -1165,10 +1249,10 @@
{
};
-#if Android
- requestObj.DeviceType = 1;
+#if __IOS__
+ requestObj.DeviceType = PhoneDeviceType.IOS.ToString();
#endif
- var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(requestObj);
+ var requestJson = HttpUtil.GetSignRequestJson(requestObj);
return HttpUtil.RequestHttpsPost(NewAPI.API_POST_GetAppVersion, requestJson);
}
@@ -1241,52 +1325,6 @@
#endregion
- #region mqtt杩滅▼杩炴帴锛堟棫锛�
- /// <summary>
- /// 璇锋眰Mqtt鏁版嵁
- /// </summary>
- /// <param name="dataStringJson">璇锋眰鐨勫弬鏁�.</param>
- public ResponsePack RequestMqttInfo(string dataStringJson)
- {
- ResponsePack revertObj = null;
-
- var webClient = new WebClient();
- #region
- webClient.Headers.Add("CONTENT-TYPE", "application/json");
- var url = "https://global.hdlcontrol.com/ProposedProductionApi/EmqMqtt/GetConnMqttInfo";
-
- byte[] bytes = null;
- try
- {
- bytes = webClient.UploadData(url, Encoding.UTF8.GetBytes(dataStringJson));
- }
- catch (Exception ex)
- {
- Console.WriteLine(ex.Message);
- revertObj = new ResponsePack() { StateCode = "Net_Error" };
- }
-
- string responseString = null;
- if (bytes != null)
- {
- responseString = Encoding.UTF8.GetString(bytes);
- }
-
- if (responseString != null)
- {
- try
- {
- revertObj = Newtonsoft.Json.JsonConvert.DeserializeObject<ResponsePack>(responseString);
- }
- catch (Exception ex)
- {
- Console.WriteLine(ex.ToString());
- }
- }
- return revertObj;
- #endregion
- }
- #endregion
#region 澶囦唤閮ㄥ垎
///// <summary>
--
Gitblit v1.8.0