From c7698e163e43cea9e7f8ee45f8e3f91c9265cca4 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 04 十一月 2019 19:11:41 +0800
Subject: [PATCH] 合并了全部的代码
---
ZigbeeApp/Shared/R.cs | 875 +++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 718 insertions(+), 157 deletions(-)
diff --git a/ZigbeeApp/Shared/R.cs b/ZigbeeApp/Shared/R.cs
index 08e348f..e922717 100755
--- a/ZigbeeApp/Shared/R.cs
+++ b/ZigbeeApp/Shared/R.cs
@@ -261,7 +261,7 @@
public readonly static int ModigfyFailed = 175;
public readonly static int OnlyBeDeletedOnTheDevice = 176;
public readonly static int Undistributed = 177;
- public readonly static int AfterThirtySeconds = 178;
+ public readonly static int AfterFiftySeconds = 178;
//闂ㄩ攣楠岃瘉瀵嗙爜澶辫触
public readonly static int OperrateFailed = 179;
public readonly static int RemoteUnlockBindSucessTip1 = 180;
@@ -277,9 +277,17 @@
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 GwResponseOvertime = 203;
public readonly static int RemindSetting = 548;
public readonly static int AddNewUser = 650;
@@ -538,8 +546,14 @@
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;
+ public readonly static int current = 5367;
+ public readonly static int selecfoolr = 5368;
#region 鐧诲綍娉ㄥ唽
@@ -586,7 +600,7 @@
/// </summary>
public const int Search = 10108;
/// <summary>
- /// 纭畾
+ /// 瀹屾垚
/// </summary>
public const int Complete = 10109;
/// <summary>
@@ -657,6 +671,38 @@
/// 浣犵殑瀵嗙爜淇敼鎴愬姛锛岃閲嶆柊鐧诲綍
/// </summary>
public const int ResetScucessPleaseLogin = 10126;
+ /// <summary>
+ /// 璇烽�夋嫨鍖哄彿
+ /// </summary>
+ public const int PleaseSelectAreaCode = 10127;
+ /// <summary>
+ /// 鏈縺娲�
+ /// </summary>
+ public const int NOTVERIFY = 10128;
+ /// <summary>
+ /// 璇ョ敤鎴峰睘浜庤皟璇曡处鍙凤紝骞舵湭鍚敤
+ /// </summary>
+ public const int NOTENABLE = 10129;
+ /// <summary>
+ /// //鏁版嵁骞朵笉鍦ㄦHDL鍖哄煙鏈嶅姟鍣�
+ /// </summary>
+ public const int YOUDATANOISLOCALREGION = 10130;
+ /// <summary>
+ /// 璐﹀彿鎴栧瘑鐮侀敊璇�
+ /// </summary>
+ public const int USERNAMEORPWDERROR = 10131;
+ /// <summary>
+ /// 璐﹀彿涓嶅瓨鍦紝璇峰厛娉ㄥ唽
+ /// </summary>
+ public const int ACCOUNTNOEXISTS = 10132;
+ /// <summary>
+ /// 璇疯緭鍏ラ獙璇佺爜
+ /// </summary>
+ public const int PleaseInputVerificationCode = 10133;
+ /// <summary>
+ /// 鍗冲皢閫氳繃寰俊鎺堟潈鐧诲綍
+ /// </summary>
+ public const int LoginByWechat = 10134;
#endregion
@@ -774,15 +820,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 +915,7 @@
/// </summary>
public const int Open = 13111;
/// <summary>
- /// 鍏�
+ /// 鍏抽棴
/// </summary>
public const int Close = 13112;
/// <summary>
@@ -872,10 +958,115 @@
/// 涓轰綘鐨勫姩浣滃垱寤烘椂闂撮棿闅�
/// </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;
+ /// <summary>
+ /// 鏈垎閰嶅尯鍩�
+ /// </summary>
+ public const int UnallocatedArea = 13142;
+ /// <summary>
+ /// 鍔熻兘绫诲瀷
+ /// </summary>
+ public const int FunctionType = 13143;
+ /// <summary>
+ /// 澶辫触锛岃閲嶈瘯
+ /// </summary>
+ public const int FailedPleaseTryAgain = 13144;
+ /// <summary>
+ /// 鎴愬姛
+ /// </summary>
+ public const int Success = 13145;
+ /// <summary>
+ /// 榛樿鍥惧簱
+ /// </summary>
+ public const int LocalPicture = 13146;
+ /// <summary>
+ /// 鎷嶇収
+ /// </summary>
+ public const int Photograph = 13147;
+ /// <summary>
+ /// 鎴戠殑鐩稿唽
+ /// </summary>
+ public const int MyAblums = 13148;
#endregion
+
+
+
/// <summary>
/// 鍠滅埍
@@ -895,7 +1086,7 @@
public static readonly int PleaseGoToTheMailboxToActivateTheAccountNumber = 10012;
public static readonly int PleaseInputTheCorrectCellPhoneNumber = 10013;
public static readonly int PleaseInputTheCorrectVerificationCode = 10014;
- public static readonly int PleaseSelectAreaCode = 10015;
+
public static readonly int ThePhoneNumberIsNotRegisteredYetPleaseRegisterFirst = 10017;
public static readonly int LoginCodeError = 10018;
@@ -930,7 +1121,7 @@
public static readonly int LoginHadAccountPWD = 11008;
- public static readonly int PleaseInputVerificationCode = 11011;
+
@@ -959,7 +1150,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;
@@ -1001,26 +1192,7 @@
public static readonly int ModifyScene = 11078;
- /// <summary>
- /// 鏈縺娲�
- /// </summary>
- public static readonly int NOTVERIFY = 11081;
- /// <summary>
- /// 璇ョ敤鎴峰睘浜庤皟璇曡处鍙凤紝骞舵湭鍚敤
- /// </summary>
- public static readonly int NOTENABLE = 11082;
- /// <summary>
- /// //鏁版嵁骞朵笉鍦ㄦHDL鍖哄煙鏈嶅姟鍣�
- /// </summary>
- public static readonly int YOUDATANOISLOCALREGION = 11083;
- /// <summary>
- /// 璐﹀彿鎴栧瘑鐮侀敊璇�
- /// </summary>
- public static readonly int USERNAMEORPWDERROR = 11084;
- /// <summary>
- /// 璐﹀彿涓嶅瓨鍦紝璇峰厛娉ㄥ唽
- /// </summary>
- public static readonly int ACCOUNTNOEXISTS = 11085;
+
public static readonly int YourPWDIsTooSample = 11088;
@@ -1041,13 +1213,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>
/// 鍙栨秷鏀惰棌
@@ -1061,7 +1234,7 @@
/// 鐧惧垎姣�
/// </summary>
public static readonly int Percent = 11103;
- public static readonly int Success = 11104;
+
/// <summary>
/// The please confirm new password.
@@ -1073,10 +1246,7 @@
public readonly static int NORECORD = 11107;
public static readonly int TheMainGatewayIsNotOnLine = 12000;
- /// <summary>
- /// 澶辫触锛岃閲嶈瘯
- /// </summary>
- public static readonly int FailedPleaseTryAgain = 12001;
+
public static readonly int TheSceneIsNull = 12002;
/// <summary>
/// 璇ュ満鏅腑娌℃湁鎵ц鐩爣
@@ -1176,99 +1346,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>
/// 褰撳墠鎴块棿娌℃湁璁惧鍙互娣诲姞鍒板満鏅�
@@ -1718,9 +1799,9 @@
/// </summary>
public const int uSafetyPasswordSettion = 15119;
/// <summary>
- /// 鐢ㄦ埛瀵嗙爜
+ /// 瀹夐槻瀵嗙爜
/// </summary>
- public const int uUserPassword = 15120;
+ public const int uSafetyPassword = 15120;
/// <summary>
/// 鑳佽揩瀵嗙爜
/// </summary>
@@ -1782,7 +1863,7 @@
/// </summary>
public const int uContactInCoerceStatu = 15135;
/// <summary>
- /// 璇疯緭鍏ユ墜鏈哄彿鐮�
+ /// 璇疯緭鍏ユ墜鏈哄彿
/// </summary>
public const int uPleaseInputPhoneNumber = 15136;
/// <summary>
@@ -2010,7 +2091,7 @@
/// </summary>
public const int uUpSubAccountLevel = 15192;
/// <summary>
- /// 纭畾瑕佹挙閿�璇ユ垚鍛樼鐞嗘潈闄愬悧锛�
+ /// 纭畾鍙栨秷銆寋0}銆嶇鐞嗗憳鏉冮檺锛�
/// </summary>
public const int uDownSubAccountLevel = 15193;
/// <summary>
@@ -2018,13 +2099,13 @@
/// </summary>
public const int uMemberAuthorization = 15194;
/// <summary>
- /// 鎴愬憳鎺堟潈鎴愬姛
+ /// 鎺堟潈鎴愬姛!
/// </summary>
public const int uMemberAuthorizationSuccess = 15195;
/// <summary>
- /// 璇ユ垚鍛樺凡鎴愪负绠＄悊鍛�,鎮ㄧ殑鎺у埗鏉冨凡绉讳氦
+ /// 璇ユ垚鍛樺凡鎴愪负绠＄悊鍛�
/// </summary>
- public const int uSubAccountLevelIsUpAndLetAuthorization = 15196;
+ public const int uSubAccountLevelIsUp = 15196;
/// <summary>
/// 纭畾瑕佺Щ闄よ瀹跺涵鎴愬憳鍚楋紵
/// </summary>
@@ -2498,9 +2579,9 @@
/// </summary>
public const int uPleaseInputUserPassword = 15347;
/// <summary>
- /// 鐢ㄦ埛瀵嗙爜宸叉洿鏂�
+ /// 瀹夐槻瀵嗙爜璁剧疆鎴愬姛
/// </summary>
- public const int uUserPasswordRefreshMsg = 15348;
+ public const int uSetSafetyPasswordSuccess = 15348;
/// <summary>
/// 淇敼鐢ㄦ埛瀵嗙爜澶辫触
/// </summary>
@@ -3348,7 +3429,7 @@
/// <summary>
/// 鏃犲彲鍏变韩鐨勬埧闂�
/// </summary>
- public const int uNotShardDeviceInAllRoomMsg = 15583;
+ public const int uNotCanShardRoomMsg = 15583;
/// <summary>
/// 纭畾绉婚櫎閫変腑鐨勫満鏅紵
/// </summary>
@@ -4098,11 +4179,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 +4214,442 @@
/// 姝ｅ湪鎹㈢粦缃戝叧锛岃绋嶅�欌��
/// </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;
+ /// <summary>
+ /// 璇锋敞鎰忔竻娲楁护缃戝摝
+ /// </summary>
+ public const int uPleaseClreanACfilter = 15856;
+ /// <summary>
+ /// 鏃犲彲鍏变韩鐨勫満鏅�
+ /// </summary>
+ public const int uNotCanShardSceneMsg = 15857;
+ /// <summary>
+ /// 鏃犲彲鍏变韩鐨勮澶�
+ /// </summary>
+ public const int uNotCanShardDeviceMsg = 15858;
+ /// <summary>
+ /// 鏃犲彲鍙栨秷鍏变韩鐨勫満鏅�
+ /// </summary>
+ public const int uNotCanCancelShardSceneMsg = 15859;
+ /// <summary>
+ /// 鏃犲彲鍙栨秷鍏变韩鐨勮澶�
+ /// </summary>
+ public const int uNotCanCancelDeviceMsg = 15860;
+ /// <summary>
+ /// 纭鍒犻櫎閫夋嫨鐨勫叡浜満鏅拰鍔熻兘锛�
+ /// </summary>
+ public const int uDeleteShardContentMsg = 15861;
+ /// <summary>
+ /// 纭畾鍒涘缓銆屽畨闃层�嶆嵎寰勫埌涓婚〉锛�
+ /// </summary>
+ public const int uCreatSafetyShortcutMsg = 15862;
+ /// <summary>
+ /// 纭畾鍙栨秷涓婚〉鐨勩�屽畨闃层�嶆嵎寰勶紵
+ /// </summary>
+ public const int uCancelSafetyShortcutMsg = 15863;
+ /// <summary>
+ /// 璇峰墠寰�涓汉涓績{0}璁剧疆浜屾瀹夊叏楠岃瘉鏂瑰紡
+ /// </summary>
+ public const int uGotoCenterAndSetSecondAuthentication = 15864;
+ /// <summary>
+ /// 24灏忔椂闃插尯涓嶅彈甯冮槻銆佹挙闃插奖鍝峽0}闃插尯琚Е鍙戠珛鍗虫姤璀0}涓�鑸缃儫闆俱�佺噧姘斻�佹按娴哥瓑浼犳劅鍣�
+ /// </summary>
+ public const int u24HourSectorsTipMsg = 15865;
+ /// <summary>
+ /// 鍦ㄧ瀹跺竷闃叉ā寮忎笅锛屽唴閮ㄩ槻鍖轰紶鎰熷櫒瑙﹀彂{0}绔嬪嵆鎶ヨ銆傚湪鍦ㄥ甯冮槻妯″紡涓媨0}鍐呴儴闃插尯鎵�鏈変紶鎰熷櫒涓嶅弬涓庢姤璀�
+ /// </summary>
+ public const int uInteriorSectorsTipMsg = 15866;
+ /// <summary>
+ /// 绂诲甯冮槻妯″紡鎴栧湪瀹跺竷闃叉ā寮忎笅{0}鍛ㄧ晫闃插尯浼犳劅鍣ㄨЕ鍙戠珛鍗虫姤璀�
+ /// </summary>
+ public const int uPerimeterSectorsTipMsg = 15867;
+ /// <summary>
+ /// 鍦ㄥ竷闃插悗绯荤粺鎻愪緵涓�瀹氱殑寤惰繜鏃堕棿銆傚嚭闂ㄦ椂{0}澶栧嚭寤舵椂缁撴潫鍚庯紝绯荤粺瑙﹀彂鐩爣鎶ヨ{0}鍥炲鏃讹紝杩涘叆寤舵椂缁撴潫鍚庯紝绯荤粺瑙﹀彂鐩爣鎶ヨ
+ /// </summary>
+ public const int uInAndOutSectorsTipMsg = 15868;
+ /// <summary>
+ /// 闈欓煶闃插尯涓嶅彈甯冮槻銆佹挙闃插奖鍝嶏紝闃插尯琚珄0}瑙﹀彂绔嬪嵆鎶ヨ锛岄�氬父涓嶄骇鐢熷０闊虫垨{0}鍏朵粬鎻愮ず锛屽彧鍙戦�佷俊鎭埌鐗瑰畾鐨勬帴鏀惰��
+ /// </summary>
+ public const int uMuteSectorsTipMsg = 15869;
+ /// <summary>
+ /// 杩樻病鏈夎缃紶鎰熷櫒
+ /// </summary>
+ public const int uDoNotHadSettionSensorMsg = 15870;
+ /// <summary>
+ /// 杩樻病鏈夎缃姤璀︾洰鏍�
+ /// </summary>
+ public const int uDoNotHadSettionTargetMsg = 15871;
+ /// <summary>
+ /// 鏃犳硶璇嗗埆鐨勮澶�
+ /// </summary>
+ public const int uUnDistinguishTheDevice = 15872;
+ /// <summary>
+ /// 鎷嶇収
+ /// </summary>
+ public const int uTakePictrue = 15873;
+ /// <summary>
+ /// 浠庣浉鍐屼腑閫夋嫨
+ /// </summary>
+ public const int uGetPictrueFromAlbum = 15874;
+ /// <summary>
+ /// 鍑虹幇鏈煡閿欒
+ /// </summary>
+ public const int uUnKnownError = 15875;
+ /// <summary>
+ /// 璇疯緭鍏ユ墜鍔�
+ /// </summary>
+ public const int uPleaseInputGesture = 15876;
+ /// <summary>
+ /// 璇峰啀娆¤緭鍏ユ墜鍔�
+ /// </summary>
+ public const int uPleaseInputGestureAgain = 15877;
+ /// <summary>
+ /// 鏇存敼鎵嬪娍锛岃杈撳叆鎵嬪娍
+ /// </summary>
+ public const int uEditorGesturePleaseInputNewGesture = 15878;
+ /// <summary>
+ /// 纭鎵嬪娍閿欒锛岃閲嶆柊璁剧疆
+ /// </summary>
+ public const int uGestureNotEqual = 15879;
+ /// <summary>
+ /// 鎵嬪娍閿欒锛岃閲嶆柊杈撳叆
+ /// </summary>
+ public const int uOldGestureIsError = 15880;
+ /// <summary>
+ /// 鎵嬪娍瀵嗙爜闀垮害蹇呴』澶т簬{0}
+ /// </summary>
+ public const int uGesturePswLenthError = 15881;
+ /// <summary>
+ /// 蹇樿鎵嬪娍锛�
+ /// </summary>
+ public const int uForgotGestureMsg = 15882;
+ /// <summary>
+ /// 鐢ㄤ簬鍦ㄥ甯冮槻銆佺瀹跺竷闃层�佹挙闃叉搷浣�
+ /// </summary>
+ public const int uUserInGarrisonAndWithdrawGarrison = 15883;
+ /// <summary>
+ /// 杈撳叆璇ュ瘑鐮侊紝绔嬪嵆閫氱煡浠栦汉
+ /// </summary>
+ public const int uEnterPasswordToNotifyOthersImmediately = 15884;
+ /// <summary>
+ /// 鍙栨秷鎴愬姛
+ /// </summary>
+ public const int uCancelSuccess = 15885;
+ /// <summary>
+ /// 璇ョ鐞嗗憳宸叉垚涓烘垚鍛�
+ /// </summary>
+ public const int uSubAccountLevelIsDown = 15886;
+ /// <summary>
+ /// 璇疯緭鍏ユ柊鎵嬪娍
+ /// </summary>
+ public const int uPleaseInputNewGesture = 15887;
+ /// <summary>
+ /// 鐢ㄦ埛瀵嗙爜
+ /// </summary>
+ public const int uUserPassword = 15888;
+ /// <summary>
+ /// 褰撳墠浣跨敤瀵嗙爜
+ /// </summary>
+ public const int uNowUsePassword = 15889;
+ /// <summary>
+ /// 澶囨敞淇℃伅
+ /// </summary>
+ public const int uNoteInformation = 15890;
+ /// <summary>
+ /// 璇疯緭鍏ュ娉ㄥ唴瀹�
+ /// </summary>
+ public const int uPlesaeInputNoteInformation = 15891;
+ /// <summary>
+ /// 淇敼澶囨敞淇℃伅鎴愬姛!
+ /// </summary>
+ public const int uEditorNoteInformationSuccess = 15892;
+ /// <summary>
+ /// 杈撳叆鍐呭杩囬暱,鏈�澶0}瀛楄妭
+ /// </summary>
+ public const int uInputContentIsOverLengthMsg = 15893;
+ /// <summary>
+ /// 淇敼澶囨敞淇℃伅澶辫触
+ /// </summary>
+ public const int uEditorNoteInformationFail = 15894;
+ /// <summary>
+ /// 璇疯緭鍏ユ柊鑳佽揩瀵嗙爜
+ /// </summary>
+ public const int uPleaseInputNewCoercePassword = 15895;
+ /// <summary>
+ /// 璇烽噸澶嶈緭鍏ユ柊鑳佽揩瀵嗙爜
+ /// </summary>
+ public const int uPleaseRepeatInputNewCoercePassword = 15896;
+ /// <summary>
+ /// 鑳佽揩瀵嗙爜璁剧疆鎴愬姛
+ /// </summary>
+ public const int uSetCoercePasswordSuccess = 15897;
//鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄帴鍙ｇ殑杩斿洖淇℃伅缈昏瘧,浠�18000寮�濮嬧槄鈽呪槄鈽�
/// <summary>
@@ -4260,9 +4777,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 +4812,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 +4867,7 @@
/// </summary>
public const int uDeviceModelId1302 = 30002;
/// <summary>
- /// 闀滃儚ID涓�1304(鏆傚畾)鐨勮澶囩殑榛樿鍚嶅瓧锛氭按渚典紶鎰熷櫒
+ /// 闀滃儚ID涓�1304(鏆傚畾)鐨勮澶囩殑榛樿鍚嶅瓧锛氭按娴镐紶鎰熷櫒
/// </summary>
public const int uDeviceModelId1304 = 30003;
/// <summary>
@@ -4318,11 +4879,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