From 2bec9c838d2d688025698de8ec1de401ffd7dd1f Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 11 八月 2020 14:13:55 +0800
Subject: [PATCH] 20200811
---
HDL_ON/DAL/Server/HttpServerRequest.cs | 329 +++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 272 insertions(+), 57 deletions(-)
diff --git a/HDL_ON/DAL/Server/HttpServerRequest.cs b/HDL_ON/DAL/Server/HttpServerRequest.cs
index d7c2587..c297ae7 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>
/// 缂栬緫浣忓畢淇℃伅
@@ -390,6 +453,172 @@
return RequestHttps($"{severAddress}/App/EditHome", jsonString, false);
}
+ /// <summary>
+ /// 鑾峰彇浣忓畢涓嬬殑鎴愬憳璐﹀彿
+ /// </summary>
+ /// <returns></returns>
+ public ResponsePack GetResidenceMemberAccount()
+ {
+ Dictionary<string, object> d = new Dictionary<string, object>();
+ d.Add("DistributedMark", DB_ResidenceData.residenceData.residecenInfo.RegionID);
+ string jsonString = Newtonsoft.Json.JsonConvert.SerializeObject(d);
+ return RequestHttps($"{severAddress}/ZigbeeUsers/GetSubAccountByDistributedMark", jsonString, true);
+ }
+
+ /// <summary>
+ /// 鍒犻櫎浣忓畢涓嬬殑鎴愬憳璐﹀彿
+ /// </summary>
+ /// <returns></returns>
+ public ResponsePack DeleteResidenceMemberAccount(string memberAccount)
+ {
+ Dictionary<string, object> d = new Dictionary<string, object>();
+ d.Add("SubAccount", memberAccount);
+ d.Add("HouseDistributedMark", DB_ResidenceData.residenceData.residecenInfo.RegionID);
+ string jsonString = Newtonsoft.Json.JsonConvert.SerializeObject(d);
+ return RequestHttps($"{severAddress}/ZigbeeUsers/DeletedSubAccount", jsonString, true);
+ }
+
+ /// <summary>
+ /// 淇敼瀛愯处鍙锋樀绉�
+ /// </summary>
+ /// <param name="nickName"></param>
+ /// <param name="subAccountGuid"></param>
+ /// <returns></returns>
+ public ResponsePack EditSubAccountNickName(string nickName,string subAccountGuid)
+ {
+ Dictionary<string, object> d = new Dictionary<string, object>();
+ d.Add("SubAccountGuid", subAccountGuid);
+ d.Add("NickName", nickName);
+ string jsonString = Newtonsoft.Json.JsonConvert.SerializeObject(d);
+ return RequestHttps($"{severAddress}/ZigbeeUsers/EditSubAccountNickName", jsonString, true);
+ }
+ /// <summary>
+ /// 淇敼瀛愯处鍙峰垱寤哄満鏅潈闄�
+ /// </summary>
+ /// <param name="nickName"></param>
+ /// <param name="subAccountGuid"></param>
+ /// <returns></returns>
+ public ResponsePack ChangeCreateSceneState(string homeGuid, string subAccountGuid)
+ {
+ Dictionary<string, object> d = new Dictionary<string, object>();
+ d.Add("SubAccountGuid", subAccountGuid);
+ d.Add("HomeGuid", homeGuid);
+ string jsonString = Newtonsoft.Json.JsonConvert.SerializeObject(d);
+ return RequestHttps($"{severAddress}/ZigbeeUsers/ChangeCreateSceneState", jsonString, true);
+ }
+
+ /// <summary>
+ /// 鑾峰彇浣忓畢涓嬪瓙璐﹀彿鐨勫叡浜暟鎹垪琛�
+ /// </summary>
+ /// <returns></returns>
+ public ResponsePack GetShareDataByMemberAccount(string memberId)
+ {
+ Dictionary<string, object> d = new Dictionary<string, object>();
+ d.Add("DistributedMark", memberId);
+ d.Add("HouseDistributedMark", DB_ResidenceData.residenceData.residecenInfo.RegionID);
+ string jsonString = Newtonsoft.Json.JsonConvert.SerializeObject(d);
+ return RequestHttps($"{severAddress}/ZigbeeDataShare/GetShareDataBySubAccount", jsonString, true);
+ }
+
+ /// <summary>
+ /// 鑾峰彇浣忓畢涓嬪瓙璐﹀彿鐨勫叡浜暟鎹�
+ /// </summary>
+ /// <returns></returns>
+ public ResponsePack GetShareData(string memberId,string hId)
+ {
+ Dictionary<string, object> d = new Dictionary<string, object>();
+ d.Add("DistributedMark", memberId);
+ d.Add("HouseDistributedMark", hId);
+ string jsonString = Newtonsoft.Json.JsonConvert.SerializeObject(d);
+ return RequestHttps($"{severAddress}/ZigbeeDataShare/GetOneShareData", jsonString, true);
+ }
+
+ /// <summary>
+ /// 澧炲姞鍏变韩鏁版嵁鍒楄〃
+ /// </summary>
+ /// <returns></returns>
+ public ResponsePack AddShareData(ShareData shareData)
+ {
+ Dictionary<string, object> d = new Dictionary<string, object>();
+ d.Add("ShareName", shareData.ShareName);
+ d.Add("HouseDistributedMark", shareData.HouseDistributedMark);
+ d.Add("ShareDataBytes", shareData.ShareDataBytes);
+ d.Add("SubAccountDistributedMark", shareData.SubAccountDistributedMark);
+ string jsonString = Newtonsoft.Json.JsonConvert.SerializeObject(d);
+ return RequestHttps($"{severAddress}/ZigbeeDataShare/AddShareData", jsonString, true);
+ }
+
+ /// <summary>
+ /// 澧炲姞鍏变韩鏁版嵁
+ /// </summary>
+ /// <returns></returns>
+ public ResponsePack EditShareData(ShareData shareData)
+ {
+ Dictionary<string, object> d = new Dictionary<string, object>();
+ d.Add("DistributedMark", shareData.DistributedMark);
+ d.Add("ShareName", shareData.ShareName);
+ d.Add("HouseDistributedMark", shareData.HouseDistributedMark);
+ d.Add("ShareDataBytes", shareData.ShareDataBytes);
+ d.Add("SubAccountDistributedMark", shareData.SubAccountDistributedMark);
+ string jsonString = Newtonsoft.Json.JsonConvert.SerializeObject(d);
+ return RequestHttps($"{severAddress}/ZigbeeDataShare/EditShareData", jsonString, true);
+ }
+
+ /// <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>
+ /// <param name="nickName"></param>
+ /// <returns></returns>
+ public ResponsePack BindResidenceMemberAccount(string subAccount,string nickName)
+ {
+ Dictionary<string, object> d = new Dictionary<string, object>();
+ d.Add("SubAccount", subAccount);
+ d.Add("HouseDistributedMark", DB_ResidenceData.residenceData.residecenInfo.RegionID);
+ d.Add("Nickname", nickName);
+ d.Add("IsAllowRemoteCtrl", true);
+
+ string jsonString = Newtonsoft.Json.JsonConvert.SerializeObject(d);
+ return RequestHttps($"{severAddress}/ZigbeeUsers/BindSubAccount", jsonString, true);
+ }
+
+ /// <summary>
+ /// 鑾峰彇浣忓畢涓嬬殑鎴愬憳璐﹀彿
+ /// </summary>
+ /// <returns></returns>
+ public ResponsePack GetResidenceMemberAccountInfo(string account)
+ {
+ Dictionary<string, object> d = new Dictionary<string, object>();
+ d.Add("Account", account);
+ string jsonString = Newtonsoft.Json.JsonConvert.SerializeObject(d);
+ return RequestHttps($"{severAddress}/ZigbeeUsers/GetSubAccountInfo", jsonString, true);
+ }
#endregion
@@ -433,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)
@@ -456,7 +687,6 @@
}
#endregion
-
#region 澶囦唤閮ㄥ垎
/// <summary>
@@ -689,23 +919,8 @@
/// <summary>
/// 鍔熻兘ID
- /// 鍘傚晢浠ｇ爜 2bytes; 01 HDL
- /// 閫氳鏂瑰紡 1byte ; 01 HDL Bus; 02 Zigbee;03 KNX;04 Z-Wave
- /// 浜у搧GUID 8bytes
- /// 浜у搧绫诲埆 1byte ; 01 璋冨厜鍣�;02缁х數鍣�;03骞叉帴鐐规ā鍧�;04浼犳劅鍣�;05闈㈡澘
- /// 鐗╂ā鍨嬬被鍨�2bytes 01 寮�鍏崇被 --01寮�鍏�;02鎻掑骇
- /// 02 鐓ф槑 --01寮�鍏崇被;02璋冨厜绫�;03鑹叉俯;04LED
- /// 03 閬槼 --01绐楀笜鐢垫満;02鐧惧彾绐�;03寮�鍚堝笜;04鍗峰笜
- /// 04 鎭掓俯鍣� --01绌鸿皟;02鍦版殩;03姣涚粏绌鸿皟
- /// 05 鏂伴
- /// 06 褰遍煶
- /// 07 闊充箰
- /// 08 鑳芥簮
- /// 09 瀹夐槻
- /// 閫氶亾鍙� 2bytes
- /// Key_id 2bytes
/// </summary>
- /// "00010112345678901234560101230123AABB";
+ /// "03010112345678901234560101230123AABB";
var buffer = Guid.NewGuid().ToByteArray();
string guid = "";
if (buffer != null)
@@ -743,9 +958,9 @@
}
DB_ResidenceData.residenceData.functionList.lights.Add(new Light()
{
- sid = "000101" + guid + "0102010001AABB",
+ sid = "030101" + guid + "0102010001AABB",
name = ss.GetValue("Name").ToString(),
- trait = new List<Trait>() {
+ function = new List<Trait>() {
new Trait { attri="on_off", max=100,min = 0, value= new List<string> { "on","off"} },
},
roomIdList = roomIds,
@@ -769,9 +984,9 @@
}
DB_ResidenceData.residenceData.functionList.lights.Add(new Light()
{
- sid = "000101" + guid + "0202020001AABB",
+ sid = "030101" + guid + "0202020001AABB",
name = ss.GetValue("Name").ToString(),
- trait = new List<Trait>() {
+ function = new List<Trait>() {
new Trait { attri="brightness", max=100,min = 0, value= new List<string> { "up","down"} },
},
roomIdList = roomIds,
@@ -796,9 +1011,9 @@
}
DB_ResidenceData.residenceData.functionList.lights.Add(new Light()
{
- sid = "000101" + guid + "0202040001AABB",
+ sid = "030101" + guid + "0202040001AABB",
name = ss.GetValue("Name").ToString(),
- trait = new List<Trait>() {
+ function = new List<Trait>() {
new Trait { attri="brightness", max=100,min = 0, value= new List<string> { "on","off"} },
new Trait { attri="color", max=100,min = 0, value= new List<string> { "255", "255", "255" } },
},
@@ -825,9 +1040,9 @@
}
DB_ResidenceData.residenceData.functionList.aCs.Add(new AC()
{
- sid = "000101" + guid + "0204010001AABB",
+ sid = "030101" + guid + "0204010001AABB",
name = ss.GetValue("Name").ToString(),
- trait = new List<Trait>() {
+ function = new List<Trait>() {
new Trait { attri="on_off", max=1,min = 0, value= new List<string> { "on","off"} },
new Trait { attri="mode", max = 2,min =0,value = new List<string>{ "auto", "heat", "cool","dry" } },
new Trait { attri = "fan",max = 3,min =0,value = new List<string>{ "low", "mid", "high" ,"auto"} },
@@ -855,11 +1070,11 @@
}
DB_ResidenceData.residenceData.functionList.curtains.Add(new Curtain()
{
- sid = "000101" + guid + "0203010001AABB",
+ sid = "030101" + guid + "0203010001AABB",
name = ss.GetValue("Name").ToString(),
roomIdList = roomIds,
//roomIdList = new List<string>() { roomSid },
- trait = new List<Trait>() {
+ function = new List<Trait>() {
new Trait { attri="on_off", max=2,min = 0, value= new List<string> { "on","off","stop"} },
},// "curtain",
lastState = "寮�",
@@ -881,11 +1096,11 @@
}
DB_ResidenceData.residenceData.functionList.curtains.Add(new Curtain()
{
- sid = "000101" + guid + "0203040001AABB",
+ sid = "030101" + guid + "0203040001AABB",
name = ss.GetValue("Name").ToString(),
roomIdList = roomIds,
//roomIdList = new List<string>() { roomSid },
- trait = new List<Trait>() {
+ function = new List<Trait>() {
new Trait { attri="on_off", max=100,min = 0, value= new List<string> { "on","off","stop"} },
},// "rollingshutter",
lastState = "20%",
@@ -907,11 +1122,11 @@
}
DB_ResidenceData.residenceData.functionList.curtains.Add(new Curtain()
{
- sid = "000101" + guid + "0203030001AABB",
+ sid = "030101" + guid + "0203030001AABB",
name = ss.GetValue("Name").ToString(),
roomIdList = roomIds,
//roomIdList = new List<string>() { roomSid },
- trait = new List<Trait>() {
+ function = new List<Trait>() {
new Trait { attri="on_off", max=100,min = 0, value= new List<string> { "on","off","stop"} },
},
lastState = "20%",
--
Gitblit v1.8.0