From 611786df5108dca0bdcff03834cc285cba4b8e61 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期二, 13 十月 2020 16:48:43 +0800
Subject: [PATCH] 2020-10-13-1
---
HDL_ON/DAL/Server/HttpServerRequest.cs | 144 +++++++++++++++++++++++++++++++++++++++---------
1 files changed, 117 insertions(+), 27 deletions(-)
diff --git a/HDL_ON/DAL/Server/HttpServerRequest.cs b/HDL_ON/DAL/Server/HttpServerRequest.cs
index 6aa9bad..71b3b30 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);
@@ -247,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}");
@@ -320,6 +343,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
#region 浣忓畢閮ㄥ垎
@@ -346,6 +381,31 @@
}
else
{
+ //{
+ // {
+ // "Id": "1107487",
+ // "HomeStatus": 2,
+ // "UserGuid": "22980",
+ // "Name": "鍟�",
+ // "Address": null,
+ // "Longitude": 0.0,
+ // "Latitude": 0.0,
+ // "RegionName": null,
+ // "Company": null,
+ // "ContactPerson": null,
+ // "ContactPersonPhone": null,
+ // "Remarks": null,
+ // "ChangeDate": null,
+ // "AccountType": 0,
+ // "CreatedOnUtc": "2020-05-27T06:52:03",
+ // "IsOthreShare": false,
+ // "MainUserDistributedMark": null,
+ // "HomeGateways": [
+ // {
+ // "GatewayUniqueId": "4E47323347591243"
+ // }
+ // ]
+ //}}
MainPage.LoginUser.regionList = new List<RegionInfoRes>();
foreach (var jsonData in dataStr.GetValue("PageData"))
{
@@ -356,16 +416,19 @@
RegionName = homeJsonStr.GetValue("RegionName").ToString(),
Name = homeJsonStr.GetValue("Name").ToString(),
Address = homeJsonStr.GetValue("Address").ToString(),
+ IsOthreShare = (bool)homeJsonStr.GetValue("IsOthreShare"),
};
MainPage.LoginUser.regionList.Add(home);
+ if (string.IsNullOrEmpty(DB_ResidenceData.residenceData.CurReginID))
+ {
+ DB_ResidenceData.residenceData.CurReginID = MainPage.LoginUser.regionList[0].RegionID;
+ }
}
DB_ResidenceData.residenceData.SaveResidenceData();
MainPage.LoginUser.SaveUserInfo();
}
}
return responsePack.StateCode;
-
-
}
/// <summary>
/// 缂栬緫浣忓畢淇℃伅
@@ -502,6 +565,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>
@@ -573,9 +662,11 @@
responseString = Encoding.UTF8.GetString(webClient.DownloadData(url));
revertObj = Newtonsoft.Json.JsonConvert.DeserializeObject<ResponsePack>(responseString);
jt = Newtonsoft.Json.JsonConvert.DeserializeObject<JObject>(revertObj.ResponseData.ToString());
- MainPage.cityInfo.temperature = jt.GetValue("Temperature").ToString()+ "掳";
- MainPage.cityInfo.humidity = jt.GetValue("Humidity").ToString()+"%";
+ MainPage.cityInfo.temperature = jt.GetValue("Temperature").ToString();
+ MainPage.cityInfo.humidity = jt.GetValue("Humidity").ToString();
MainPage.cityInfo.pm25 = jt.GetValue("Air_Quality").ToString();
+ MainPage.cityInfo.windLevel = jt.GetValue("WindLevel").ToString();
+ MainPage.cityInfo.weather = jt.GetValue("Weather").ToString();
break;
}
catch (Exception ex)
@@ -596,7 +687,6 @@
}
#endregion
-
#region 澶囦唤閮ㄥ垎
/// <summary>
--
Gitblit v1.8.0