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/GatewayRes.cs | 92 ++++++++++++++++++++++++++++++++--------------
1 files changed, 64 insertions(+), 28 deletions(-)
diff --git a/Crabtree/SmartHome/HDL/Operation/ResponseEntity/GatewayRes.cs b/Crabtree/SmartHome/HDL/Operation/ResponseEntity/GatewayRes.cs
old mode 100755
new mode 100644
index 382d6bf..b1bed41
--- a/Crabtree/SmartHome/HDL/Operation/ResponseEntity/GatewayRes.cs
+++ b/Crabtree/SmartHome/HDL/Operation/ResponseEntity/GatewayRes.cs
@@ -1,34 +1,70 @@
锘縰sing System;
-
+using System.Collections.Generic;
+
namespace Shared
-{
+{
+
+ [Serializable]
public class AllBindGatewarysPaggerRes
{
public int PageIndex;
public int PageSize;
public int TotalCount;
public int TotalPages;
public bool HasPreviousPage;
public bool HasNextPage;
public string RegionName;
public List<GatewayRes> PageData = new List<GatewayRes> ();
}
+
+
+ /// <summary>
+ /// 浠庢帴鍙ｈ幏鍙栫綉鍏冲垪琛ㄧ殑缁撴灉
+ /// </summary>
+ public class GetGatewayResult
+ {
+ /// <summary>
+ /// 缃戝叧鍒楄〃
+ /// </summary>
+ public List<GatewayRes> PageData = new List<GatewayRes> ();
+ }
+
[Serializable]
public class GatewayRes
- {
- public int Id { get; set; }
-
- public string MAC { get; set; }
-
- public string ProjectName { get; set; }
-
- public string UserName { get; set; }
-
- public string GroupName { get; set; }
-
- public string IPAddress { get; set; }
-
- public int Port { get; set; }
-
- public int SubnetID { get; set; }
-
- public int DeviceID { get; set; }
-
- public int Type { get; set; }
-
- public string IsValid { get; set; }
-
- public string Password { get; set; }
-
- public string Region { get; set; }
+ {
+ /// <summary>
+ /// 缃戝叧Mac
+ /// </summary>
+ public string GatewayUniqueId { get; set; }
+ /// <summary>
+ /// 涓庢缃戝叧鍦ㄤ簯绔疎mq閫氫俊鏃讹紝璐熻浇鍔犺В鐨�16浣岮es瀵嗛挜
+ /// </summary>
+ public string AesKey { get; set; }
+ /// <summary>
+ /// 缃戝叧瀵瑰簲鐨勫敮涓�鐮�
+ /// </summary>
+ public string MacMark { get; set; }
+ /// <summary>
+ /// 缃戝叧鍦ㄤ簯绔疎mq鏄惁鍦ㄧ嚎
+ /// </summary>
+ public bool MqttOnlineStatus { get; set; }
+
+ //public int Id { get; set; }
+
+ //public string MAC { get; set; }
+
+ //public string ProjectName { get; set; }
+
+ //public string UserName { get; set; }
+
+ //public string GroupName { get; set; }
+
+ //public string IPAddress { get; set; }
+
+ //public int Port { get; set; }
+
+ //public int SubnetID { get; set; }
+
+ //public int DeviceID { get; set; }
+
+ //public int Type { get; set; }
+
+ //public string IsValid { get; set; }
+
+ //public string Password { get; set; }
+
+ //public string Region { get; set; }
+
+
+
}
}
--
Gitblit v1.8.0