From e75ccccb370b47305c6eadb321efb27c86cdd28b Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 30 十一月 2021 09:57:24 +0800
Subject: [PATCH] 合并
---
HDL_ON/DAL/Server/HttpServerRequest.cs | 128 +++++++++++++++++++++++++++---------------
1 files changed, 83 insertions(+), 45 deletions(-)
diff --git a/HDL_ON/DAL/Server/HttpServerRequest.cs b/HDL_ON/DAL/Server/HttpServerRequest.cs
index 8f2d089..2414895 100644
--- a/HDL_ON/DAL/Server/HttpServerRequest.cs
+++ b/HDL_ON/DAL/Server/HttpServerRequest.cs
@@ -45,13 +45,13 @@
/// <param name="deviceId">璁惧ID</param>
/// <param name="deviceKey">鍔熻兘鏌ヨ绫诲瀷锛歱m25</param>
/// <returns></returns>
- public ResponsePackNew GetSensorHistory(string qType, string deviceId,string deviceKey)
+ public ResponsePackNew GetSensorHistory(string qType, string deviceId, string deviceKey)
{
Dictionary<string, object> d = new Dictionary<string, object>();
d.Add("type", qType);
d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
- d.Add("deviceId", deviceId );
- d.Add("key", deviceKey );
+ d.Add("deviceId", deviceId);
+ d.Add("key", deviceKey);
var requestJson = HttpUtil.GetSignRequestJson(d);
return HttpUtil.RequestHttpsPost(NewAPI.Api_Post_EnvironmentalSensorHistoricalData, requestJson);
@@ -63,7 +63,7 @@
/// <param name="pageSize">椤甸潰澶у皬</param>
/// <param name="pageNo">椤靛彿</param>
/// <returns></returns>
- public ResponsePackNew GetArmSensorHistory( string deviceId,string pageSize, string pageNo)
+ public ResponsePackNew GetArmSensorHistory(string deviceId, string pageSize, string pageNo)
{
Dictionary<string, object> d = new Dictionary<string, object>();
d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
@@ -78,7 +78,7 @@
/// 璇诲彇鏈�杩戜竴涓湀鐨勬暟鎹�
/// </summary>
/// <returns></returns>
- public ResponsePackNew GetLastMonthHistory(string deviceId,string key)
+ public ResponsePackNew GetLastMonthHistory(string deviceId, string key)
{
Dictionary<string, object> d = new Dictionary<string, object>();
d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
@@ -146,6 +146,12 @@
UserInfo.Current.RefreshToken = revertData.refreshToken;
UserInfo.Current.LastTime = DateTime.Now;
UserInfo.Current.SaveUserInfo();
+
+#if __IOS__
+ var sdm = new SiriKit.SceneDateManager();
+ sdm.AccessToken = UserInfo.Current.LoginTokenString;
+ sdm.RefreshToken = UserInfo.Current.RefreshToken;
+#endif
}
return revertObj.Code;
}
@@ -234,7 +240,19 @@
account = account,
loginPwd = password
});
- return HttpUtil.RequestHttpsPost(NewAPI.API_POST_Login, requestJson);
+ var pack = HttpUtil.RequestHttpsPost(NewAPI.API_POST_Login, requestJson);
+ if (pack != null)
+ {
+ if (pack.Code == StateCode.SUCCESS)
+ {
+
+#if __IOS__
+ var sdm = new SiriKit.SceneDateManager();
+ sdm.IsLgoin = true;
+#endif
+ }
+ }
+ return pack;
}
/// <summary>
@@ -251,7 +269,19 @@
verifyCode = vCode,
grantType = "verify"
});
- return HttpUtil.RequestHttpsPost(NewAPI.API_POST_Login, requestJson);
+ var pack = HttpUtil.RequestHttpsPost(NewAPI.API_POST_Login, requestJson);
+ if (pack != null)
+ {
+ if (pack.Code == StateCode.SUCCESS)
+ {
+
+#if __IOS__
+ var sdm = new SiriKit.SceneDateManager();
+ sdm.IsLgoin = true;
+#endif
+ }
+ }
+ return pack;
}
/// <summary>
@@ -264,7 +294,7 @@
/// <returns></returns>
public ResponsePackNew ValidataCodeAndRegister(string account, string password, string code, bool isPhone = false)
{
- var requestObj = new RegisterObj() { loginPwd = password, verifyCode = code};//, memberName = account
+ var requestObj = new RegisterObj() { loginPwd = password, verifyCode = code };//, memberName = account
if (isPhone)
{
requestObj.memberPhone = account;
@@ -345,7 +375,7 @@
UserInfo.Current.userEmailInfo = info.memberEmail;
UserInfo.Current.userMobileInfo = info.memberPhone;
UserInfo.Current.userName = info.memberName;
-
+
if (!string.IsNullOrEmpty(info.memberPhonePrefix))
{
UserInfo.Current.areaCode = info.memberPhonePrefix;
@@ -482,7 +512,7 @@
/// <summary>
/// 鑾峰彇浣忓畢鍒楄〃
/// </summary>
- public string GetHomePager(HomeTypeEnum homeType = HomeTypeEnum.ALL,string homeId = "")
+ public string GetHomePager(HomeTypeEnum homeType = HomeTypeEnum.ALL, string homeId = "")
{
var requestJson = HttpUtil.GetSignRequestJson(new GetHomeListObj() { homeType = homeType.ToString() });
var resultObj = HttpUtil.RequestHttpsPost(NewAPI.API_POST_Gethomepager, requestJson);
@@ -510,7 +540,7 @@
}
}
}
- if(UserInfo.Current.regionList.Count== 0)
+ if (UserInfo.Current.regionList.Count == 0)
{
return "null";
}
@@ -553,6 +583,12 @@
GetHomeGatewayList();
}
}
+
+#if __IOS__
+ var sdm = new SiriKit.SceneDateManager();
+ sdm.RegionUrl = DB_ResidenceData.Instance.CurrentRegion.regionUrl;
+ sdm.HomeId = DB_ResidenceData.Instance.CurrentRegion.id;
+#endif
}
}
@@ -785,7 +821,7 @@
return HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_Share_GetList, requestJson);
}
-
+
#endregion
///// <summary>
@@ -934,7 +970,7 @@
Dictionary<string, object> d = new Dictionary<string, object>();
d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
d.Add("debugPerm", debugPerm);
- var jsonString = HttpUtil.GetSignRequestJson(d,d);
+ var jsonString = HttpUtil.GetSignRequestJson(d, d);
var pack = HttpUtil.RequestHttpsPost(NewAPI.API_Post_Home_UpdateDebugPerm, jsonString);
return pack;
}
@@ -993,7 +1029,8 @@
isProduce = false;
#endif
- if (string.IsNullOrEmpty(OnAppConfig.Instance.PushDeviceToken)) {
+ if (string.IsNullOrEmpty(OnAppConfig.Instance.PushDeviceToken))
+ {
Utlis.WriteLine("PushDeviceToken 涓虹┖");
return false;
}
@@ -1004,7 +1041,7 @@
deviceName = OnAppConfig.Instance.PhoneName,
deviceType = deviceType,
produce = isProduce,
-
+
};
mAddpushinfoObj.languageType = Utlis.GetPostLanguageType();
@@ -1027,11 +1064,11 @@
OnAppConfig.Instance.PushId = pushId;
OnAppConfig.Instance.SaveConfig();
Utlis.WriteLine("PushId: " + pushId);
-
+
return true;
}
}
-
+
}
else
{
@@ -1115,10 +1152,11 @@
if (string.IsNullOrEmpty(OnAppConfig.Instance.PushId)) return false;
try
{
- var requestJson = HttpUtil.GetSignRequestJson(new PushIdObj() {
+ var requestJson = HttpUtil.GetSignRequestJson(new PushIdObj()
+ {
pushId = OnAppConfig.Instance.PushId
});
-
+
var revertObj = HttpUtil.RequestHttpsPost(NewAPI.API_POST_PushSerivce_DeleteToken, requestJson);
if (revertObj.Code == StateCode.SUCCESS)
{
@@ -1303,9 +1341,9 @@
-#endregion
+ #endregion
-#region 鑾峰彇澶╂皵閮ㄥ垎
+ #region 鑾峰彇澶╂皵閮ㄥ垎
/// <summary>
/// 鑾峰彇鎸囧畾缁忕含搴︾殑鍩庡競淇℃伅澶╂皵淇℃伅
/// </summary>
@@ -1426,10 +1464,10 @@
//}
-#endregion
+ #endregion
-#region 澶囦唤閮ㄥ垎
+ #region 澶囦唤閮ㄥ垎
///// <summary>
///// 鑾峰彇浣忓畢澶囦唤鍒楄〃
///// </summary>
@@ -1900,10 +1938,10 @@
}
*/
-#endregion
+ #endregion
-#region Kaede --璁惧鍔熻兘鈥斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺��
+ #region Kaede --璁惧鍔熻兘鈥斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺��
/// <summary>
/// 鑾峰彇璁惧鍒楄〃
/// </summary>
@@ -1947,14 +1985,14 @@
/// <param name="productPlatform"></param>
/// <param name="productBrand"></param>
/// <returns></returns>
- public ResponsePackNew Get3TyBrandDeviceList(string productPlatform,string productBrand)
+ public ResponsePackNew Get3TyBrandDeviceList(string productPlatform, string productBrand)
{
Dictionary<string, object> d = new Dictionary<string, object>();
d.Add("categoryType", 1);
d.Add("productPlatform", productPlatform);
d.Add("productBrand", productBrand);
d.Add("networkConfig", true);
-
+
var requestJson = HttpUtil.GetSignRequestJson(d);
return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_Get3tyBrandDevcieList, requestJson);
}
@@ -1964,7 +2002,7 @@
/// <param name="productPlatform"></param>
/// <param name="productBrand"></param>
/// <returns></returns>
- public ResponsePackNew IndependentRegister3TyDevcie(string spk,string extDevId,string deviceName,string pairCode = "")
+ public ResponsePackNew IndependentRegister3TyDevcie(string spk, string extDevId, string deviceName, string pairCode = "")
{
Dictionary<string, object> d = new Dictionary<string, object>();
d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
@@ -2074,7 +2112,7 @@
/// <summary>
/// 璁惧缁戝畾鎴块棿
/// </summary>
- public ResponsePackNew BindDeviceToRoom(List<string> deviceIds,List<string> roomIds)
+ public ResponsePackNew BindDeviceToRoom(List<string> deviceIds, List<string> roomIds)
{
Dictionary<string, object> d = new Dictionary<string, object>();
d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
@@ -2117,7 +2155,7 @@
{
Dictionary<string, object> d = new Dictionary<string, object>();
d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
- d.Add("deviceIds",new List<string>() { deviceId });
+ d.Add("deviceIds", new List<string>() { deviceId });
var requestJson = HttpUtil.GetSignRequestJson(d);
return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_CollectDevice, requestJson);
@@ -2135,9 +2173,9 @@
return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_CancelCollectDevice, requestJson);
}
-#endregion
+ #endregion
-#region Kaede --鍦烘櫙鍔熻兘--------------------------
+ #region Kaede --鍦烘櫙鍔熻兘--------------------------
/// <summary>
/// 鑾峰彇鍦烘櫙鍒楄〃
/// 鎴块棿ID鍙┖锛岄粯璁ゆ煡璇綇瀹呬笅鎵�鏈夋埧闂�
@@ -2164,7 +2202,7 @@
public ResponsePackNew GetSceneInfo(string seceneId)
{
Dictionary<string, object> d = new Dictionary<string, object>();
- d.Add("userSceneIds",new List<string>() { seceneId });
+ d.Add("userSceneIds", new List<string>() { seceneId });
var requestJson = HttpUtil.GetSignRequestJson(d);
return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_GetSecneInfo, requestJson);
@@ -2269,9 +2307,9 @@
var requestJson = HttpUtil.GetSignRequestJson(d);
return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_CancelCollectScene, requestJson).Code;
}
-#endregion
+ #endregion
-#region Kaede --鎴块棿鍔熻兘--------------------------
+ #region Kaede --鎴块棿鍔熻兘--------------------------
/// <summary>
/// 鑾峰彇鎴块棿鍒楄〃
/// </summary>
@@ -2288,7 +2326,7 @@
d.Add("pageSize", "1000");
var requestJson = HttpUtil.GetSignRequestJson(d);
var pack = HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_GetRoomList, requestJson);
-
+
return pack;
}
/// <summary>
@@ -2346,10 +2384,10 @@
return pack;
}
-#endregion
+ #endregion
-#region Kaede -- 瀹夐槻鎺ュ彛____________________________
+ #region Kaede -- 瀹夐槻鎺ュ彛____________________________
/// <summary>
/// 鑾峰彇瀹夐槻鍒楄〃
/// </summary>
@@ -2489,7 +2527,7 @@
/// <summary>
/// 鏌ヨ瀹夐槻鎵�鏈夎褰�
/// </summary>
- public ResponsePackNew GetSecurityLogList(string pageSize,string pageNo)
+ public ResponsePackNew GetSecurityLogList(string pageSize, string pageNo)
{
Dictionary<string, object> d = new Dictionary<string, object>();
d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
@@ -2513,10 +2551,10 @@
return pack;
}
-#endregion
+ #endregion
-#region Kaede --绗笁鏂瑰搧鐗屽姛鑳�--------------------------
+ #region Kaede --绗笁鏂瑰搧鐗屽姛鑳�--------------------------
/// <summary>
/// 鑾峰彇绗笁鏂瑰搧鐗屽垪琛�
/// </summary>
@@ -2541,9 +2579,9 @@
return pack;
}
-#endregion
+ #endregion
-#region 鈻� 钀ょ煶浜慡DK鐩稿叧鎺ュ彛_________________________
+ #region 鈻� 钀ょ煶浜慡DK鐩稿叧鎺ュ彛_________________________
/// <summary>
/// 娌充笢鑾峰彇钀ょ煶浜戝瓙璐﹀彿token鐨勬帴鍙�
/// 2021-07-07 鏂版柟妗堟帴鍙ｈ皟鏁村鎺�
@@ -2569,7 +2607,7 @@
Dictionary<string, object> d = new Dictionary<string, object>();
d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
var requestJson = HttpUtil.GetSignRequestJson(d);
- var pack = HttpUtil.RequestHttpsPostFroHome( NewAPI.API_POST_FL_Check, requestJson);
+ var pack = HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_FL_Check, requestJson);
return pack;
}
#endregion
@@ -2731,7 +2769,7 @@
public ResponsePackNew FaceSetting(string imageBytes)
{
Dictionary<string, object> d = new Dictionary<string, object>();
- d.Add("userFace", @"data:image/jpg;base64,"+imageBytes);
+ d.Add("userFace", @"data:image/jpg;base64," + imageBytes);
d.Add("houseId", DB_ResidenceData.Instance.CurrentRegion.id);
//MainPage.Log(imageBytes);
--
Gitblit v1.8.0