From 5de5a26d3825b3182a7d3a18ed1cbdbb78a3f9aa Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 23 七月 2020 16:39:59 +0800
Subject: [PATCH] 2020-07-23
---
HDL_ON/DAL/Server/HttpServerRequest.cs | 88 ++++++++++++++++++++++++++++++++++++-------
1 files changed, 73 insertions(+), 15 deletions(-)
diff --git a/HDL_ON/DAL/Server/HttpServerRequest.cs b/HDL_ON/DAL/Server/HttpServerRequest.cs
index 56e8cd5..b58ed71 100644
--- a/HDL_ON/DAL/Server/HttpServerRequest.cs
+++ b/HDL_ON/DAL/Server/HttpServerRequest.cs
@@ -38,11 +38,40 @@
public HttpServerRequest()
{
-#if DEBUG
+#if DEBUG1
severAddress = debugSever;
#else
severAddress = relaseaSever;
#endif
+ }
+
+ /// <summary>
+ /// 鑾峰彇浼犳劅鍣ㄥ巻鍙叉暟鎹�
+ /// </summary>
+ /// <param name="subnetId"></param>
+ /// <param name="deviceId"></param>
+ /// <param name="bigClass"></param>
+ /// <param name="minClass"></param>
+ /// <param name="queryType"></param>
+ /// <param name="loopId"></param>
+ /// <param name="nowMonth"></param>
+ /// <param name="mac"></param>
+ /// <returns></returns>
+ public ResponsePack GetSensorHistory(int subnetId,int deviceId,int bigClass,int minClass,int queryType,int loopId,int nowMonth,string mac)
+ {
+ Dictionary<string, object> d = new Dictionary<string, object>();
+ d.Add("SubnetID", subnetId);
+ d.Add("DeviceID", deviceId);
+ d.Add("LargeType", bigClass);
+ d.Add("SmallType", minClass);
+ d.Add("QueryType", queryType);
+ d.Add("loopId", loopId);
+ d.Add("NowMonth", nowMonth);
+ d.Add("MAC", DB_ResidenceData.residenceData.residenceGatewayMAC);
+ d.Add("LocalTimeZone", 8);
+ var jsonString = Newtonsoft.Json.JsonConvert.SerializeObject(d);
+ return RequestHttps("https://developer.hdlcontrol.com/api/GetSensorPushHistory", jsonString,true);
+
}
public string GetRequestResultMsg(string resultCode)
@@ -68,7 +97,6 @@
}
return result;
}
-
#region 娉ㄥ唽銆佺櫥褰曢儴鍒�
@@ -138,7 +166,7 @@
"\"Account\":" + "\"" + account + "\"" + "," +
"\"Password\":" + "\"" + password + "\"" + "," +
"\"EnterPassword\":" + "\"" + entryPassword + "\"" + "," +
- "\"Language\":" + "\"" + MainPage.LoginUser.language.ToLower() + "\"" + "," +
+ "\"Language\":" + "\"" + Language.CurrentLanguage.ToLower() + "\"" + "," +
"\"Code\":" + "\"" + code + "\"" + "," +
"\"RegisterSoruce\":" + 0 + "," +
"\"AreaCode\":" + areaCode +
@@ -150,12 +178,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 +196,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);
@@ -252,12 +279,6 @@
MainPage.LoginUser.headImagePageBytes = headImageBytes;
var filePath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.Personal) + "/", "headImage.png");
-#if DEBUG
- Application.RunOnMainThread(() =>
- {
- new Tip() { CloseTime = 5, Text = filePath }.Show(MainPage.BasePageView);
- });
-#endif
fs = new FileStream(filePath, FileMode.Create, FileAccess.Write);
fs.Write(headImageBytes, 0, headImageBytes.Length);
fs.Flush();
@@ -319,6 +340,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
@@ -530,6 +563,32 @@
}
/// <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>
@@ -626,7 +685,6 @@
}
#endregion
-
#region 澶囦唤閮ㄥ垎
/// <summary>
--
Gitblit v1.8.0