From f60ce72c3c29c7d31a046795c88ec39a69e73d45 Mon Sep 17 00:00:00 2001 From: JLChen <551775569@qq.com> Date: 星期三, 06 一月 2021 17:33:54 +0800 Subject: [PATCH] 2021-01-06 1.替换新云端前期准备相关接口,和修改相关参数。 --- Crabtree/SmartHome/HDL/Operation/ResponseEntity/RegionInfoRes.cs | 185 +++++++++++++++++++++++++++++---------------- 1 files changed, 118 insertions(+), 67 deletions(-) diff --git a/Crabtree/SmartHome/HDL/Operation/ResponseEntity/RegionInfoRes.cs b/Crabtree/SmartHome/HDL/Operation/ResponseEntity/RegionInfoRes.cs index b31d6a1..958c190 100644 --- a/Crabtree/SmartHome/HDL/Operation/ResponseEntity/RegionInfoRes.cs +++ b/Crabtree/SmartHome/HDL/Operation/ResponseEntity/RegionInfoRes.cs @@ -6,77 +6,128 @@ [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 MAC { get; set; } - public List<HomeGateways> HomeGateways = new List<HomeGateways> (); - + /// <summary> + /// 浣忓畢ID + /// </summary> + public string Id { get; set; } + /// <summary> + /// 浣忓畢鍚嶇О + /// </summary> + public string Name { get; set; } /// <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; + public bool IsOthreShare { get; set; } + /// <summary> + /// 鏄惁鏀寔杩滅▼ + /// </summary> + public bool isRemoteControl; + /// <summary> + /// 鏄惁缁戝畾缃戝叧 + /// </summary> + public bool isBindGateway; + ///// <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 string regionUrl; + } + + /// <summary> + /// 鏂颁簯绔綇瀹呭垪琛ㄨ繑鍥炲瓧娈� + /// </summary> + [Serializable] + public class RegionInfoResNew + { + /// <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; + /// <summary> + /// 鏄惁鍏佽鍒涘缓鍦烘櫙 + /// </summary> + public bool isAllowCreateScene; } [Serializable] -- Gitblit v1.8.0