From 60fea1a35f8bfd2eb1399cae05d853b93b3674f9 Mon Sep 17 00:00:00 2001 From: 陈嘉乐 <cjl@hdlchina.com.cn> Date: 星期五, 03 一月 2020 13:47:35 +0800 Subject: [PATCH] 2020-01-03 1.增加信mqtt网关设备类型支持。 2.住宅ID改为string类型。 --- Crabtree/SmartHome/HDL/Operation/ResponseEntity/SendJson.cs | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Crabtree/SmartHome/HDL/Operation/ResponseEntity/SendJson.cs b/Crabtree/SmartHome/HDL/Operation/ResponseEntity/SendJson.cs index 3c0b96c..46e5190 100644 --- a/Crabtree/SmartHome/HDL/Operation/ResponseEntity/SendJson.cs +++ b/Crabtree/SmartHome/HDL/Operation/ResponseEntity/SendJson.cs @@ -23,7 +23,7 @@ { //鍙傛暟锛� MAC 绫诲瀷锛歴tring RegionID 绫诲瀷锛歩nt public string MAC; - public int RegionID; + public string RegionID; } #endregion @@ -335,7 +335,7 @@ public class EditHomeObj { public string Name;// 浣忓畢鍖哄煙鍚嶇О string 鏄� - public int Id;// 浣忓畢鍖哄煙缂栧彿 Int 鏄� + public string Id;// 浣忓畢鍖哄煙缂栧彿 Int 鏄� } #endregion #region EditMACByON 淇敼浣忓畢缁戝畾鐨刴ac @@ -362,7 +362,7 @@ /// <summary> /// Home 鐨刬d /// </summary> - public int RegionID; + public string RegionID; public bool IsReBind; @@ -375,7 +375,7 @@ [System.Serializable] public class DeleteHomeObj { - public int Id;// 浣忓畢鍖哄煙缂栧彿 int 鏄� + public string Id;// 浣忓畢鍖哄煙缂栧彿 int 鏄� } #endregion @@ -390,7 +390,7 @@ public string Password;// 涓�绔彛鐨勮繙绋嬪瘑鐮� string 鏄� public string UserName;// 涓�绔彛鐢ㄦ埛鍚� string 鏄� public string ProjectName;// 涓�绔彛宸ョ▼鍚� string 鏄� - public int RegionID;// 浣忓畢鍖哄煙缂栧彿 int 鏄� + public string RegionID;// 浣忓畢鍖哄煙缂栧彿 int 鏄� } #endregion #region UploadDevices 1.31涓婁紶璁惧淇℃伅 鍔熻兘鎻忚堪锛氫笂浼犺澶囦俊鎭�� @@ -410,7 +410,7 @@ public int DeviceID;// 璁惧鍙� int 鏄� public int LoopID;// 鍥炶矾鍙� int 鏄� public string MAC;// 闇�瑕佺粦瀹氱殑涓�绔彛MAC鐮� string 鏄� - public int RegionID;// 浣忓畢鍖哄煙缂栧彿 Int 鏄� + public string RegionID;// 浣忓畢鍖哄煙缂栧彿 Int 鏄� } #endregion @@ -445,7 +445,7 @@ [System.Serializable] public class GatewayByRegionListObj { - public int RegionID;// 浣忓畢鍖哄煙缂栧彿 int 鏄� + public string RegionID;// 浣忓畢鍖哄煙缂栧彿 int 鏄� } #endregion #region DeviceList 1.34璇诲彇璁惧淇℃伅鍒楄〃 鍔熻兘鎻忚堪锛氳鍙栧綋鍓嶇敤鎴疯澶囧垪琛� @@ -490,7 +490,7 @@ /// <summary> /// 鍖哄煙ID /// </summary> - public int LevelID ; + public string LevelID ; /// <summary> /// 澶囦唤鐩綍鍚嶇О /// </summary> @@ -507,7 +507,7 @@ /// <summary> /// 鍖哄煙ID /// </summary> - public int LevelID; + public string LevelID; } /// <summary> -- Gitblit v1.8.0