From 2d414e3b007f750cdad4f9e4a7c04db696bca5e4 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期四, 23 四月 2020 16:13:59 +0800
Subject: [PATCH] 2020-04-23 1.优化远程连接提示，改为Loading方案，防止连接过程用户点击重连图标。 2.点击网络检测图标会判断，是否正在远程连接，如果是，会弹窗提示用户”正在远程连接，是否仍要重新检测“。 3.Help 增加隐藏长按功能，长按后，可以开启远程过程异常弹窗提示。长按后关闭。
---
Crabtree/SmartHome/HDL/Operation/ResponseEntity/SendJson.cs | 43 +++++++++++++++++++++++++++++++++----------
1 files changed, 33 insertions(+), 10 deletions(-)
diff --git a/Crabtree/SmartHome/HDL/Operation/ResponseEntity/SendJson.cs b/Crabtree/SmartHome/HDL/Operation/ResponseEntity/SendJson.cs
index d57a5f5..53e0577 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]
@@ -34,7 +33,7 @@
{
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>
--
Gitblit v1.8.0