From 75c1e0d9f4e00edc2c1b915237b8bcee944b1652 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期四, 04 六月 2020 15:17:28 +0800
Subject: [PATCH] 2020-06-04 1.更新

---
 Crabtree/SmartHome/HDL/Operation/ResponseEntity/RegionInfoRes.cs |  103 ++++++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 89 insertions(+), 14 deletions(-)

diff --git a/Crabtree/SmartHome/HDL/Operation/ResponseEntity/RegionInfoRes.cs b/Crabtree/SmartHome/HDL/Operation/ResponseEntity/RegionInfoRes.cs
index b58ab5d..b31d6a1 100644
--- a/Crabtree/SmartHome/HDL/Operation/ResponseEntity/RegionInfoRes.cs
+++ b/Crabtree/SmartHome/HDL/Operation/ResponseEntity/RegionInfoRes.cs
@@ -2,27 +2,102 @@
 using System.Collections.Generic;
 
 namespace Shared
-{
-    [Serializable]
-    public class RegionInfoRes
-    {
+{
+	[Serializable]
+	public class RegionInfoRes
+	{
+		/// <summary>
+		/// 淇鏃PP鏁版嵁涓㈠け 鍏煎鎭㈠
+		/// </summary>
+		public int RegionID
+		{
+			set
+			{
+				if (value != 0)
+					Id = value.ToString();
+			}
+		}
+
+		public string RegionName
+		{
+			set
+			{
+				if (!string.IsNullOrEmpty(value))
+					Name = value;
+			}
+		}
+
+		public string MAC
+		{
+			set
+			{
+				if (!string.IsNullOrEmpty(value))
+				{
+					if (HomeGateways != null && HomeGateways.Count > 0)
+					{
+						HomeGateways[0].GatewayUniqueId = value;
+					}
+					else
+					{
+						var mHomeGateways = new HomeGateways() { GatewayUniqueId = value };
+						var mList = new List<HomeGateways>();
+						mList.Add(mHomeGateways);
+						HomeGateways = mList;
+					}
+				}
+			}
+		}
+	
+
         public string Id { get; set; }
      
-        public string Name { get; set; }
-
+        public string Name { get; set; }
+
         //public string MAC { get; set; }
         public List<HomeGateways> HomeGateways = new List<HomeGateways> ();
 
-         /// <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;
-
-    }
-
+         /// <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> ();

    }
+    }
+
+
+    [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