From 5a5a2b696866f947b6025d26c3302e8ffef46435 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期一, 11 一月 2021 16:11:20 +0800
Subject: [PATCH] 2021-01-11 1.更新MQTT连接和本地搜索网关方法。2.子账号相关接口完善
---
Crabtree/SmartHome/HDL/Common/HttpUtil/HttpServerRequest.cs | 105 ++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 80 insertions(+), 25 deletions(-)
diff --git a/Crabtree/SmartHome/HDL/Common/HttpUtil/HttpServerRequest.cs b/Crabtree/SmartHome/HDL/Common/HttpUtil/HttpServerRequest.cs
index 4d82449..297cb8f 100644
--- a/Crabtree/SmartHome/HDL/Common/HttpUtil/HttpServerRequest.cs
+++ b/Crabtree/SmartHome/HDL/Common/HttpUtil/HttpServerRequest.cs
@@ -8,9 +8,11 @@
namespace Shared
{
+ /// <summary>
+ /// 鎺ュ彛璇锋眰灏佽
+ /// </summary>
public class HttpServerRequest
{
-
#region 鈻� 鍙橀噺澹版槑___________________________
/// <summary>
/// 閫氱敤鏂规硶
@@ -63,13 +65,9 @@
}
return revertObj.Code;
}
-
#endregion
-
#region 娉ㄥ唽銆佺櫥褰曢儴鍒�
-
-
/// <summary>
/// 閫氱敤 鍙戦�侀獙璇佺爜鏂规硶
/// </summary>
@@ -141,9 +139,9 @@
/// <param name="code">楠岃瘉鐮�</param>
/// <param name="isPhone">鏄惁鎵嬫満</param>
/// <returns></returns>
- public ResponsePackNew ValidataCodeAndRegister(string account, string password, string code, bool isPhone = false)
+ public ResponsePackNew ValidataCodeAndRegister(string name,string account, string password, string code, bool isPhone = false)
{
- var requestObj = new RegisterObj() { loginPwd = password, verifyCode = code};//, memberName = account
+ var requestObj = new RegisterObj() { loginPwd = password, verifyCode = code, memberName = name};//, memberName = account
if (isPhone)
{
requestObj.memberPhone = account;
@@ -179,6 +177,21 @@
}
var requestJson = HttpUtil.GetSignRequestJson(requestObj);
return HttpUtil.RequestHttpsPost(NewAPI.API_POST_Member_ForgetPwd, requestJson);
+ }
+
+ /// <summary>
+ /// 淇敼瀵嗙爜
+ /// 鎻愪緵鏂版棫瀵嗙爜
+ /// </summary>
+ /// <param name="oldPassword"></param>
+ /// <param name="newPassword"></param>
+ /// <returns></returns>
+ public ResponsePackNew ModifyPassword (string oldPassword, string newPassword) {
+ var requestJson = HttpUtil.GetSignRequestJson (new UpdatePwdObj () {
+ loginPwd = oldPassword,
+ loginNewPwd = newPassword
+ });
+ return HttpUtil.RequestHttpsPost (NewAPI.API_POST_Update_Pwd, requestJson);
}
/// <summary>
@@ -365,17 +378,10 @@
UserConfig.Instance.HomeLists = new List<RegionInfoRes> ();
var homeList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<RegionInfoResNew>> (resultObj.Data.ToString ());
if (homeList == null || homeList.Count == 0) {
-
+ UserConfig.Instance.SaveUserConfig ();
} else {
foreach (var mHome in homeList) {
- var home = new RegionInfoRes () {
- Id = mHome.Id,
- Name = mHome.homeName,
- IsOthreShare = mHome.IsOtherShare,
- isRemoteControl = mHome.isRemoteControl,
- isBindGateway = mHome.isBindGateway,
- regionUrl = mHome.regionUrl,
- };
+ var home = RegionInfoResNewToHome (mHome);
UserConfig.Instance.HomeLists.Add (home);
}
//浣忓畢琚垹闄�
@@ -408,6 +414,23 @@
}
/// <summary>
+ ///
+ /// </summary>
+ /// <param name="mHome"></param>
+ /// <returns></returns>
+ public RegionInfoRes RegionInfoResNewToHome (RegionInfoResNew mHome)
+ {
+ return new RegionInfoRes () {
+ Id = mHome.Id,
+ Name = mHome.homeName,
+ IsOthreShare = mHome.IsOtherShare,
+ isRemoteControl = mHome.isRemoteControl,
+ isBindGateway = mHome.isBindGateway,
+ regionUrl = mHome.regionUrl,
+ };
+ }
+
+ /// <summary>
/// 缂栬緫浣忓畢淇℃伅
/// </summary>
/// <param name="editId">0 淇敼浣忓畢鍚嶅瓧銆�1 淇敼浣忓畢鍦板潃</param>
@@ -434,6 +457,44 @@
}
/// <summary>
+ /// 鏍规嵁homeId鍒犻櫎鎸囧畾
+ /// </summary>
+ /// <param name="homeId"></param>
+ /// <returns></returns>
+ public ResponsePackNew AddHome (string homeName)
+ {
+ var requestJson = HttpUtil.GetSignRequestJson (new AddOrUpdateHomeObj () {
+ homeName = homeName,
+ homeType = HomeTypeEnum.BUSPRO.ToString ()
+ }) ;
+ return HttpUtil.RequestHttpsPostFroHome (NewAPI.API_POST_Home_AddHome, requestJson);
+ }
+
+ /// <summary>
+ /// 鏍规嵁homeId鍒犻櫎鎸囧畾
+ /// </summary>
+ /// <param name="homeId"></param>
+ /// <returns></returns>
+ public ResponsePackNew DeleteHome (string homeId)
+ {
+ var requestJson = HttpUtil.GetSignRequestJson (new HomeIdObj () {
+ homeId = homeId
+ });
+ return HttpUtil.RequestHttpsPostFroHome (NewAPI.API_POST_Home_Delete, requestJson);
+ }
+
+ /// <summary>
+ /// 缁戝畾缃戝叧
+ /// </summary>
+ /// <param name="mac"></param>
+ /// <returns></returns>
+ public ResponsePackNew BindGateway (BindGatewayObj newGateway)
+ {
+ var requestJson = HttpUtil.GetSignRequestJson (newGateway);
+ return HttpUtil.RequestHttpsPostFroHome (NewAPI.API_POST_BindGateway, requestJson);
+ }
+
+ /// <summary>
/// 鑾峰彇鍒锋柊褰撳墠浣忓畢鐨勭綉鍏冲垪琛�
/// </summary>
public string GetHomeGatewayList()
@@ -454,14 +515,6 @@
if (mHomeGatewayRes.Count > 0)
{
UserConfig.Instance.HomeGateway = mHomeGatewayRes[0];
- //if (mHomeGatewayRes[0].gatewayStatus)
- //{
- // DriverLayer.Control.Ins.GatewayOnline = true;
- //}
- //else
- //{
- // DriverLayer.Control.Ins.GatewayOnline = false;
- //}
UserConfig.Instance.SaveUserConfig();
return revertObj.Code;
}
@@ -505,6 +558,8 @@
}
return revertObj.Code;
}
+
+
/// <summary>
/// 鑾峰彇浣忓畢涓嬬殑鎴愬憳璐﹀彿
@@ -633,7 +688,7 @@
{
var requestJson = HttpUtil.GetSignRequestJson(new GetMqttRemoteInfoObj()
{
- attachClientId = attachClientId,
+ attachClientId = attachClientId + "L1",
homeType = HomeTypeEnum.BUSPRO.ToString()
});
var revertObj = HttpUtil.RequestHttpsPost(NewAPI.API_POST_GetMqttRemoteInfo, requestJson, UserConfig.Instance.CurrentRegion.regionUrl);
--
Gitblit v1.8.0