From 017af840d60fd6a56da9711308bf8239cb7fc1e6 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期五, 13 十一月 2020 11:01:01 +0800
Subject: [PATCH] 2020-11-13 1.部分接口替换备份
---
HDL_ON/DAL/Server/HttpServerRequest.cs | 681 ++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 506 insertions(+), 175 deletions(-)
diff --git a/HDL_ON/DAL/Server/HttpServerRequest.cs b/HDL_ON/DAL/Server/HttpServerRequest.cs
index 58a2c2a..376cf97 100644
--- a/HDL_ON/DAL/Server/HttpServerRequest.cs
+++ b/HDL_ON/DAL/Server/HttpServerRequest.cs
@@ -31,18 +31,40 @@
*/
- public string relaseaSever = "https://global.hdlcontrol.com/HangZhouHdlCloudApi";
- public string debugSever = "https://global.hdlcontrol.com/ProposedProductionApi";
- string severAddress;
+ string severAddress = "https://global.hdlcontrol.com/ProposedProductionApi";
public HttpServerRequest()
{
-#if DEBUG
- 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)
@@ -60,7 +82,7 @@
result = Language.StringByID(StringId.FailedToSendVerificationCode);
break;
case "EXIST":
- result = Language.StringByID(StringId.AccountAlreadyExists);
+ result = Language.StringByID(StringId.AccountAlreadyUse);
break;
case "Self:Net_Error":
result = Language.StringByID(StringId.NetworkAnomaly);
@@ -69,129 +91,194 @@
return result;
}
+ #region 鈻� 閫氱敤璇锋眰鎺ュ彛_______________________
+ /// <summary>
+ /// 鏍规鐢ㄦ埛璐﹀彿鑾峰彇娉ㄥ唽鍖哄煙 鍏嶇櫥褰� // 妫�娴嬭处鍙锋槸鍚︽敞鍐屼篃鐢ㄨ繖涓帴鍙�
+ /// </summary>
+ /// <param name="account"></param>
+ /// <returns></returns>
+ public ResponsePackNew GetRegionByAccount(string account)
+ {
+ var requestJson = HttpUtil.GetSignRequestJson(new RegionByAccountObj() { account = account });
+ return HttpUtil.RequestHttpsPost(NewAPI.API_POST_GetRegionByAccount, requestJson);
+ }
+
+ /// <summary>
+ /// 鍒锋柊Token
+ /// </summary>
+ /// <returns></returns>
+ public bool RefreshToken()
+ {
+ var requestJson = HttpUtil.GetSignRequestJson(new RefreshTokenObj()
+ {
+ refreshToken = MainPage.LoginUser.refreshToken,
+ });
+ var revertObj = HttpUtil.RequestHttpsPost(NewAPI.API_POST_Login, requestJson);
+ if (revertObj.Code.ToUpper() == HttpUtil.SUCCESS_CODE)
+ {
+ var revertData = Newtonsoft.Json.JsonConvert.DeserializeObject<UserLoginRes>(revertObj.Data.ToString());
+ MainPage.LoginUser.loginTokenString = revertData.headerPrefix + revertData.accessToken;
+ MainPage.LoginUser.lastTime = DateTime.Now;
+ MainPage.LoginUser.SaveUserInfo();
+ return true;
+ }
+ return false;
+ }
+
+ #endregion
#region 娉ㄥ唽銆佺櫥褰曢儴鍒�
/// <summary>
+ /// 鑾峰彇璇锋眰鎻愪氦鐨勮瑷�鍙傛暟
+ /// </summary>
+ public string GetPostLanguageType()
+ {
+ return Language.CurrentLanguage == "Chinese" ? LanguageTypeEnum.CHINESE.ToString() : LanguageTypeEnum.ENGLISH.ToString();
+ }
+
+ /// <summary>
+ /// 閫氱敤 鍙戦�侀獙璇佺爜鏂规硶
+ /// </summary>
+ /// <param name="verifyType">1:娉ㄥ唽 2锛氭壘鍥炲瘑鐮� 3锛氱櫥闄� 4:缁戝畾</param>
+ /// <param name="account">閭鎴栬�呮墜鏈哄彿</param>
+ /// <param name="isPhone">鏄惁鎵嬫満</param>
+ /// <param name="phoneZoneCode">鎵嬫満鍥藉鍖哄彿</param>
+ /// <returns></returns>
+ public ResponsePackNew VerificationCodeSend(VerifyType verifyType, string account, bool isPhone = false, string phoneZoneCode = "86")
+ {
+ var requestObj = new VerifyCodeSendObj()
+ {
+ verifyType = (int)verifyType,
+ languageType = GetPostLanguageType()
+ };
+ // 鏄惁鏄墜鏈�
+ if (isPhone)
+ {
+ requestObj.phone = account;
+ requestObj.phonePrefix = phoneZoneCode;
+ }
+ else
+ {
+ requestObj.mail = account;
+ }
+ // 瓒呮椂鏃堕棿璁剧疆涓�20绉掞紝搴旇娴嬭瘯娴峰鏈嶅姟鍣ㄥ彂閫侀獙璇佺爜鍝嶅簲鏃堕棿寰堜箙
+ var requestJson = HttpUtil.GetSignRequestJson(requestObj);
+ return HttpUtil.RequestHttpsPost(NewAPI.API_POST_Verification_Send, requestJson, "", "", HttpUtil.TIME_OUT_LONG);
+ }
+
+ /// <summary>
/// 璐﹀彿鐧诲綍-浣跨敤瀵嗙爜
/// </summary>
- public ResponsePack LoginByPassword(string account, string password)
+ /// <param name="account">璐﹀彿</param>
+ /// <param name="password">瀵嗙爜</param>
+ /// <returns></returns>
+ public ResponsePackNew LoginByPassword(string account, string password)
{
- string jsonString = "{" +
- "\"Account\":" + "\"" + account + "\"" + "," +
- "\"Password\":" + "\"" + password + "\"" +
- "}";
- return RequestHttps($"{severAddress}/ZigbeeUsers/Login", jsonString, false);
+ var requestJson = HttpUtil.GetSignRequestJson(new LoginObj()
+ {
+ account = account,
+ loginPwd = password
+ });
+ return HttpUtil.RequestHttpsPost(NewAPI.API_POST_Login, requestJson);
}
/// <summary>
/// 楠岃瘉鐮佺櫥褰�
/// </summary>
- public ResponsePack LoginValidCode(string account,string vCode)
+ /// <param name="account">璐﹀彿</param>
+ /// <param name="vCode">楠岃瘉鐮�</param>
+ /// <returns></returns>
+ public ResponsePackNew LoginValidCode(string account, string vCode)
{
- Dictionary<string, object> d = new Dictionary<string, object>();
- d.Add("Account", account);
- d.Add("Code", vCode);
- d.Add("Language", Language.CurrentLanguage);
- d.Add("AreaCode", "86");
- var jsonString = Newtonsoft.Json.JsonConvert.SerializeObject(d);
- return RequestHttps($"{severAddress}/ZigbeeUsers/LoginValidCode", jsonString, false);
- }
-
- /// <summary>
- /// 鎵嬫満鍙风爜娉ㄥ唽
- /// </summary>
- /// <param name="mobileNumber"></param>
- /// <param name="password"></param>
- /// <param name="language"></param>
- public ResponsePack RegisterPhone(string mobileNumber, string password, string language)
- {
- string jsonString = "{" +
- "\"Account\":" + "\"" + mobileNumber + "\"" + "," +
- "\"Password\":" + "\"" + password + "\"" + "," +
- "\"Language\":" + "\"" + language + "\"" +
- "\"AreaCode\":" + "\"" + "86" + "\"" +
- "}";
- return RequestHttps($"{severAddress}/SignIn", jsonString, false);
- }
-
- public ResponsePack GetAreaCode()
- {
- string requestJson = "{}";
- return RequestHttps($"{severAddress}/ZigbeeUsers/GetAreaCode", requestJson, false);
+ var requestJson = HttpUtil.GetSignRequestJson(new LoginObj()
+ {
+ account = account,
+ verifyCode = vCode,
+ grantType = "verify"
+ });
+ return HttpUtil.RequestHttpsPost(NewAPI.API_POST_Login, requestJson);
}
/// <summary>
/// 楠岃瘉鐭俊鎴栬�呴偖绠遍獙璇佺爜锛屼箣鍚庢敞鍐�
/// </summary>
- /// <param name="account">璐﹀彿</param>
+ /// <param name="account">閭鎴栬�呮墜鏈哄彿</param>
/// <param name="password">瀵嗙爜</param>
- /// <param name="entryPassword">纭瀵嗙爜</param>
/// <param name="code">楠岃瘉鐮�</param>
- /// <param name="areaCode"></param>
+ /// <param name="isPhone">鏄惁鎵嬫満</param>
/// <returns></returns>
- public ResponsePack ValidataCodeAndRegister(string account, string password, string entryPassword, string code, int areaCode)
+ public ResponsePackNew ValidataCodeAndRegister(string account, string password, string code, bool isPhone = false)
{
- //var requestObj = new ValidateSmsCodeObj() { Phone = accout, Code = code };
- //var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(requestObj);
- string requestJson = "{" +
- "\"Account\":" + "\"" + account + "\"" + "," +
- "\"Password\":" + "\"" + password + "\"" + "," +
- "\"EnterPassword\":" + "\"" + entryPassword + "\"" + "," +
- "\"Language\":" + "\"" + MainPage.LoginUser.language.ToLower() + "\"" + "," +
- "\"Code\":" + "\"" + code + "\"" + "," +
- "\"RegisterSoruce\":" + 0 + "," +
- "\"AreaCode\":" + areaCode +
- "}";
- return RequestHttps($"{severAddress}/ZigbeeUsers/ValidataCodeAndRegisterAccount", requestJson, false);
+ var requestObj = new RegisterObj() { loginPwd = password, verifyCode = code, memberName = account };
+ if (isPhone)
+ {
+ requestObj.memberPhone = account;
+ }
+ else
+ {
+ requestObj.memberEmail = account;
+ }
+ var requestJson = HttpUtil.GetSignRequestJson(requestObj);
+ return HttpUtil.RequestHttpsPost(NewAPI.API_POST_Member_Register, requestJson);
}
-
/// <summary>
- /// 鑾峰彇娉ㄥ唽楠岃瘉鐮�
+ /// 蹇樿瀵嗙爜锛岄噸缃瘑鐮�
/// </summary>
- public ResponsePack GetPhoneRegisterVerCode(string account)
+ /// <param name="account">閭鎴栬�呮墜鏈哄彿</param>
+ /// <param name="password">鏂板瘑鐮�</param>
+ /// <param name="vCode">楠岃瘉鐮�</param>
+ /// <param name="isPhone">鏄惁鎵嬫満璐﹀彿</param>
+ /// <returns></returns>
+ public ResponsePackNew ForgetPassword(string account, string password, string vCode, bool isPhone)
{
- string jsonString = "{" +
- "\"Account\":" + "\"" + account + "\"" + "," +
- "\"Company\":" + MainPage.Company + "," +
- "\"Language\":" + "\"" + MainPage.LoginUser.language.ToLower() + "\"" + "," +
- "\"AreaCode\":" + OnAppConfig.Instance.CountryNumber +
- "}";
- return RequestHttps($"{severAddress}/ZigbeeUsers/RegisterSendVerCode", jsonString, false);
-
+ var requestObj = new ForgetPwdObj() { verifyCode = vCode, loginPwd = password };
+ if (isPhone)
+ {
+ //鎵嬫満蹇樿瀵嗙爜
+ requestObj.memberPhone = account;
+ }
+ else
+ {
+ //閭蹇樿瀵嗙爜
+ requestObj.memberEmail = account;
+ }
+ var requestJson = HttpUtil.GetSignRequestJson(requestObj);
+ return HttpUtil.RequestHttpsPost(NewAPI.API_POST_Member_ForgetPwd, requestJson);
}
-
+
+
+
/// <summary>
/// 鑾峰彇鐧诲綍楠岃瘉鐮�
/// </summary>
- /// <param name="phoneNum">鎵嬫満鍙风爜</param>
- public ResponsePack GetPhoneLoginVerCode(string phoneNum)
+ public ResponsePack GetLoginVerCode(string account)
{
- string jsonString = "{" +
- "\"Account\":" + "\"" + phoneNum + "\"" + "," +
- "\"AreaCode\":" + "86" +
- "}";
- return RequestHttps($"{severAddress}/ZigbeeUsers/LoginSendVerCode", jsonString, false);
- }
-
- /// <summary>
- /// 鍙戦�侀獙璇佺爜
- /// </summary>
- public ResponsePack SendSms(string account)
- {
string jsonString = "{" +
"\"Account\":" + "\"" + account + "\"" + "," +
- "\"Company\":" + MainPage.Company + "," +
- "\"Language\":" + "\"" + Language.CurrentLanguage + "\"" + "," +
- "\"AreaCode\":" + OnAppConfig.Instance.CountryNumber +
+ "\"AreaCode\":" + "86" +
"}";
return RequestHttps($"{severAddress}/ZigbeeUsers/LoginSendVerCode", jsonString, false);
}
+
+ ///// <summary>
+ ///// 鍙戦�侀獙璇佺爜
+ ///// </summary>
+ //public ResponsePack SendSms(string account)
+ //{
+ // string jsonString = "{" +
+ // "\"Account\":" + "\"" + account + "\"" + "," +
+ // "\"Company\":" + MainPage.Company + "," +
+ // "\"Language\":" + "\"" + Language.CurrentLanguage + "\"" + "," +
+ // "\"AreaCode\":" + OnAppConfig.Instance.CountryNumber +
+ // "}";
+ // return RequestHttps($"{severAddress}/ZigbeeUsers/LoginSendVerCode", jsonString, false);
+ //}
/// <summary>
/// 楠岃瘉楠岃瘉鐮�
@@ -209,6 +296,8 @@
"}";
return RequestHttps($"{severAddress}/ZigbeeUsers/ValidatorCode", jsonString, false);
}
+
+
/// <summary>
/// 閲嶈瀵嗙爜
@@ -237,7 +326,7 @@
var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(d);
var revertObj = RequestHttps($"{severAddress}/ZigbeeUsers/GetAccountInfo", requestJson, true);
- if (revertObj.StateCode.ToUpper() == "SUCCESS")
+ if (revertObj.StateCode.ToUpper() == HttpUtil.SUCCESS_CODE)
{
var dataStr = JObject.FromObject(revertObj.ResponseData);
//"DistributedMark": "96439601-fd26-4768-8440-1d9dfa32c109", < !--甯愬彿Id-- >
@@ -247,22 +336,19 @@
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;
- } catch (Exception ex)
+ 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 +406,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 浣忓畢閮ㄥ垎
@@ -334,9 +432,9 @@
"\"HomeType\":" + "\"" + "1" + "\"" + "," +
"\"LoginAccessToken\":" + "\"" + MainPage.LoginUser.loginTokenString + "\"" +
"}";
- var responsePack = RequestHttps($"{severAddress}/App/GetHomePager", jsonString,false);
+ var responsePack = RequestHttps($"{severAddress}/App/GetHomePager", jsonString, false);
- if (responsePack.StateCode.ToUpper() == "SUCCESS")
+ if (responsePack.StateCode.ToUpper() == HttpUtil.SUCCESS_CODE)
{
var dataStr = JObject.FromObject(responsePack.ResponseData);
//娌℃湁浣忓畢
@@ -346,6 +444,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 +479,24 @@
RegionName = homeJsonStr.GetValue("RegionName").ToString(),
Name = homeJsonStr.GetValue("Name").ToString(),
Address = homeJsonStr.GetValue("Address").ToString(),
+ IsOthreShare = (bool)homeJsonStr.GetValue("IsOthreShare"),
+ homeGateways = Newtonsoft.Json.JsonConvert.DeserializeObject<List<HomeGateways>>(homeJsonStr.GetValue("HomeGateways").ToString()),
};
+ if (home.IsOthreShare)
+ {
+ continue;
+ }
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 +521,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 +730,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)
@@ -445,7 +744,8 @@
}
System.Threading.Thread.Sleep(1000);
}
- Shared.Application.RunOnMainThread(() => {
+ Shared.Application.RunOnMainThread(() =>
+ {
try
{
HDL_ON.UI.HomePage.LoadEvent_RefreshAir();
@@ -457,12 +757,58 @@
#endregion
+ #region mqtt杩滅▼杩炴帴锛堟棫锛�
+ /// <summary>
+ /// 璇锋眰Mqtt鏁版嵁
+ /// </summary>
+ /// <param name="dataStringJson">璇锋眰鐨勫弬鏁�.</param>
+ public ResponsePack RequestMqttInfo(string dataStringJson)
+ {
+ ResponsePack revertObj = null;
+
+ var webClient = new WebClient();
+ #region
+ webClient.Headers.Add("CONTENT-TYPE", "application/json");
+ var url = "https://global.hdlcontrol.com/ProposedProductionApi/EmqMqtt/GetConnMqttInfo";
+
+ byte[] bytes = null;
+ try
+ {
+ bytes = webClient.UploadData(url, Encoding.UTF8.GetBytes(dataStringJson));
+ }
+ catch (Exception ex)
+ {
+ Console.WriteLine(ex.Message);
+ revertObj = new ResponsePack() { StateCode = "Net_Error" };
+ }
+
+ string responseString = null;
+ if (bytes != null)
+ {
+ responseString = Encoding.UTF8.GetString(bytes);
+ }
+
+ if (responseString != null)
+ {
+ try
+ {
+ revertObj = Newtonsoft.Json.JsonConvert.DeserializeObject<ResponsePack>(responseString);
+ }
+ catch (Exception ex)
+ {
+ Console.WriteLine(ex.ToString());
+ }
+ }
+ return revertObj;
+ #endregion
+ }
+ #endregion
#region 澶囦唤閮ㄥ垎
/// <summary>
/// 鑾峰彇浣忓畢澶囦唤鍒楄〃
/// </summary>
- public Dictionary<int,string> GetRegionLastBackupId()
+ public Dictionary<int, string> GetRegionLastBackupId()
{
//Dialog dialog = new Dialog();
//dialog.Show();
@@ -472,7 +818,7 @@
d.Add("LevelID", DB_ResidenceData.residenceData.residecenInfo.RegionID);// 199200);
var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(d);
var revertObj = RequestHttps("https://developer.hdlcontrol.com/api/GetUserFolder", requestJson, true);
- if(revertObj == null || revertObj.ResponseData == null)
+ if (revertObj == null || revertObj.ResponseData == null)
{
return new Dictionary<int, string>();
}
@@ -485,7 +831,7 @@
}
return backupList;
}
-
+ /* 2020-09-01 寮冪敤 鎭㈠鏃ф暟鎹姛鑳藉湪bus杞欢涓婂疄鐜�
/// <summary>
/// 鑾峰彇澶囦唤鏂囦欢鍒楄〃
/// </summary>
@@ -616,7 +962,7 @@
// backgroundImage = "Classification/Room/Roombg.png",
// //backgroundImage = ss.GetValue("BackGroundImage").ToString() == "Room/r1.png" ? "Classification/Room/Roombg.png" : filePath,
//};
- //DB_ResidenceData.residenceData.rooms.Add(room1);
+ //DB_ResidenceData.rooms.Add(room1);
//roomList.Add(ss, room1);
}
@@ -689,23 +1035,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)
@@ -734,19 +1065,19 @@
{
case "LightSwitch":
case "LightMixSwitch":
- var light1 = DB_ResidenceData.residenceData.functionList.lights.Find((obj) => obj.bus_Data.SubnetID == (byte)ss.GetValue("SubnetID") &&
+ var light1 = DB_ResidenceData.functionList.lights.Find((obj) => obj.bus_Data.SubnetID == (byte)ss.GetValue("SubnetID") &&
obj.bus_Data.DeviceID == (byte)ss.GetValue("DeviceID") && obj.bus_Data.LoopID == (byte)ss.GetValue("LoopID"));
if (light1 != null)
{
//light1.roomIdList.Add(roomSid);
break;
}
- DB_ResidenceData.residenceData.functionList.lights.Add(new Light()
+ DB_ResidenceData.functionList.lights.Add(new Light()
{
- sid = "000101" + guid + "0102010001AABB",
+ sid = "030101" + guid + "0102010001AABB",
name = ss.GetValue("Name").ToString(),
- propertList = new List<Trait>() {
- new Trait { attri="on_off", max=100,min = 0, value= new List<string> { "on","off"} },
+ function = new List<Trait>() {
+ new Trait { name="on_off", max=100,min = 0, value_key= new List<string> { "on","off"} },
},
roomIdList = roomIds,
bus_Data = new BusData
@@ -760,19 +1091,19 @@
case "LightDimming":
case "LightDALI":
case "LightMixDimming":
- var light2 = DB_ResidenceData.residenceData.functionList.lights.Find((obj) => obj.bus_Data.SubnetID == (byte)ss.GetValue("SubnetID") &&
+ var light2 = DB_ResidenceData.functionList.lights.Find((obj) => obj.bus_Data.SubnetID == (byte)ss.GetValue("SubnetID") &&
obj.bus_Data.DeviceID == (byte)ss.GetValue("DeviceID") && obj.bus_Data.LoopID == (byte)ss.GetValue("LoopID"));
if (light2 != null)
{
//light2.roomIdList.Add(roomSid);
break;
}
- DB_ResidenceData.residenceData.functionList.lights.Add(new Light()
+ DB_ResidenceData.functionList.lights.Add(new Light()
{
- sid = "000101" + guid + "0202020001AABB",
+ sid = "030101" + guid + "0202020001AABB",
name = ss.GetValue("Name").ToString(),
- propertList = new List<Trait>() {
- new Trait { attri="brightness", max=100,min = 0, value= new List<string> { "up","down"} },
+ function = new List<Trait>() {
+ new Trait { name="brightness", max=100,min = 0, value_key= new List<string> { "up","down"} },
},
roomIdList = roomIds,
//roomIdList = new List<string>() { "0001" },
@@ -787,20 +1118,20 @@
break;
case "LightLogic":
case "LightRGB":
- var light3 = DB_ResidenceData.residenceData.functionList.lights.Find((obj) => obj.bus_Data.SubnetID == (byte)ss.GetValue("SubnetID") &&
+ var light3 = DB_ResidenceData.functionList.lights.Find((obj) => obj.bus_Data.SubnetID == (byte)ss.GetValue("SubnetID") &&
obj.bus_Data.DeviceID == (byte)ss.GetValue("DeviceID") && obj.bus_Data.LoopID == (byte)ss.GetValue("LoopID"));
if (light3 != null)
{
//light3.roomIdList.Add(roomSid);
break;
}
- DB_ResidenceData.residenceData.functionList.lights.Add(new Light()
+ DB_ResidenceData.functionList.lights.Add(new Light()
{
- sid = "000101" + guid + "0202040001AABB",
+ sid = "030101" + guid + "0202040001AABB",
name = ss.GetValue("Name").ToString(),
- propertList = 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" } },
+ function = new List<Trait>() {
+ new Trait { name="brightness", max=100,min = 0, value_key= new List<string> { "on","off"} },
+ new Trait { name="color", max=100,min = 0, value_key= new List<string> { "255", "255", "255" } },
},
roomIdList = roomIds,
//roomIdList = new List<string>() { roomSid },
@@ -816,22 +1147,22 @@
case "HVAC":
case "ACPanel":
case "ACInfrared":
- var ac = DB_ResidenceData.residenceData.functionList.aCs.Find((obj) => obj.bus_Data.SubnetID == (byte)ss.GetValue("SubnetID") &&
+ var ac = DB_ResidenceData.functionList.aCs.Find((obj) => obj.bus_Data.SubnetID == (byte)ss.GetValue("SubnetID") &&
obj.bus_Data.DeviceID == (byte)ss.GetValue("DeviceID") && obj.bus_Data.LoopID == (byte)ss.GetValue("LoopID"));
if (ac != null)
{
//ac.roomIdList.Add(roomSid);
break;
}
- DB_ResidenceData.residenceData.functionList.aCs.Add(new AC()
+ DB_ResidenceData.functionList.aCs.Add(new AC()
{
- sid = "000101" + guid + "0204010001AABB",
+ sid = "030101" + guid + "0204010001AABB",
name = ss.GetValue("Name").ToString(),
- propertList = 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"} },
- new Trait { attri = "temperature", max = 32,min=16,value = new List<string>{"up","down" } },
+ function = new List<Trait>() {
+ new Trait { name="on_off", max=1,min = 0, value_key= new List<string> { "on","off"} },
+ new Trait { name="mode", max = 2,min =0,value_key = new List<string>{ "auto", "heat", "cool","dry" } },
+ new Trait { name = "fan",max = 3,min =0,value_key = new List<string>{ "low", "mid", "high" ,"auto"} },
+ new Trait { name = "temperature", max = 32,min=16,value_key = new List<string>{"up","down" } },
},
roomIdList = roomIds,
//roomIdList = new List<string>() { roomSid},
@@ -846,21 +1177,21 @@
break;
//Entity.
case "CurtainModel":
- var curtain1 = DB_ResidenceData.residenceData.functionList.curtains.Find((obj) => obj.bus_Data.SubnetID == (byte)ss.GetValue("SubnetID") &&
+ var curtain1 = DB_ResidenceData.functionList.curtains.Find((obj) => obj.bus_Data.SubnetID == (byte)ss.GetValue("SubnetID") &&
obj.bus_Data.DeviceID == (byte)ss.GetValue("DeviceID") && obj.bus_Data.LoopID == (byte)ss.GetValue("LoopID"));
if (curtain1 != null)
{
//curtain1.roomIdList.Add(roomSid);
break;
}
- DB_ResidenceData.residenceData.functionList.curtains.Add(new Curtain()
+ DB_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 },
- propertList = new List<Trait>() {
- new Trait { attri="on_off", max=2,min = 0, value= new List<string> { "on","off","stop"} },
+ function = new List<Trait>() {
+ new Trait { name="on_off", max=2,min = 0, value_key= new List<string> { "on","off","stop"} },
},// "curtain",
lastState = "寮�",
bus_Data = new BusData
@@ -872,21 +1203,21 @@
});
break;
case "CurtainRoller":
- var curtain2 = DB_ResidenceData.residenceData.functionList.curtains.Find((obj) => obj.bus_Data.SubnetID == (byte)ss.GetValue("SubnetID") &&
+ var curtain2 = DB_ResidenceData.functionList.curtains.Find((obj) => obj.bus_Data.SubnetID == (byte)ss.GetValue("SubnetID") &&
obj.bus_Data.DeviceID == (byte)ss.GetValue("DeviceID") && obj.bus_Data.LoopID == (byte)ss.GetValue("LoopID"));
if (curtain2 != null)
{
//curtain2.roomIdList.Add(roomSid);
break;
}
- DB_ResidenceData.residenceData.functionList.curtains.Add(new Curtain()
+ DB_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 },
- propertList = new List<Trait>() {
- new Trait { attri="on_off", max=100,min = 0, value= new List<string> { "on","off","stop"} },
+ function = new List<Trait>() {
+ new Trait { name="on_off", max=100,min = 0, value_key= new List<string> { "on","off","stop"} },
},// "rollingshutter",
lastState = "20%",
bus_Data = new BusData
@@ -898,21 +1229,21 @@
});
break;
case "CurtainTrietex":
- var curtain3 = DB_ResidenceData.residenceData.functionList.curtains.Find((obj) => obj.bus_Data.SubnetID == (byte)ss.GetValue("SubnetID") &&
+ var curtain3 = DB_ResidenceData.functionList.curtains.Find((obj) => obj.bus_Data.SubnetID == (byte)ss.GetValue("SubnetID") &&
obj.bus_Data.DeviceID == (byte)ss.GetValue("DeviceID") && obj.bus_Data.LoopID == (byte)ss.GetValue("LoopID"));
if (curtain3 != null)
{
//curtain3.roomIdList.Add(roomSid);
break;
}
- DB_ResidenceData.residenceData.functionList.curtains.Add(new Curtain()
+ DB_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 },
- propertList = new List<Trait>() {
- new Trait { attri="on_off", max=100,min = 0, value= new List<string> { "on","off","stop"} },
+ function = new List<Trait>() {
+ new Trait { name="on_off", max=100,min = 0, value_key= new List<string> { "on","off","stop"} },
},
lastState = "20%",
bus_Data = new BusData
@@ -923,7 +1254,7 @@
},
});
break;
- //Entity.DB_ResidenceData.residenceData.functionList.floorHeatings.Add(new FloorHeating()
+ //Entity.DB_ResidenceData.functionList.floorHeatings.Add(new FloorHeating()
//{
// sid = "12341212345678901234560704010004ABCD",
// name = "鍦扮儹",
@@ -941,7 +1272,7 @@
}
}
-
+ */
#endregion
}
--
Gitblit v1.8.0