From ed3bfb7462d44747230437717e8673a5192f833f Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期一, 30 十一月 2020 20:34:51 +0800
Subject: [PATCH] 2020-11-30-2

---
 HDL_ON/Entity/ResponseEntity/RegionInfoRes.cs |  209 +++++++---------------------------------------------
 1 files changed, 28 insertions(+), 181 deletions(-)

diff --git a/HDL_ON/Entity/ResponseEntity/RegionInfoRes.cs b/HDL_ON/Entity/ResponseEntity/RegionInfoRes.cs
index 7c4961b..fd73c8d 100644
--- a/HDL_ON/Entity/ResponseEntity/RegionInfoRes.cs
+++ b/HDL_ON/Entity/ResponseEntity/RegionInfoRes.cs
@@ -3,201 +3,48 @@
 
 namespace HDL_ON
 {
-    //[Serializable]
-    //public class RegionInfoRes
-    //{
-    //    public string RegionID { get; set; }
-
-    //    /// <summary>
-    //    /// 鍖哄煙鍚嶇О(濡�:骞垮窞銆佹繁鍦崇瓑)
-    //    /// </summary>
-    //    public string RegionName { get; set; }
-    //    /// <summary>
-    //    /// 浣忓畢鍚嶇О
-    //    /// </summary>
-    //    public string Name { get;set; }
-    //    /// <summary>
-    //    /// 浣忓畢鍦板潃
-    //    /// </summary>
-    //    public string Address { get; set; }
-
-    //    //{
-    //    // {
-    //    //  "Id": "1107487",
-    //    //  "HomeStatus": 2,
-    //    //  "UserGuid": "22980",
-    //    //  "Name": "鍟�",
-    //    //  "Address": null,
-    //    //  "Longitude": 0.0,
-    //    //  "Latitude": 0.0,
-    //    //  "RegionName": null,
-    //    //  "Company": null,
-    //    //  "ContactPerson": null,
-    //    //  "ContactPersonPhone": null,
-    //    //  "Remarks": null,
-    //    //  "ChangeDate": null,
-    //      //"AccountType": 0,
-    //    //  "CreatedOnUtc": "2020-05-27T06:52:03",
-    //    public bool IsOthreShare = false;
-    //    //  "MainUserDistributedMark": null,
-    //    public List<HomeGateways> homeGateways = new List<HomeGateways>();
-    //}
-
-    public class HomeGateways
-    {
-        public string GatewayUniqueId = "";
-    }
-
     [Serializable]
     public class RegionInfoRes
     {
-        /// <summary>
-        /// 浣忓畢ID
-        /// </summary>
         public string RegionID { get; set; }
+
+        /// <summary>
+        /// 鍖哄煙鍚嶇О(濡�:骞垮窞銆佹繁鍦崇瓑)
+        /// </summary>
+        public string RegionName { get; set; }
         /// <summary>
         /// 浣忓畢鍚嶇О
         /// </summary>
-        public string Name { get; set; }
+        public string Name { get;set; }
         /// <summary>
         /// 浣忓畢鍦板潃
         /// </summary>
         public string Address { get; set; }
-        /// <summary>
-        /// 鏄惁涓哄叾浠栦富鐢ㄦ埛鍒嗕韩杩囨潵鐨勪綇瀹�
-        /// </summary>
-        public bool IsOthreShare = false;
-        /// <summary>
-        /// 
-        /// </summary>
-        public List<HomeGateways> homeGateways = new List<HomeGateways>();
 
-        //2020-11-13 鏂板
-        /// <summary>
-        /// 浠呭瓙璐﹀彿鐧婚檰鐨勬椂鍊欎娇鐢�,褰撱�怚sOthreShare銆戜负"true"锛�
-        /// 瀛愯处鎴风被鍨� 1.ORDINARY 2.DEBUG 3.ADMIN
-        /// </summary>
-        public string accountType;
-        /// <summary>
-        /// 鏄惁鏀寔杩滅▼
-        /// </summary>
-        public bool isRemoteControl;
-        /// <summary>
-        /// 缁忓害
-        /// </summary>
-        public double longitude;
-        /// <summary>
-        /// 绾害
-        /// </summary>
-        public double latitude;
-        /// <summary>
-        /// 浜や粯鐘舵��
-        /// </summary>
-        public string deliverstatus;
-        /// <summary>
-        /// 浣忓畢绫诲瀷 Zigbee, Buspro, A
-        /// </summary>
-        public string homeType;
-        /// <summary>
-        /// 
-        /// </summary>
-        public string createonutc;
-        /// <summary>
-        /// 鍖哄煙鏈嶅姟鍣�
-        /// </summary>
-        public string regionUrl;
-        /// <summary>
-        /// 鍖哄煙鏈嶅姟鍣�
-        /// </summary>
-        public string emqUrl;
-        /// <summary>
-        /// 浣忓畢鍖哄煙Id
-        /// </summary>
-        public string homeRegionId;
-        /// <summary>
-        /// 浣忓畢鍖哄煙鍚嶅瓧
-        /// </summary>
-        public string homeRegionName;
-        ///// <summary>
-        ///// 鏄惁缁戝畾缃戝叧
-        ///// </summary>
-        //public bool isBindGateway;
+        //{
+        // {
+        //  "Id": "1107487",
+        //  "HomeStatus": 2,
+        //  "UserGuid": "22980",
+        //  "Name": "鍟�",
+        //  "Address": null,
+        //  "Longitude": 0.0,
+        //  "Latitude": 0.0,
+        //  "RegionName": null,
+        //  "Company": null,
+        //  "ContactPerson": null,
+        //  "ContactPersonPhone": null,
+        //  "Remarks": null,
+        //  "ChangeDate": null,
+          //"AccountType": 0,
+        //  "CreatedOnUtc": "2020-05-27T06:52:03",
+        public bool IsOthreShare = false;
+        //  "MainUserDistributedMark": null,
+        public List<HomeGateways> homeGateways = new List<HomeGateways>();
     }
 
-    /// <summary>
-    /// 鏂颁簯绔綇瀹呭垪琛ㄨ繑鍥炲瓧娈�
-    /// </summary>
-    [Serializable]
-    public class RegionInfoResNew
+    public class HomeGateways
     {
-        /// <summary>
-        /// 浣忓畢ID
-        /// </summary>
-        public string Id;
-        /// <summary>
-        /// 浣忓畢鍚嶅瓧
-        /// </summary>
-        public string homeName;
-        /// <summary>
-        /// 鏄惁涓哄叾浠栦富鐢ㄦ埛鍒嗕韩杩囨潵鐨勪綇瀹�
-        /// </summary>
-        public bool IsOtherShare;
-        /// <summary>
-        /// 浠呭瓙璐﹀彿鐧婚檰鐨勬椂鍊欎娇鐢�,褰撱�怚sOthreShare銆戜负"true"锛�
-        /// 瀛愯处鎴风被鍨� 1.ORDINARY 2.DEBUG 3.ADMIN
-        /// </summary>
-        public string accountType;
-        /// <summary>
-        /// 鏄惁鏀寔杩滅▼
-        /// </summary>
-        public bool isRemoteControl;
-        /// <summary>
-        /// 浣忓畢绌洪棿缁撴瀯Id
-        /// </summary>
-        public string structId;
-        /// <summary>
-        /// 缁忓害
-        /// </summary>
-        public double longitude;
-        /// <summary>
-        /// 绾害
-        /// </summary>
-        public double latitude;
-        /// <summary>
-        /// 浜や粯鐘舵��
-        /// </summary>
-        public string deliverstatus;
-        /// <summary>
-        /// 浣忓畢绫诲瀷 Zigbee, Buspro, A
-        /// </summary>
-        public string homeType;
-        /// <summary>
-        /// 
-        /// </summary>
-        public string createonutc;
-        /// <summary>
-        /// 鍖哄煙鏈嶅姟鍣�
-        /// </summary>
-        public string regionUrl;
-        /// <summary>
-        /// 鍖哄煙鏈嶅姟鍣�
-        /// </summary>
-        public string emqUrl;
-        /// <summary>
-        /// 浣忓畢鍖哄煙Id
-        /// </summary>
-        public string homeRegionId;
-        /// <summary>
-        /// 浣忓畢鍖哄煙鍚嶅瓧
-        /// </summary>
-        public string homeRegionName;
-        /// <summary>
-        /// 鏄惁缁戝畾缃戝叧
-        /// </summary>
-        public bool isBindGateway;
-        /// <summary>
-        /// 浣忓畢鍦板潃
-        /// </summary>
-        public string homeAddress;
+        public string GatewayUniqueId = "";
     }
 }

--
Gitblit v1.8.0