From 365eadb33ee86b05ac74d408025d102a758c2efd Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期五, 10 一月 2020 15:27:17 +0800
Subject: [PATCH] 2020-01-10 2020-01-10 1.修改切换本地和远程问题。 2.修改判断住宅网关方案。 3.其它优化修改。
---
Crabtree/SmartHome/HDL/Operation/ResponseEntity/SendJson.cs | 23 +++++++++++++++--------
1 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/Crabtree/SmartHome/HDL/Operation/ResponseEntity/SendJson.cs b/Crabtree/SmartHome/HDL/Operation/ResponseEntity/SendJson.cs
index d57a5f5..d6ca901 100644
--- a/Crabtree/SmartHome/HDL/Operation/ResponseEntity/SendJson.cs
+++ b/Crabtree/SmartHome/HDL/Operation/ResponseEntity/SendJson.cs
@@ -17,7 +17,6 @@
public string RequestSource = MainPage.RequestSource;
public string LoginAccessToken;
-
}
[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
@@ -391,12 +398,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>
--
Gitblit v1.8.0