From 8060dedbec31cc9dbc33adae91b94b8a977c7163 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期一, 30 十一月 2020 21:22:55 +0800
Subject: [PATCH] 2020-11-30 1.增加极光推送。2.住宅相关接口增加签名校验。 3.增加消息中心页面。4.UI优化。5.裁剪选取图片优化。
---
HDL_ON/DAL/Server/HttpServerRequest.cs | 151 +++++++++++++++++++++++++-------------------------
1 files changed, 76 insertions(+), 75 deletions(-)
diff --git a/HDL_ON/DAL/Server/HttpServerRequest.cs b/HDL_ON/DAL/Server/HttpServerRequest.cs
index 6050b4a..421b8e7 100644
--- a/HDL_ON/DAL/Server/HttpServerRequest.cs
+++ b/HDL_ON/DAL/Server/HttpServerRequest.cs
@@ -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;
}
@@ -460,7 +460,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)
{
@@ -607,7 +607,7 @@
requestObj.Address = editName;
}
- var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(requestObj);
+ var requestJson = HttpUtil.GetSignRequestJson(requestObj);
return HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_Home_UpdateHome, requestJson);
}
@@ -618,7 +618,7 @@
{
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 requestJson = HttpUtil.GetSignRequestJson(new HomeIdObj() { homeId = nowhomeId });
var revertObj = HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_GetGatewayList, requestJson);
if (revertObj.Code == StateCode.SUCCESS)
{
@@ -657,7 +657,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);
}
@@ -672,7 +672,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);
}
@@ -684,7 +684,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,
@@ -701,7 +701,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,
@@ -722,7 +722,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
@@ -807,7 +807,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
@@ -842,7 +842,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);
}
@@ -889,7 +889,7 @@
{
try
{
- var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(new GetMqttRemoteInfoObj()
+ var requestJson = HttpUtil.GetSignRequestJson(new GetMqttRemoteInfoObj()
{
attachClientId = attachClientId,
homeType = HomeTypeEnum.BUSPRO.ToString()
@@ -923,13 +923,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()
{
@@ -937,9 +940,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)
{
@@ -950,14 +954,15 @@
{
OnAppConfig.Instance.PushId = pushId;
OnAppConfig.Instance.SaveUserConfig();
+
return true;
}
}
- Utlis.WriteLine("AddToken 鎴愬姛");
+
}
else
{
- Utlis.WriteLine("AddToken 澶辫触");
+ //Utlis.WriteLine("AddToken 澶辫触");
}
return false;
}
@@ -967,13 +972,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
});
@@ -988,7 +994,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
});
@@ -1014,7 +1020,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
});
@@ -1046,7 +1052,7 @@
try
{
- var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(new PushIdObj()
+ var requestJson = HttpUtil.GetSignRequestJson(new PushIdObj()
{
pushId = OnAppConfig.Instance.PushId
});
@@ -1078,7 +1084,7 @@
try
{
- var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(new PushMsgIdObj()
+ var requestJson = HttpUtil.GetSignRequestJson(new PushMsgIdObj()
{
msgId = msgId
});
@@ -1111,7 +1117,7 @@
try
{
- var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(new PushMsgIdObj()
+ var requestJson = HttpUtil.GetSignRequestJson(new PushMsgIdObj()
{
msgId = msgId
});
@@ -1132,6 +1138,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 妫�娴嬫洿鏂�
@@ -1148,7 +1195,7 @@
#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,7 +1212,7 @@
#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);
}
@@ -1238,52 +1285,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