From e322d91c7325019710bfdb046c5fea673031455a Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 29 七月 2020 11:53:01 +0800
Subject: [PATCH] 20200729
---
HDL_ON/DAL/Server/HttpServerRequest.cs | 53 +++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 39 insertions(+), 14 deletions(-)
diff --git a/HDL_ON/DAL/Server/HttpServerRequest.cs b/HDL_ON/DAL/Server/HttpServerRequest.cs
index 5a3edf9..71b3b30 100644
--- a/HDL_ON/DAL/Server/HttpServerRequest.cs
+++ b/HDL_ON/DAL/Server/HttpServerRequest.cs
@@ -45,6 +45,35 @@
#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)
{
string result = "";
@@ -245,21 +274,17 @@
try
{
var headImageString = dataStr.GetValue("HeadImage").ToString();
- var jsonString = Newtonsoft.Json.JsonConvert.SerializeObject(headImageString);
- var headImageBytes = Newtonsoft.Json.JsonConvert.DeserializeObject<byte[]>(jsonString);
- MainPage.LoginUser.headImagePageBytes = headImageBytes;
- var filePath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.Personal) + "/", "headImage.png");
-
-#if DEBUG
- Application.RunOnMainThread(() =>
+ if (!string.IsNullOrEmpty(headImageString))
{
- 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();
- MainPage.LoginUser.headImagePagePath = filePath;
+ var jsonString = Newtonsoft.Json.JsonConvert.SerializeObject(headImageString);
+ var headImageBytes = Newtonsoft.Json.JsonConvert.DeserializeObject<byte[]>(jsonString);
+ MainPage.LoginUser.headImagePageBytes = headImageBytes;
+ var filePath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.Personal) + "/", "headImage.png");
+ fs = new FileStream(filePath, FileMode.Create, FileAccess.Write);
+ fs.Write(headImageBytes, 0, headImageBytes.Length);
+ fs.Flush();
+ MainPage.LoginUser.headImagePagePath = filePath;
+ }
} catch (Exception ex)
{
MainPage.Log($"download headImage error : {ex.Message}");
--
Gitblit v1.8.0