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/RegionInfoRes.cs | 25 +++++++++++++++++++------
1 files changed, 19 insertions(+), 6 deletions(-)
diff --git a/Crabtree/SmartHome/HDL/Operation/ResponseEntity/RegionInfoRes.cs b/Crabtree/SmartHome/HDL/Operation/ResponseEntity/RegionInfoRes.cs
old mode 100755
new mode 100644
index 5005184..b58ab5d
--- a/Crabtree/SmartHome/HDL/Operation/ResponseEntity/RegionInfoRes.cs
+++ b/Crabtree/SmartHome/HDL/Operation/ResponseEntity/RegionInfoRes.cs
@@ -1,15 +1,28 @@
锘縰sing System;
-
+using System.Collections.Generic;
namespace Shared
{
[Serializable]
public class RegionInfoRes
{
- public int RegionID { get; set; }
+ public string Id { get; set; }
+
+ public string Name { get; set; }
+
+ //public string MAC { get; set; }
+ public List<HomeGateways> HomeGateways = new List<HomeGateways> ();
- public string RegionName { get; set; }
-
- public string MAC;
- }
+ /// <summary>
/// 鏄惁涓哄叾浠栦富鐢ㄦ埛鍒嗕韩杩囨潵鐨勪綇瀹�
/// </summary>
public bool IsOthreShare { get; set; }
/// <summary>
/// 褰撳墠浣忓畢鏄叾浠栦富甯愬彿鍒嗕韩杩囨潵鐨勪富甯愬彿鐨勫垎甯冨紡Id
/// </summary>
public string MainUserDistributedMark { get; set; }
/// <summary>
/// 浠呭瓙璐﹀彿鐧婚檰鐨勬椂鍊欎娇鐢�,褰撱�怚sOthreShare銆戜负"true"锛屽苟涓斻�怉ccountType銆戜负"1"鏃讹紝璇ヨ处鍙锋嫢鏈夌鐞嗗憳鏉冮檺
/// </summary>
public int AccountType { get; set; }
/// <summary>
/// 缁忓害
/// </summary>
public double Longitude = 0;
/// <summary>
/// 绾害
/// </summary>
public double Latitude = 0;
+
+ }
+
+ [Serializable]
+ public class HomeGateways {
+ public string GatewayUniqueId { get; set; }
+
+ }
+
+
+ [Serializable]
public class ResidenceRes
{
public int PageIndex;
public int PageSize;
public int TotalCount;
public int TotalPages;
public bool HasPreviousPage;
public bool HasNextPage;
public string RegionName;
public List<RegionInfoRes> PageData = new List<RegionInfoRes> ();
}
}
--
Gitblit v1.8.0