From 1f5636d69332170ea3a41c76c9519f6ff6f0a8d9 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 28 十月 2019 15:40:30 +0800
Subject: [PATCH] 合并了代码

---
 ZigbeeApp/Shared/R.cs |  588 +++++++++++++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 471 insertions(+), 117 deletions(-)

diff --git a/ZigbeeApp/Shared/R.cs b/ZigbeeApp/Shared/R.cs
index 08e348f..990a82a 100755
--- a/ZigbeeApp/Shared/R.cs
+++ b/ZigbeeApp/Shared/R.cs
@@ -277,9 +277,16 @@
         public readonly static int SetTempPasswordTip4 = 190;
         public readonly static int SetTempPasswordTip5 = 191;
         public readonly static int SetTempPasswordTip1 = 192;
-
-
-
+        public readonly static int NextStepXm = 193;
+        public readonly static int DeviceRemarkXm = 194;
+        public readonly static int SetSuccessXm = 195;
+        public readonly static int SetFailedXm = 196;
+        public readonly static int SetFailedXm1 = 197;
+        public readonly static int ClearFailedXm1 = 198;
+        public readonly static int ClearFailedXm = 199;
+        public readonly static int ModifyTempPasswordTip1 = 200;
+        public readonly static int ModifyTempPasswordTip2 = 201;
+        public readonly static int FirstFloor = 202;
 
         public readonly static int RemindSetting = 548;
         public readonly static int AddNewUser = 650;
@@ -538,6 +545,12 @@
         public readonly static int logictemplate = 5358;
         public readonly static int onlight = 5359;
         public readonly static int offlight = 5360;
+        public readonly static int OnOffSwitch=5361;
+        public readonly static int addlinkageevent = 5362;
+        public readonly static int editlinkageevent = 5363;
+        public readonly static int selectunlockingmode=5364;
+        public readonly static int lockaddaction = 5365;
+        public readonly static int linkageevent = 5366;
 
 
 
@@ -586,7 +599,7 @@
 		/// </summary>
 		public const int Search = 10108;
 		/// <summary>
-		/// 纭畾
+		/// 瀹屾垚
 		/// </summary>
 		public const int Complete = 10109;
 		/// <summary>
@@ -774,15 +787,55 @@
 		/// </summary>
 		public const int SelectScenePic = 11033;
 
+        #region  璁惧绫诲瀷
+        /// <summary>
+        /// 鏈煡璁惧
+        /// </summary>
+        public const int UnknowDevice = 12100;
+        /// <summary>
+        /// 缁х數鍣�
+        /// </summary>
+        public const int OnOffOutput = 12102;
+        /// <summary>
+        /// 璋冨厜鐏�
+        /// </summary>
+        public const int DimmableLight = 12103;
+        /// <summary>
+        /// 绐楀笜
+        /// </summary>
+        public const int WindowCoveringDevice = 12104;
+        /// <summary>
+        /// 绌鸿皟
+        /// </summary>
+        public const int Thermostat = 12105;
+        /// <summary>
+        /// 浼犳劅鍣�
+        /// </summary>
+        public const int IASZone = 12106;
+        /// <summary>
+        /// 绌烘皵寮�鍏�
+        /// </summary>
+        public const int AirSwitch = 12107;
+        /// <summary>
+        /// 褰╃伅
+        /// </summary>
+        public const int ColorDimmableLight = 12108;
+        /// <summary>
+        /// 涓户鍣�
+        /// </summary>
+        public const int Repeater = 12109;
 
-		#endregion
+        #endregion
 
-		#region 涓婚〉
 
-		/// <summary>
-		/// 鎴块棿鍒楄〃
-		/// </summary>
-		public const int RoomList = 13100;
+        #endregion
+
+        #region 涓婚〉
+
+        /// <summary>
+        /// 鎴块棿鍒楄〃
+        /// </summary>
+        public const int RoomList = 13100;
 
 		/// <summary>
 		/// 閫夋嫨妤煎眰
@@ -829,7 +882,7 @@
 		/// </summary>
 		public const int Open = 13111;
 		/// <summary>
-		/// 鍏�
+		/// 鍏抽棴
 		/// </summary>
 		public const int Close = 13112;
 		/// <summary>
@@ -872,10 +925,87 @@
         /// 涓轰綘鐨勫姩浣滃垱寤烘椂闂撮棿闅�
         /// </summary>
         public const int SelectTimeForAction = 13122;
-
-
+        /// <summary>
+        /// 鍚�
+        /// </summary>
+        public const int Later = 13123;
+        /// <summary>
+        /// 鍒犻櫎
+        /// </summary>
+        public const int Delete = 13124;
+        /// <summary>
+        /// 鍏�
+        /// </summary>
+        public const int Shut = 13125;
+        /// <summary>
+		/// 閫夋嫨椋庨��
+		/// </summary>
+		public const int SelectFanMode = 13126;
+        /// <summary>
+        /// 浣庨
+        /// </summary>
+        public const int Fan_Low = 13127;
+        /// <summary>
+        /// 涓
+        /// </summary>
+        public const int Fan_Middle = 13128;
+        /// <summary>
+        /// 楂橀
+        /// </summary>
+        public const int Fan_Height = 13129;
+        /// <summary>
+        /// 閫夋嫨妯″紡
+        /// </summary>
+        public const int SelectMode = 13130;
+        /// <summary>
+        /// 鑷姩
+        /// </summary>
+        public const int Mode_Auto = 13131;
+        /// <summary>
+        /// 鍒跺喎
+        /// </summary>
+        public const int Mode_Cool = 13132;
+        /// <summary>
+        /// 鍒剁儹
+        /// </summary>
+        public const int Mode_Heat = 13133;
+        /// <summary>
+        /// 闄ゆ箍
+        /// </summary>
+        public const int Mode_Dry = 13134;
+        /// <summary>
+        /// 閫侀
+        /// </summary>
+        public const int Mode_FanOnly = 13135;
+        /// <summary>
+        /// 瀹ゆ俯
+        /// </summary>
+        public const int IndoorTemperature = 13136;
+        /// <summary>
+        /// 绌鸿皟宸茬粡鍏抽棴锛岃鍏堟墦寮�
+        /// </summary>
+        public const int TheACIsClose = 13137;
+        /// <summary>
+        /// 娣诲姞鍦烘櫙澶辫触
+        /// </summary>
+        public const int AddSceneFail = 13138;
+        /// <summary>
+        /// 璇ュ満鏅凡瀛樺湪
+        /// </summary>
+        public const int TheSceneHadExist = 13139;
+        /// <summary>
+        /// 缂栬緫
+        /// </summary>
+        public const int Editor = 13140;
+        /// <summary>
+        /// 缂栬緫鍦烘櫙
+        /// </summary>
+        public const int EditorScene = 13141;
 
         #endregion
+
+
+
 
         /// <summary>
         /// 鍠滅埍
@@ -959,7 +1089,7 @@
 		//*****public static readonly int Function = 11038;
 
 
-		public static readonly int Delete = 11041;
+		
 		public static readonly int AddFunction = 11042;
 
 		public static readonly int Light = 11044;
@@ -1041,13 +1171,14 @@
 		/// 鏃堕棿闂撮殧
 		/// </summary>
 		public static readonly int TimeSpan = 11093;
-		public static readonly int TheSceneHadExist = 11094;
-		public static readonly int AddSceneFail = 11095;
+       
 
-		/// <summary>
-		/// 鑷畾涔�
-		/// </summary>
-		public static readonly int Custom = 11098;
+
+
+        /// <summary>
+        /// 鑷畾涔�
+        /// </summary>
+        public static readonly int Custom = 11098;
 
 		/// <summary>
 		/// 鍙栨秷鏀惰棌
@@ -1176,99 +1307,10 @@
 		///褰撳墠娌℃湁鍙互娣诲姞鍒拌鎴块棿鐨勮澶�
 		/// </summary>
 		public static readonly int NoDeviceCanAddToRoom = 12034;
-		/// <summary>
-		/// 閫夋嫨椋庨��
-		/// </summary>
-		public static readonly int SelectFanMode = 12035;
-		/// <summary>
-		/// 浣庨
-		/// </summary>
-		public static readonly int Fan_Low = 12036;
-		/// <summary>
-		/// 涓
-		/// </summary>
-		public static readonly int Fan_Middle = 12037;
-		/// <summary>
-		/// 楂橀
-		/// </summary>
-		public static readonly int Fan_Height = 12038;
-		/// <summary>
-		/// 閫夋嫨妯″紡
-		/// </summary>
-		public static readonly int SelectMode = 12039;
-		/// <summary>
-		/// 鑷姩
-		/// </summary>
-		public static readonly int Mode_Auto = 12040;
-		/// <summary>
-		/// 鍒跺喎
-		/// </summary>
-		public static readonly int Mode_Cool = 12041;
-		/// <summary>
-		/// 鍒剁儹
-		/// </summary>
-		public static readonly int Mode_Heat = 12042;
-		/// <summary>
-		/// 闄ゆ箍
-		/// </summary>
-		public static readonly int Mode_Dry = 12043;
-		/// <summary>
-		/// 閫侀
-		/// </summary>
-		public static readonly int Mode_FanOnly = 12044;
-		/// <summary>
-		/// 瀹ゆ俯
-		/// </summary>
-		public static readonly int IndoorTemperature = 12045;
-		/// <summary>
-		/// 绌鸿皟宸茬粡鍏抽棴锛岃鍏堟墦寮�
-		/// </summary>
-		public static readonly int TheACIsClose = 12046;
+		
 		
 
-		#region  璁惧绫诲瀷
-		/// <summary>
-		/// 鏈煡璁惧
-		/// </summary>
-		public static readonly int UnknowDevice = 12100;
-		/// <summary>
-		/// 鎺у埗闈㈡澘
-		/// </summary>
-		public static readonly int OnOffSwitch = 12101;
-		/// <summary>
-		/// 缁х數鍣�
-		/// </summary>
-		public static readonly int OnOffOutput = 12102;
-		/// <summary>
-		/// 璋冨厜鐏�
-		/// </summary>
-		public static readonly int DimmableLight = 12103;
-		/// <summary>
-		/// 绐楀笜
-		/// </summary>
-		public static readonly int WindowCoveringDevice = 12104;
-		/// <summary>
-		/// 绌鸿皟
-		/// </summary>
-		public static readonly int Thermostat = 12105;
-		/// <summary>
-		/// 浼犳劅鍣�
-		/// </summary>
-		public static readonly int IASZone = 12106;
-		/// <summary>
-		/// 绌烘皵寮�鍏�
-		/// </summary>
-		public static readonly int AirSwitch = 12107;
-		/// <summary>
-		/// 褰╃伅
-		/// </summary>
-		public static readonly int ColorDimmableLight = 12108;
-		/// <summary>
-		/// 涓户鍣�
-		/// </summary>
-		public static readonly int Repeater = 12109;
-
-		#endregion
+		
 
 		/// <summary>
 		/// 褰撳墠鎴块棿娌℃湁璁惧鍙互娣诲姞鍒板満鏅�
@@ -4098,11 +4140,11 @@
         /// </summary>
         public const int uSearchGatewayFailMsg1 = 15779;
         /// <summary>
-        /// 1.闀挎寜ZB/RST閿�20绉掞紝缃戝叧鎭㈠鍑哄巶璁剧疆锛屾寚绀虹伅鍏ㄩ儴鐔剓0}鐏悗锛岄噸鏂板叆缃戙��
+        /// 1.闀挎寜ZB/RST閿�20绉掞紝缃戝叧鎭㈠鍑哄巶璁剧疆锛屾寚绀虹伅鍏ㄩ儴鐔勭伃鍚庯紝閲嶆柊鍏ョ綉銆�
         /// </summary>
         public const int uSearchGatewayFailMsg2 = 15780;
         /// <summary>
-        /// 2.鐐规寜HID/WCFG閿紝杩涘叆缃戝叧鎹㈢粦妯″紡锛岀郴缁熸寚绀虹伅蹇棯{0}5绉掋��
+        /// 2.鐐规寜HID/WCFG閿紝杩涘叆缃戝叧鎹㈢粦妯″紡锛岀郴缁熸寚绀虹伅蹇棯5绉掋��
         /// </summary>
         public const int uSearchGatewayFailMsg3 = 15781;
         /// <summary>
@@ -4133,6 +4175,274 @@
         /// 姝ｅ湪鎹㈢粦缃戝叧锛岃绋嶅�欌��
         /// </summary>
         public const int uIsReBindingPleaseWaiting = 15788;
+        /// <summary>
+        /// 璁惧閰嶇疆
+        /// </summary>
+        public const int uDeviceSettion = 15789;
+        /// <summary>
+        /// 鏁版嵁涓婁紶涓庝笅杞�
+        /// </summary>
+        public const int uDataUploadAndDownLoad = 15790;
+        /// <summary>
+        /// 缃戝叧ID
+        /// </summary>
+        public const int uGatewayID = 15791;
+        /// <summary>
+        /// 鍗忚皟鍣∕AC
+        /// </summary>
+        public const int uCoordinatorMac = 15792;
+        /// <summary>
+        /// 鍗忚皟鍣ㄤ俊閬�
+        /// </summary>
+        public const int uCoordinatorChannel = 15793;
+        /// <summary>
+        /// 鍗忚鍣≒anID
+        /// </summary>
+        public const int uCoordinatorPanid = 15794;
+        /// <summary>
+        /// 缁胯壊鎸囩ず鐏紦鎱㈤棯鐑�
+        /// </summary>
+        public const int uGreanPilotLampLinghtSlowly = 15795;
+        /// <summary>
+        /// 闀挎寜{0}绉�
+        /// </summary>
+        public const int uLongClickSomeSecond = 15796;
+        /// <summary>
+        /// 鏂瑰悜涓庨檺浣�
+        /// </summary>
+        public const int uDirectionAndLimit = 15797;
+        /// <summary>
+        /// 鎵嬫媺鎺у埗
+        /// </summary>
+        public const int uHandPullControl = 15798;
+        /// <summary>
+        /// 鍒囨崲鎵嬫媺鎺у埗澶辫触
+        /// </summary>
+        public const int uChangeHandPullControlFail = 15799;
+        /// <summary>
+        /// 鏂瑰悜
+        /// </summary>
+        public const int uDirection = 15800;
+        /// <summary>
+        /// 闄愪綅
+        /// </summary>
+        public const int uLimit = 15801;
+        /// <summary>
+        /// 寮�闄愪綅
+        /// </summary>
+        public const int uOpenLimit = 15802;
+        /// <summary>
+        /// 鍚堥檺浣�
+        /// </summary>
+        public const int uCloseLimit = 15803;
+        /// <summary>
+        /// 閲嶇疆鐢垫満
+        /// </summary>
+        public const int uResetElectricalMachinery = 15804;
+        /// <summary>
+        /// 閲嶇疆鐢垫満灏嗗垵濮嬪寲{0}鏂瑰悜涓庨檺浣嶈缃紝纭缁х画锛�
+        /// </summary>
+        public const int uResetElectricalMachineryMsg = 15805;
+        /// <summary>
+        /// 閫夋嫨鏂瑰悜
+        /// </summary>
+        public const int uDirectionSelect = 15806;
+        /// <summary>
+        /// 姝ｅ悜
+        /// </summary>
+        public const int uForwardDirection = 15807;
+        /// <summary>
+        /// 鍙嶅悜
+        /// </summary>
+        public const int uReverseDirection = 15808;
+        /// <summary>
+        /// 绐楀笜鏂瑰悜璁剧疆澶辫触
+        /// </summary>
+        public const int uSetCurtainDirectionFail = 15809;
+        /// <summary>
+        /// 鑾峰彇绐楀笜鏂瑰悜涓庨檺浣嶈缃け璐�
+        /// </summary>
+        public const int uGetCurtainDirectionAndLimitSettionFail = 15810;
+        /// <summary>
+        /// 閲嶇疆绐楀笜闄愪綅鐐瑰け璐�
+        /// </summary>
+        public const int uDeleteCurtainLimitFail = 15811;
+        /// <summary>
+        /// 璁剧疆绐楀笜闄愪綅鐐瑰け璐�
+        /// </summary>
+        public const int uCommitCurtainLimitFail = 15812;
+        /// <summary>
+        /// 纭褰撳墠浣嶇疆{0}涓哄紑闄愪綅?
+        /// </summary>
+        public const int uCommitCurtainOpenLimitMsg = 15813;
+        /// <summary>
+        /// 纭褰撳墠浣嶇疆{0}涓哄悎闄愪綅?
+        /// </summary>
+        public const int uCommitCurtainCloseLimitMsg = 15814;
+        /// <summary>
+        /// 閲嶇疆绐楀笜澶辫触
+        /// </summary>
+        public const int uRestoreCurtainFail = 15815;
+        /// <summary>
+        /// 涓婇檺浣�
+        /// </summary>
+        public const int uUpLimit = 15816;
+        /// <summary>
+        /// 涓嬮檺浣�
+        /// </summary>
+        public const int uDownLimit = 15817;
+        /// <summary>
+        /// 纭褰撳墠浣嶇疆涓轰笂闄愪綅?
+        /// </summary>
+        public const int uCommitCurtainUpLimitMsg = 15818;
+        /// <summary>
+        /// 纭褰撳墠浣嶇疆涓轰笅闄愪綅?
+        /// </summary>
+        public const int uCommitCurtainDownLimitMsg = 15819;
+        /// <summary>
+        /// 濡傛灉婊¤冻
+        /// </summary>
+        public const int uIfSatisfied = 15820;
+        /// <summary>
+        /// 灏变細
+        /// </summary>
+        public const int uResultDo = 15821;
+        /// <summary>
+        /// 瑙﹀彂鐩爣
+        /// </summary>
+        public const int uTriggerTarget = 15822;
+        /// <summary>
+        /// 寤舵椂
+        /// </summary>
+        public const int uDelayed = 15823;
+        /// <summary>
+        /// 鍒�
+        /// </summary>
+        public const int uMinute = 15824;
+        /// <summary>
+        /// 绉�
+        /// </summary>
+        public const int uSecond = 15825;
+        /// <summary>
+        /// 鐓ф槑绛夌骇
+        /// </summary>
+        public const int uLightLevel = 15826;
+        /// <summary>
+        /// 浣�
+        /// </summary>
+        public const int uLow = 15827;
+        /// <summary>
+        /// 楂�
+        /// </summary>
+        public const int uHigh = 15828;
+        /// <summary>
+        /// 娌℃湁鍙互娣诲姞鐨勭洰鏍�
+        /// </summary>
+        public const int uNotHadAddTarget = 15829;
+        /// <summary>
+        /// 閫嗘椂閽堟嫥寮�鐢垫睜鍚庣洊
+        /// </summary>
+        public const int uUnscrewTheBatteryAnticlockwise = 15830;
+        /// <summary>
+        /// 缁胯壊鎸囩ず鐏揩閫熼棯鐑�
+        /// </summary>
+        public const int uGreanPilotLampLinghtQuickly = 15831;
+        /// <summary>
+        /// 宸ヤ綔
+        /// </summary>
+        public const int uWork = 15832;
+        /// <summary>
+        /// 閰嶅
+        /// </summary>
+        public const int uPair = 15833;
+        /// <summary>
+        /// 绾㈣壊鎸囩ず鐏棯鐑�
+        /// </summary>
+        public const int uRedPilotLampLinght = 15834;
+        /// <summary>
+        /// 鎸囩ず鐏彉缁块棯鐑�
+        /// </summary>
+        public const int uPilotLampTurnGreenAndBlinks = 15835;
+        /// <summary>
+        /// 闀挎寜{0}绉�(鎸夐敭/LED)
+        /// </summary>
+        public const int uLongClickPanelLEDSomeSecond = 15836;
+        /// <summary>
+        /// 璁惧娣诲姞鎸囧紩
+        /// </summary>
+        public const int uAddDeviceHelp1 = 15837;
+        /// <summary>
+        /// 鍙兘鐢变簬褰撳墠缃戠粶杈冨樊鎴栬澶囧凡琚粬浜虹粦瀹氥��
+        /// </summary>
+        public const int uAddDeviceHelp2 = 15838;
+        /// <summary>
+        /// 1.璇风‘淇濇墜鏈轰笌璁惧涔嬮棿鐨勮窛绂昏冻澶熻繎锛屽苟涓斿懆鍥寸綉缁滅幆澧冩病鏈夊己骞叉壈銆�
+        /// </summary>
+        public const int uAddDeviceHelp3 = 15839;
+        /// <summary>
+        /// 2.鍚屾椂闇�纭搴旂敤鐨勫畾浣嶆潈闄愭湭琚叧闂�傝嫢鎵嬪姩鍏抽棴浜嗗簲鐢ㄥ畾浣嶆潈闄愬彲鑳藉鑷存棤娉曡嚜鎷斿彂鐜拌澶囥��
+        /// </summary>
+        public const int uAddDeviceHelp4 = 15840;
+        /// <summary>
+        /// 3.濡傛灉浠嶅缁堟棤娉曞彂鐜拌澶囷紝鍙兘鍥犱负璁惧宸茬粡琚粬浜虹粦瀹氫簡銆傚鏋滀綘骞朵笉娓呮鏄皝杩炴帴浜嗚澶囷紝鍙互杩涜閲嶇疆锛岄噸缃柟寮忚鏌ラ槄璇存槑涔︼紝鏍规嵁鎸囧紩鎿嶄綔銆�
+        /// </summary>
+        public const int uAddDeviceHelp5 = 15841;
+        /// <summary>
+		/// 鎴块棿鍒楄〃
+		/// </summary>
+		public const int uRoomList = 15842;
+        /// <summary>
+        /// 杩樻病鏈夋坊鍔犲満鏅摝
+        /// </summary>
+        public const int uDoNotHadAddScenceMsg = 15843;
+        /// <summary>
+        /// 杩樻病鏈夋坊鍔犺澶囧摝
+        /// </summary>
+        public const int uDoNotHadAddDeviceMsg = 15844;
+        /// <summary>
+        /// 鎴块棿鍚嶇О宸茬粡瀛樺湪
+        /// </summary>
+        public const int uRoomNameIsExist = 15845;
+        /// <summary>
+        /// 瀹ゅ唴鏈鸿缃�
+        /// </summary>
+        public const int uIndoorUnitSettion = 15846;
+        /// <summary>
+        /// 绌鸿皟妯″紡
+        /// </summary>
+        public const int uAirConditionerMode = 15847;
+        /// <summary>
+        /// 鎽嗛
+        /// </summary>
+        public const int uAirConditionerSwing = 15848;
+        /// <summary>
+        /// 鍒跺喎
+        /// </summary>
+        public const int uMode_Cool = 15849;
+        /// <summary>
+        /// 鍒剁儹
+        /// </summary>
+        public const int uMode_Heat = 15850;
+        /// <summary>
+		/// 鑷姩
+		/// </summary>
+		public const int uMode_Auto = 15851;
+        /// <summary>
+        /// 閫侀
+        /// </summary>
+        public const int uMode_FanOnly = 15852;
+        /// <summary>
+        /// 闄ゆ箍
+        /// </summary>
+        public const int uMode_Dry = 15853;
+        /// <summary>
+        /// 鎵撳紑绌鸿皟澶辫触
+        /// </summary>
+        public const int uOpenAirConditionerFail = 15854;
+        /// <summary>
+        /// 鍏抽棴绌鸿皟澶辫触
+        /// </summary>
+        public const int uCloseAirConditionerFail = 15855;
 
         //鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄帴鍙ｇ殑杩斿洖淇℃伅缈昏瘧,浠�18000寮�濮嬧槄鈽呪槄鈽�
         /// <summary>
@@ -4260,9 +4570,13 @@
         /// </summary>
         public const int uShareData_Fail = 18049;
         /// <summary>
-        /// 涓嶈兘娣诲姞鑷繁涓哄瓙璐﹀彿
+        /// 涓嶈兘鎶婅嚜宸辨坊鍔犱负鎴愬憳
         /// </summary>
         public const int BindSubAccount_SameAccount = 18050;
+        /// <summary>
+        /// 涓嶈兘鎶婁富璐﹀彿娣诲姞涓烘垚鍛�
+        /// </summary>
+        public const int BindSubAccount_NoAddMainAccount = 18051;
 
 
         //鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄澶囩殑鍏ョ綉姝ラ,浠�21000寮�濮嬧槄鈽呪槄鈽�
@@ -4291,6 +4605,46 @@
         /// 鍥涙寜閿潰鏉� -> 闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝鎸囩ず鐏彉缁裤�侀棯鐑亄0}杩涘叆閰嶇綉鐘舵�併�傜豢鐏揩闂�3绉掑垯閰嶇綉鎴愬姛
         /// </summary>
         public const int uAddFourButtonPanelMsg = 21005;
+        /// <summary>
+        /// Zigbee鏅鸿兘寮�鍚堝笜鐢垫満 -> 闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝鎸囩ず鐏瘂0}鍙樼豢闂儊锛屽垯杩涘叆閰嶇綉鐘舵�亄0}缁跨伅鐔勭伃鍒欓厤缃戞垚鍔�
+        /// </summary>
+        public const int uAddCurtainAutoOpenMsg = 21006;
+        /// <summary>
+        /// Zigbee鏅鸿兘绠＄姸鐢垫満 -> 闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝鎸囩ず鐏瘂0}鍙樼豢闂儊锛屽垯杩涘叆閰嶇綉鐘舵�亄0}缁跨伅鐔勭伃鍒欓厤缃戞垚鍔�
+        /// </summary>
+        public const int uAddCurtainSiphonateMsg = 21007;
+        /// <summary>
+        /// 绾㈠浼犳劅鍣� -> 闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝缁胯壊蹇棯{0}杩涘叆閰嶇綉鐘舵�侊紝缁跨伅甯镐寒鍒欏叆缃戞垚鍔�
+        /// </summary>
+        public const int uAddSensorInfraredMsg = 21008;
+        /// <summary>
+        /// 闂ㄧ獥浼犳劅鍣� -> 闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝缁胯壊蹇棯{0}杩涘叆閰嶇綉鐘舵�侊紝缁跨伅甯镐寒鍒欏叆缃戞垚鍔�
+        /// </summary>
+        public const int uAddSensorDoorWindowMsg = 21009;
+        /// <summary>
+        /// 鐕冩皵浼犳劅鍣� -> 闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝缁胯壊蹇棯{0}杩涘叆閰嶇綉鐘舵�侊紝缁跨伅甯镐寒鍒欏叆缃戞垚鍔�
+        /// </summary>
+        public const int uAddSensorCarbonMonoxideMsg = 21010;
+        /// <summary>
+        /// 鐑熼浘浼犳劅鍣� -> 闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝缁胯壊蹇棯{0}杩涘叆閰嶇綉鐘舵�侊紝缁跨伅甯镐寒鍒欏叆缃戞垚鍔�
+        /// </summary>
+        public const int uAddSensorFireMsg = 21011;
+        /// <summary>
+        /// 姘存蹈浼犳劅鍣� -> 闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝缁胯壊蹇棯{0}杩涘叆閰嶇綉鐘舵�侊紝缁跨伅甯镐寒鍒欏叆缃戞垚鍔�
+        /// </summary>
+        public const int uAddSensorWaterMsg = 21012;
+        /// <summary>
+        /// 绌烘皵寮�鍏� -> 鎸夐敭浠庡伐浣滄ā寮忔嫧鍒伴厤瀵规ā寮�,5绉掑悗绾㈢伅{0}鎱㈤棯鐑佹椂鎷ㄥ洖宸ヤ綔妯″紡,{0}杩涘叆閰嶇綉妯″紡,绾㈢伅甯镐寒鍒欓厤缃戞垚鍔�
+        /// </summary>
+        public const int uAddAirSwitchCloudContrMsg = 21013;
+        /// <summary>
+        /// 涓户鍣� -> 闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝鎸囩ず鐏彉缁块棯鐑亄0}杩涘叆閰嶇綉鐘舵�侊紝缁跨伅鐔勭伃鍒欏叆缃戞垚鍔�
+        /// </summary>
+        public const int uAddRepeaterZigbeeMsg = 21014;
+        /// <summary>
+        /// 绌鸿皟 -> 闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝鎸囩ず鐏瘂0}鍙樼豢闂儊,杩涘叆閰嶇綉鐘舵�亄0}缁跨伅姣�5绉掗棯鐑佷竴娆″垯鍏ョ綉鎴愬姛
+        /// </summary>
+        public const int uAddAirConditionerZbGatewayMsg = 21015;
 
         //鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄ā鍧桰D鐨勭炕璇戝悕瀛�,浠�30000寮�濮嬧槄鈽呪槄鈽�
         /// <summary>
@@ -4306,7 +4660,7 @@
         /// </summary>
         public const int uDeviceModelId1302 = 30002;
         /// <summary>
-        /// 闀滃儚ID涓�1304(鏆傚畾)鐨勮澶囩殑榛樿鍚嶅瓧锛氭按渚典紶鎰熷櫒
+        /// 闀滃儚ID涓�1304(鏆傚畾)鐨勮澶囩殑榛樿鍚嶅瓧锛氭按娴镐紶鎰熷櫒
         /// </summary>
         public const int uDeviceModelId1304 = 30003;
         /// <summary>
@@ -4318,11 +4672,11 @@
         /// </summary>
         public const int uDeviceModelId1301 = 30005;
         /// <summary>
-        /// 闀滃儚ID涓�4100鐨勮澶囩殑榛樿鍚嶅瓧锛歓IGBEE寰柇浜戞帶鍒跺櫒
+        /// 闀滃儚ID涓�4100鐨勮澶囩殑榛樿鍚嶅瓧锛歓igbee寰柇浜戞帶鍒跺櫒
         /// </summary>
         public const int uDeviceModelId4100 = 30006;
         /// <summary>
-        /// 闀滃儚ID涓�100鐨勮澶囩殑榛樿鍚嶅瓧锛歓IGBEE鏅鸿兘寮�鍚堝笜鐢垫満
+        /// 闀滃儚ID涓�100鐨勮澶囩殑榛樿鍚嶅瓧锛歓igbee鏅鸿兘寮�鍚堝笜鐢垫満
         /// </summary>
         public const int uDeviceModelId100 = 30007;
         /// <summary>

--
Gitblit v1.8.0