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/Operation/ResponseEntity/SendJson.cs | 75 ++++++++++++++++++++++++-------------
1 files changed, 49 insertions(+), 26 deletions(-)
diff --git a/Crabtree/SmartHome/HDL/Operation/ResponseEntity/SendJson.cs b/Crabtree/SmartHome/HDL/Operation/ResponseEntity/SendJson.cs
index d57a5f5..704e5c4 100644
--- a/Crabtree/SmartHome/HDL/Operation/ResponseEntity/SendJson.cs
+++ b/Crabtree/SmartHome/HDL/Operation/ResponseEntity/SendJson.cs
@@ -17,24 +17,23 @@
public string RequestSource = MainPage.RequestSource;
public string LoginAccessToken;
-
}
- [System.Serializable]
- public class BaseNoTokenObj
- {
- public string RequestVersion = MainPage.RequestVersion;
+ //[System.Serializable]
+ //public class BaseNoTokenObj
+ //{
+ // public string RequestVersion = MainPage.RequestVersion;
- public string RequestSource = MainPage.RequestSource;
+ // public string RequestSource = MainPage.RequestSource;
- }
+ //}
[System.Serializable]
public class PageSettingObj
{
public int Page = 1;
- public int PageSize = 50;
+ public int PageSize = 100;
}
[System.Serializable]
@@ -315,12 +314,20 @@
[System.Serializable]
public class GetSingleHomeGatewayPaggerObj : BaseNoTokenObj
{
+ /// <summary>
+ /// 鏄惁鏄瓙璐﹀彿杩涜鎿嶄綔
+ /// </summary>
+ public bool IsOtherAccountCtrl = MainPage.IsAdministrator;
public GetSingleHomeReqDtoObj ReqDto = new GetSingleHomeReqDtoObj() ;
}
[System.Serializable]
- public class GetSingleHomeReqDtoObj : BaseAccountCtrlObj
+ public class GetSingleHomeReqDtoObj : BaseRequestObj
{
+ /// <summary>
+ /// 浣忓畢ID
+ /// </summary>
+ public string HomeId;
/// <summary>
/// 鎼滅储缃戝叧鍞竴鏍囪瘑 榛樿涓簄ull
/// </summary>
@@ -336,7 +343,7 @@
/// UpdateMac 鏇存柊Mac(鍗板害)
/// </summary>
[System.Serializable]
- public class UpdateMacObj : BaseRequestObj
+ public class UpdateMacObj : BaseAccountCtrlObj
{
/// <summary>
/// 浣忓畢Id
@@ -348,7 +355,23 @@
}
#endregion
-
+ #region 1.66 BindMac
+ /// <summary>
+ /// /App/BindMac 缁戝畾Mac(鍗板害鐗�)
+ /// </summary>
+ [System.Serializable]
+ public class BindMacObj : BaseAccountCtrlObj
+ {
+ ///// <summary>
+ ///// 浣忓畢Id
+ ///// </summary>
+ //public string HomeId;
+ public string MAC;
+
+
+ }
+ #endregion
+
#endregion
@@ -391,12 +414,12 @@
/// 鍒犻櫎椤圭洰(浣忓畢)
/// </summary>
[System.Serializable]
- public class EditHomeObj : BaseRequestObj
+ public class EditHomeObj : BaseAccountCtrlObj
{
- /// <summary>
- /// 椤圭洰(浣忓畢)Id -->閿悕 : HomeId
- /// </summary>
- public string HomeId;
+ ///// <summary>
+ ///// 椤圭洰(浣忓畢)Id -->閿悕 : HomeId
+ ///// </summary>
+ //public string HomeId;
/// <summary>
/// 浣忓畢鍖哄煙鍚嶇О
/// </summary>
@@ -458,16 +481,16 @@
#region ZigbeeUsers
#region 2.11 浣跨敤甯愬彿瀵嗙爜鐧诲綍
- /// <summary>
- /// 浣跨敤甯愬彿瀵嗙爜鐧诲綍
- /// </summary>
- [System.Serializable]
- public class LoginObj : BaseNoTokenObj
- {
- public string Account;
- public string Password;
- public int Company;
- }
+ ///// <summary>
+ ///// 浣跨敤甯愬彿瀵嗙爜鐧诲綍
+ ///// </summary>
+ //[System.Serializable]
+ //public class LoginObj : BaseNoTokenObj
+ //{
+ // public string Account;
+ // public string Password;
+ // public int Company;
+ //}
#endregion
--
Gitblit v1.8.0