From 00ab3ddb140ba8bb88b5cf572b004a85e1da85e9 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期四, 02 一月 2020 19:51:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-tzy' into DEV_GXC
---
ZigbeeApp/Shared/R.cs | 429 +++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 394 insertions(+), 35 deletions(-)
diff --git a/ZigbeeApp/Shared/R.cs b/ZigbeeApp/Shared/R.cs
index 7c3a5e4..b4070cf 100644
--- a/ZigbeeApp/Shared/R.cs
+++ b/ZigbeeApp/Shared/R.cs
@@ -264,7 +264,7 @@
public readonly static int AfterFiftySeconds = 178;
//闂ㄩ攣楠岃瘉瀵嗙爜澶辫触
public readonly static int OperrateFailed = 179;
- public readonly static int RemoteUnlockBindSucessTip1 = 180;
+ public readonly static int RemoteUnlockBindSucessTip = 180;
public readonly static int RemoteUnlockBindSucessTip2 = 181;
public readonly static int CLose = 182;
public readonly static int Opening = 183;
@@ -307,6 +307,14 @@
public readonly static int DoorlockPasswordDispear = 220;
public readonly static int BindUnknownError = 221;
public readonly static int OffLineScene = 222;
+ public readonly static int SureClearKeyModeAndTargets = 223;
+ public readonly static int BindDeviceTargetIsEmpty = 224;
+ public readonly static int PanelBindTargets = 225;
+ public readonly static int ClearAllTargets = 226;
+ public readonly static int ClearAllTargeta2 = 227;
+ public readonly static int DoorlockConfirm = 228;
+ public readonly static int DistributeSuccess = 229;
+ public readonly static int SureToUnFreeze = 230;
public readonly static int RemindSetting = 548;
public readonly static int AddNewUser = 650;
@@ -371,7 +379,7 @@
public readonly static int Sunrisesunset = 5134;
public readonly static int cycle = 5135;
public readonly static int completeNext = 5136;
- public readonly static int Selectedtimetype= 5137;
+ public readonly static int Selectedtimetype = 5137;
public readonly static int Timecondition = 5138;
public readonly static int condition = 5139;
public readonly static int pushset = 5140;
@@ -573,7 +581,16 @@
public readonly static int linkageevent = 5366;
public readonly static int current = 5367;
public readonly static int selecfoolr = 5368;
-
+ public readonly static int delaytip = 5369;
+ public readonly static int usertip = 5370;
+ public readonly static int scenetip = 5371;
+ public readonly static int securitytip = 5372;
+ public readonly static int defaulttext = 5373;
+ public readonly static int addsensor = 5374;
+ public readonly static int addlighting = 5375;
+ public readonly static int application = 5376;
+ public readonly static int automationaddtext = 5377;
+ public readonly static int tiptextnull = 5378;
#region 鐧诲綍娉ㄥ唽
/// <summary>
@@ -1339,7 +1356,7 @@
#endregion
-
+
@@ -1549,7 +1566,7 @@
/// </summary>
public const int uPleaseWait = 15052;
/// <summary>
- /// 璇风‘淇濈綉鍏充笌缃戠嚎杩炴帴{0}绯荤粺鐏瘡绉掗棯鐑佷竴娆�
+ /// 璇风‘淇濈綉鍏崇敤缃戠嚎姝ｅ父杩炴帴璺敱鍣▄0}姝ｅ父杩炴帴鍒欑郴缁熸寚绀虹伅1绉掗棯鐑�
/// </summary>
public const int ConfirmLineConnectMsg = 15053;
/// <summary>
@@ -1885,7 +1902,7 @@
/// </summary>
public const int uUserName = 15147;
/// <summary>
- /// Email
+ /// 閭
/// </summary>
public const int uEmail = 15148;
/// <summary>
@@ -2929,13 +2946,13 @@
/// </summary>
public const int uGetDeviceVersionFail = 15448;
/// <summary>
- /// 鑾峰彇浼犳劅鍣ㄧ伅鍏夎缃俊鎭け璐�
+ /// 鑾峰彇浼犳劅鍣ㄨ缃俊鎭け璐�
/// </summary>
- public const int uGetPirSensorLightSettionFail = 15449;
+ public const int uGetPirSensorSettionFail = 15449;
/// <summary>
- /// 璁剧疆浼犳劅鍣ㄧ伅鍏夐厤缃け璐�
+ /// 璁剧疆浼犳劅鍣ㄩ厤缃俊鎭け璐�
/// </summary>
- public const int uSetPirSensorLightSettionFail = 15450;
+ public const int uSetPirSensorSettionFail = 15450;
/// <summary>
/// 鐧藉ぉ
/// </summary>
@@ -3384,10 +3401,6 @@
/// 纭畾绉婚櫎閫変腑鐨勮澶囷紵
/// </summary>
public const int uConfirmRemoveSelectDeviceMsg = 15578;
- /// <summary>
- /// 鍑虹幇鏈煡閿欒,鏁版嵁涓㈠け
- /// </summary>
- public const int uUnknownErrorAndDataLost = 15579;
/// <summary>
/// 鍏变韩鏁版嵁鍚屾涓�
/// </summary>
@@ -4145,11 +4158,11 @@
/// </summary>
public const int uSearchGatewayFailMsg1 = 15779;
/// <summary>
- /// 1.闀挎寜ZB/RST閿�20绉掞紝缃戝叧鎭㈠鍑哄巶璁剧疆锛屾寚绀虹伅鍏ㄩ儴鐔勭伃鍚庯紝閲嶆柊鍏ョ綉銆�
+ /// 1.鐭寜HID/WCFG鎸夐敭,绯荤粺鎸囩ず鐏揩闂�3绉�,缃戝叧杩涘叆鎹㈢粦妯″紡,寮哄埗缃戝叧缁戝畾鍒板綋鍓岮PP
/// </summary>
public const int uSearchGatewayFailMsg2 = 15780;
/// <summary>
- /// 2.鐐规寜HID/WCFG閿紝杩涘叆缃戝叧鎹㈢粦妯″紡锛岀郴缁熸寚绀虹伅蹇棯5绉掋��
+ /// 2.闀挎寜缃戝叧ZB/RST鎸夐敭20绉掍互涓�,鐩村埌鎵�鏈夋寚绀虹伅鍚屾椂鐏�,鍗虫仮澶嶅嚭鍘傝缃苟閲嶅惎
/// </summary>
public const int uSearchGatewayFailMsg3 = 15781;
/// <summary>
@@ -4277,11 +4290,11 @@
/// </summary>
public const int uCommitCurtainLimitFail = 15812;
/// <summary>
- /// 纭褰撳墠浣嶇疆{0}涓哄紑闄愪綅?
+ /// 纭褰撳墠浣嶇疆涓哄紑闄愪綅?
/// </summary>
public const int uCommitCurtainOpenLimitMsg = 15813;
/// <summary>
- /// 纭褰撳墠浣嶇疆{0}涓哄悎闄愪綅?
+ /// 纭褰撳墠浣嶇疆涓哄悎闄愪綅?
/// </summary>
public const int uCommitCurtainCloseLimitMsg = 15814;
/// <summary>
@@ -4305,9 +4318,9 @@
/// </summary>
public const int uCommitCurtainDownLimitMsg = 15819;
/// <summary>
- /// 濡傛灉婊¤冻
+ /// 濡傛灉婊¤冻浣庝寒搴︾幆澧�
/// </summary>
- public const int uIfSatisfied = 15820;
+ public const int uIfTheLowBrightnessEnvironmentIsSatisfied = 15820;
/// <summary>
/// 灏变細
/// </summary>
@@ -4329,9 +4342,9 @@
/// </summary>
public const int uSecond = 15825;
/// <summary>
- /// 鐓ф槑绛夌骇
+ /// 鐓у害鍊�
/// </summary>
- public const int uLightLevel = 15826;
+ public const int uIlluminationValue = 15826;
/// <summary>
/// 浣�
/// </summary>
@@ -4653,15 +4666,15 @@
/// </summary>
public const int uWlanConnectHomeWifi = 15906;
/// <summary>
- /// 闀挎寜缃戝叧HID/WCFG鎸夐敭20绉抺0}绯荤粺鐏揩闂�60绉掑垯杩涘叆閰嶇綉鐘舵�亄0}绯荤粺鐏瘡绉掗棯鐑佷竴娆0}鍒欒繛鎺ユ垚鍔�
+ /// 缃戝叧濡傛灉姝ｅ父杩炴帴璺敱鍣▄0}绯荤粺鎸囩ず鐏細1绉掗棯鐑�
/// </summary>
- public const int uAddUdpWirelessGatewayMsg = 15907;
+ public const int uAddUdpWirelessGatewayMsg1 = 15907;
/// <summary>
- /// 闀挎寜缃戝叧HID/WCFG鎸夐敭5绉抺0}绯荤粺鐏父浜�60绉掑悗鍒欒繘鍏ラ厤缃戠姸鎬�
+ /// 璇峰厛闀挎寜HID/WCFG鎸夐敭澶ф5绉抺0}鐩村埌绯荤粺鎸囩ず鐏父浜畕0}缃戝叧杩涘叆AP妯″紡鐑偣
/// </summary>
public const int uAddApWirelessGatewayMsg1 = 15908;
/// <summary>
- /// 璺宠浆鍒扮Щ鍔ㄨ澶嘩LAN璁剧疆{0}閫夋嫨hdlZigbeeGW-xxxx缃戠粶
+ /// 鎵嬫満鍘昏缃繛鎺ョ綉鍏崇儹鐐箋0}鍗砲dlZigbeeGW-xxxx,瀵嗙爜hdl123456{0}鍙煡鐪嬬綉鍏宠儗闈㈡爣绛炬煡鐪嬬儹鐐瑰悕瀛楀拰瀵嗙爜
/// </summary>
public const int uAddApWirelessGatewayMsg2 = 15909;
/// <summary>
@@ -4669,11 +4682,11 @@
/// </summary>
public const int uPleaseInputHomeWifiAccount = 15910;
/// <summary>
- /// 璇峰墠寰�绉诲姩璁惧WLAN璁剧疆{0}閲嶆柊杩炴帴瀹跺涵wiFi
+ /// 鎵嬫満鍘昏缃繛鎺ヨ矾鐢卞櫒
/// </summary>
public const int uAddApWirelessGatewayMsg3 = 15911;
/// <summary>
- /// 绯荤粺鐏瘡绉掗棯鐑佷竴娆0}鍒欒繛鎺ユ垚鍔�
+ /// 缃戝叧濡傛灉姝ｅ父杩炴帴璺敱鍣▄0}绯荤粺鎸囩ず鐏細1绉掗棯鐑�
/// </summary>
public const int uAddApWirelessGatewayMsg4 = 15912;
/// <summary>
@@ -4952,6 +4965,315 @@
/// 姝ｅ湪鑾峰彇鍒嗕韩鏁版嵁
/// </summary>
public const int uShardContentGetting = 15983;
+ /// <summary>
+ /// 璇峰厛鍘昏缃墜鏈鸿繛鎺ュ埌璺敱鍣▄0}鐒跺悗闀挎寜缃戝叧HID/WCFG鎸夐敭澶ф20绉抺0}鐩村埌绯荤粺鎸囩ず鐏揩闂獅0}缃戝叧杩涘叆UDP妯″紡WIFI閰嶇綉
+ /// </summary>
+ public const int uAddUdpWirelessGatewayMsg2 = 15984;
+ /// <summary>
+ /// 缃戝叧娣诲姞鎸囧紩
+ /// </summary>
+ public const int uAddGatewayGuide = 15985;
+ /// <summary>
+ /// 1.璇风敤缃戠嚎杩炴帴缃戝叧缃戝彛鍒拌矾鐢卞櫒锛屽苟瑙傚療缃戝彛LED浜苟闂儊鎴栬瀵熷澹崇綉鍙ｆ寚绀虹伅浜苟闂儊
+ /// </summary>
+ public const int uAddWiredGatewayHelp1 = 15986;
+ /// <summary>
+ /// 2.缃戝叧閲嶅惎澶х害闇�瑕�1鍒嗛挓锛岃繖鏃惰瀵熷澹崇郴缁熸寚绀虹伅锛屽鏋�1绉掗棯鐑侊紝琛ㄧず缃戝叧杩炴帴璺敱鍣ㄦ甯革紝鍙互鐢ˋPP杩涜娣诲姞缃戝叧姝ラ
+ /// </summary>
+ public const int uAddWiredGatewayHelp2 = 15987;
+ /// <summary>
+ /// 缃戝叧纭欢闂甯姪
+ /// </summary>
+ public const int uGatewayHardDeviceHelp = 15988;
+ /// <summary>
+ /// 1.缃戝彛鎸囩ず鐏笉浜�,妫�鏌ョ綉绾挎垨璺敱鍣ㄦ槸鍚︽甯�
+ /// </summary>
+ public const int uWiredGatewayHardDeviceHelp1 = 15989;
+ /// <summary>
+ /// 2.绯荤粺鍚姩涔嬪悗(绯荤粺鎸囩ず鐏�5绉掗棯鐑�,琛ㄧず绯荤粺鍚姩鎴愬姛),绯荤粺鎸囩ず鐏笉鏄�1绉掗棯鐑�,妫�鏌ヨ矾鐢卞櫒鏄惁寮�鍚疍HCP鑷姩鍒嗛厤IP
+ /// </summary>
+ public const int uWiredGatewayHardDeviceHelp2 = 15990;
+ /// <summary>
+ /// 绯荤粺鍚姩涔嬪悗(绯荤粺鎸囩ず鐏�5绉掗棯鐑�,琛ㄧず绯荤粺鍚姩鎴愬姛)
+ /// </summary>
+ public const int uAddWirelessGatewayHelp1 = 15991;
+ /// <summary>
+ /// 2.鏍规嵁APP鎻愮ず杩涘叆涔嬪悗鐨勬楠�
+ /// </summary>
+ public const int uAddWirelessGatewayHelp2 = 15992;
+ /// <summary>
+ /// 1.璇峰厛闀挎寜缃戝叧HID/WCFG鎸夐敭澶ф20绉�,鐩村埌绯荤粺鎸囩ず鐏揩闂�,缃戝叧杩涘叆UDP妯″紡WIFI閰嶇綉
+ /// </summary>
+ public const int uAddWirelessUdpGatewayHelp1 = 15993;
+ /// <summary>
+ /// 1.璇峰厛闀挎寜缃戝叧HID/WCFG鎸夐敭澶ф5绉�,鐩村埌绯荤粺鎸囩ず鐏父浜�,缃戝叧杩涘叆AP妯″紡WIFI閰嶇綉
+ /// </summary>
+ public const int uAddWirelessApGatewayHelp1 = 15994;
+ /// <summary>
+ /// 1.鐭寜HID/WCFG鎸夐敭,鏌ョ湅鎸囩ず鐏槸鍚︽湁鍙樺寲,鍙垽鏂寜閿拰鎸囩ず鐏槸鍚︽崯鍧�
+ /// </summary>
+ public const int uWirelessGatewayHardDeviceHelp1 = 15995;
+ /// <summary>
+ /// 2.闀挎寜HID/WCFG鎸夐敭,鏌ョ湅鎸囩ず鐏槸鍚︽湁鍙樺寲,鍙垽鏂寜閿拰鎸囩ず鐏槸鍚︽崯鍧�
+ /// </summary>
+ public const int uWirelessGatewayHardDeviceHelp2 = 15996;
+ /// <summary>
+ /// 3.绯荤粺鎸囩ず鐏笉鏄�1绉掗棯鐑�,妫�鏌ヨ矾鐢卞櫒鏄惁寮�鍚疍HCP鑷姩鍒嗛厤IP
+ /// </summary>
+ public const int uWirelessGatewayHardDeviceHelp3 = 15997;
+ /// <summary>
+ /// 璇峰墠寰�浣忓畢绠＄悊{0}璁剧疆浣忓畢鐨勫湴鐞嗕綅缃�
+ /// </summary>
+ public const int uGotoResidenceAndSetLocation = 15998;
+ /// <summary>
+ /// 鏈煡妤煎眰
+ /// </summary>
+ public const int uUnKnownFloor = 15999;
+ /// <summary>
+ /// 濡傛灉涓嶈缃綇瀹呯殑鍦扮悊浣嶇疆,鍒欎細褰卞搷鑷姩鍖栧湴鐞嗗洿鏍忓姛鑳界殑璁剧疆
+ /// </summary>
+ public const int uNotSetLocationWillAffectTheAutomaticGeofencingFunction = 16000;
+ /// <summary>
+ /// 绌鸿皟妯″潡鐗堟湰
+ /// </summary>
+ public const int uAirConditionerModelVersion = 16001;
+ /// <summary>
+ /// 閫氫俊鑺墖
+ /// </summary>
+ public const int uCommunicationChip = 16002;
+ /// <summary>
+ /// 绌鸿皟妯″潡
+ /// </summary>
+ public const int uAirConditioningModule = 16003;
+ /// <summary>
+ /// 鑾峰彇澶辫触
+ /// </summary>
+ public const int uGettingFail = 16004;
+ /// <summary>
+ /// 鏃犳硶璇嗗埆
+ /// </summary>
+ public const int uUnDistinguish = 16005;
+ /// <summary>
+ /// 姝ｅ湪閲嶇疆鐢垫満
+ /// </summary>
+ public const int uElectricalMachineryResetting = 16006;
+ /// <summary>
+ /// 澶ч噾绌鸿皟妯″潡
+ /// </summary>
+ public const int uDakAirConditioningModule = 16007;
+ /// <summary>
+ /// 娌℃湁鍙崌绾х殑绌鸿皟妯″潡
+ /// </summary>
+ public const int uNotHadAirConditioningUpdateModule = 16008;
+ /// <summary>
+ /// 绌鸿皟鍗囩骇妯″潡
+ /// </summary>
+ public const int uAirConditioningUpdateModule = 16009;
+ /// <summary>
+ /// 鑾峰彇绌鸿皟妯″潡鐗堟湰澶辫触
+ /// </summary>
+ public const int uGetAirConditionerModelVersionFail = 16010;
+ /// <summary>
+ /// 鍙戦�佸崌绾у懡浠ゅけ璐�
+ /// </summary>
+ public const int uSendUpdateComandFail = 16011;
+ /// <summary>
+ /// 鐗堟湰鍙风浉鍚�,鍗囩骇澶辫触
+ /// </summary>
+ public const int uVersionIsEqualAndUpdateFail = 16012;
+ /// <summary>
+ /// 鏍￠獙鐗堟湰鍙峰け璐�
+ /// </summary>
+ public const int uCheckVersionFail = 16013;
+ /// <summary>
+ /// 妫�娴嬭澶囩増鏈�
+ /// </summary>
+ public const int uCheckDeviceVersion = 16014;
+ /// <summary>
+ /// 鍝嶅簲瓒呮椂,妫�娴嬭澶囩増鏈け璐�
+ /// </summary>
+ public const int uResponseTimeoutsAndCheckDeviceVersionFail = 16015;
+ /// <summary>
+ /// 姝ｅ湪鍙戦�佸崌绾у畬鎴愮殑鍛戒护
+ /// </summary>
+ public const int uSendingFinishUpdateComand = 16016;
+ /// <summary>
+ /// 鍝嶅簲瓒呮椂,鍙戦�佸崌绾у畬鎴愮殑鍛戒护澶辫触
+ /// </summary>
+ public const int uResponseTimeoutsAndSendingFinishUpdateComandFail = 16017;
+ /// <summary>
+ /// 閲嶅伐绌鸿皟妯″潡
+ /// </summary>
+ public const int uHicAirConditioningModule = 16018;
+ /// <summary>
+ /// 鎸囩ず鐏彉缁裤�侀棯鐑�
+ /// </summary>
+ public const int uPilotLinghtInCreanAndLinght = 16019;
+ /// <summary>
+ /// 閽堝瓟寮忛噸缃寜閿�
+ /// </summary>
+ public const int uPinholeTypeResetButton = 16020;
+ /// <summary>
+ /// 淇″彿鍥炬爣蹇棯
+ /// </summary>
+ public const int uSignalIconFlash = 16021;
+ /// <summary>
+ /// 淇″彿鍥炬爣
+ /// </summary>
+ public const int uSignalIcon = 16022;
+ /// <summary>
+ /// 鎻愰啋
+ /// </summary>
+ public const int uRemind = 16023;
+ /// <summary>
+ /// 缁戝畾鎴愬姛锛佷笅娆′綘鍙互鐢ㄥ井淇0}璐﹀彿蹇�熺櫥褰曞暒
+ /// </summary>
+ public const int uBindWebchatSuccessMsg = 16024;
+ /// <summary>
+ /// 濂界殑
+ /// </summary>
+ public const int uWell = 16025;
+ /// <summary>
+ /// 宸叉墽琛�
+ /// </summary>
+ public const int uExecuted = 16026;
+ /// <summary>
+ /// 闂ㄩ攣瑙﹀彂璀︽姤
+ /// </summary>
+ public const int uDoorLocksAlarmHadTriggered = 16027;
+ /// <summary>
+ /// 鎴戠殑浣忓畢
+ /// </summary>
+ public const int uMyResidence = 16028;
+ /// <summary>
+ /// 瀹㈠巺
+ /// </summary>
+ public const int uLivingRoom = 16029;
+ /// <summary>
+ /// 闃冲彴
+ /// </summary>
+ public const int uBalcony = 16030;
+ /// <summary>
+ /// 鍗у
+ /// </summary>
+ public const int uBedroom = 16031;
+ /// <summary>
+ /// 宸﹀彸婊戝姩,鍒囨崲鎴块棿鍗＄墖
+ /// </summary>
+ public const int uSlideLeftAndRightToSwitchRoomCards = 16032;
+ /// <summary>
+ /// 鍙虫粦杩涘叆鎴块棿鍒楄〃
+ /// </summary>
+ public const int uSlideRightToRoomList = 16033;
+ /// <summary>
+ /// 闂厜鐏�
+ /// </summary>
+ public const int uFlashlamp = 16034;
+ /// <summary>
+ /// 鎴块棿鐨勫唴瀹瑰湪姝ゅ鏄剧ず
+ /// </summary>
+ public const int uTheContentsOfTheRoomAreShownHere = 16035;
+ /// <summary>
+ /// 鎴戠煡閬撲簡
+ /// </summary>
+ public const int uIKnwon = 16036;
+ /// <summary>
+ /// 鍒嗕韩鏁版嵁宸茬粡鍙樻洿,璇烽噸鏂扮櫥闄�
+ /// </summary>
+ public const int uShardDataIsChangedPleaseLoginAgain = 16037;
+ /// <summary>
+ /// 宸ヤ綔妯″紡
+ /// </summary>
+ public const int uWorkMode = 16038;
+ /// <summary>
+ /// 鎺у埗妯″紡
+ /// </summary>
+ public const int uControlMode = 16039;
+ /// <summary>
+ /// 瑙﹀彂妯″紡
+ /// </summary>
+ public const int uTriggerMode = 16040;
+ /// <summary>
+ /// 涓婃姤闂撮殧
+ /// </summary>
+ public const int uReportTimeSpace = 16041;
+ /// <summary>
+ /// 鍏ㄨ嚜鍔ㄦā寮�
+ /// </summary>
+ public const int uFullAutoMode = 16042;
+ /// <summary>
+ /// 鍗婅嚜鍔ㄦā寮�
+ /// </summary>
+ public const int uHafeAutoMode = 16043;
+ /// <summary>
+ /// 璋冨厜妯″紡
+ /// </summary>
+ public const int uDimmingMode = 16044;
+ /// <summary>
+ /// 寮�鍏虫ā寮�
+ /// </summary>
+ public const int uSwitchMode = 16045;
+ /// <summary>
+ /// 寮�鐏寒搴�
+ /// </summary>
+ public const int uTurnOnBrightness = 16046;
+ /// <summary>
+ /// 鎱㈠惎鍔�
+ /// </summary>
+ public const int uSlowStartup = 16047;
+ /// <summary>
+ /// 鎱㈠叧闂�
+ /// </summary>
+ public const int uSlowClose = 16048;
+ /// <summary>
+ /// 浜害
+ /// </summary>
+ public const int uBrightness = 16049;
+ /// <summary>
+ /// 鑾峰彇浼犳劅鍣ㄤ寒搴﹀�煎け璐�
+ /// </summary>
+ public const int uGetPirSensorLuxFail = 16050;
+ /// <summary>
+ /// 褰撳墠浜害鍊�
+ /// </summary>
+ public const int uNowBrightnessValue = 16051;
+ /// <summary>
+ /// 鏆�
+ /// </summary>
+ public const int uDark = 16052;
+ /// <summary>
+ /// 浜�
+ /// </summary>
+ public const int uBright = 16053;
+ /// <summary>
+ /// 鍦ㄥ鍐呮潯浠朵笅锛岄粍鏄忕収搴﹀�肩害涓�10lux锛岄槾澶╃収搴﹀�肩害涓�5~50lux锛岃鏍规嵁瀹為檯闇�瑕佽繘琛岃皟鑺�
+ /// </summary>
+ public const int uPirBrightnessTipMsg = 16054;
+ /// <summary>
+ /// 闇囧姩鍙嶉
+ /// </summary>
+ public const int uVibrationFeedback = 16055;
+ /// <summary>
+ /// 鑾峰彇闇囧姩鍙嶉閰嶇疆淇℃伅澶辫触
+ /// </summary>
+ public const int uGetVibrationFeedbackSettionFail = 16056;
+ /// <summary>
+ /// 璁剧疆闇囧姩鍙嶉閰嶇疆淇℃伅澶辫触
+ /// </summary>
+ public const int uSetVibrationFeedbackSettionFail = 16057;
+ /// <summary>
+ /// 鎴戠殑瀹�
+ /// </summary>
+ public const int uMyHome = 16058;
+ /// <summary>
+ /// 闀挎寜鈥滄垜鐨勫鈥漿0}鍙垏鎹㈡垜鐨勪綇瀹�
+ /// </summary>
+ public const int uLongClickMyHomeCanChangedHome = 16059;
+ /// <summary>
+ /// 鍔炲叕瀹�
+ /// </summary>
+ public const int uWorkRoom = 16060;
+
//鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄帴鍙ｇ殑杩斿洖淇℃伅缈昏瘧,浠�18000寮�濮嬧槄鈽呪槄鈽�
/// <summary>
@@ -4995,7 +5317,7 @@
/// </summary>
public const int ValidatorCode_ValidCodeAndPhoneNoEqual = 18016;
/// <summary>
- /// 鏈彂閫侀獙璇佺爜鍒版璐﹀彿
+ /// 楠岃瘉鐮佸凡澶辨晥
/// </summary>
public const int ValidatorCode_NoRecord = 18017;
/// <summary>
@@ -5154,6 +5476,15 @@
/// 绌鸿皟 -> 闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝鎸囩ず鐏瘂0}鍙樼豢闂儊,杩涘叆閰嶇綉鐘舵�亄0}缁跨伅姣�5绉掗棯鐑佷竴娆″垯鍏ョ綉鎴愬姛
/// </summary>
public const int uAddAirConditionerZbGatewayMsg = 21015;
+ /// <summary>
+ /// Pir浼犳劅鍣� -> 闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝鎸囩ず鐏彉缁裤�亄0}闂儊杩涘叆閰嶇綉鐘舵�併�傜豢鐏唲鐏垯閰嶇綉鎴愬姛
+ /// </summary>
+ public const int uAddSensorPirMsg = 21016;
+ /// <summary>
+ /// 娓╂箍搴︿紶鎰熷櫒 -> 闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝淇″彿鍥炬爣{0}蹇棯锛� 杩涘叆閰嶇綉鐘舵�併�傚浘鏍囧父浜垯閰嶇綉鎴愬姛
+ /// </summary>
+ public const int uAddSensorTemperatureAndHumidityMsg = 21017;
+
//鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄ā鍧桰D鐨勭炕璇戝悕瀛�,浠�30000寮�濮嬧槄鈽呪槄鈽�
/// <summary>
@@ -5181,7 +5512,7 @@
/// </summary>
public const int uDeviceModelId1301 = 30005;
/// <summary>
- /// 闀滃儚ID涓�4100鐨勮澶囩殑榛樿鍚嶅瓧锛歓igbee寰柇浜戞帶鍒跺櫒
+ /// 闀滃儚ID涓�4100鐨勮澶囩殑榛樿鍚嶅瓧锛氭櫤鑳界┖寮�
/// </summary>
public const int uDeviceModelId4100 = 30006;
/// <summary>
@@ -5260,10 +5591,22 @@
/// 闀滃儚ID涓�2800鐨勮澶囩殑榛樿鍚嶅瓧锛欻06C
/// </summary>
public const int uDeviceModelId2800 = 30025;
+ /// <summary>
+ /// 闀滃儚ID涓�220鐨勮澶囩殑榛樿鍚嶅瓧锛氱畝绾�4鎸夐敭闈㈡澘
+ /// </summary>
+ public const int uDeviceModelId220 = 30026;
+ /// <summary>
+ /// 闀滃儚ID涓�221鐨勮澶囩殑榛樿鍚嶅瓧锛氱畝绾�3鎸夐敭闈㈡澘
+ /// </summary>
+ public const int uDeviceModelId221 = 30027;
+ /// <summary>
+ /// 闀滃儚ID涓�222鐨勮澶囩殑榛樿鍚嶅瓧锛氱畝绾�2鎸夐敭闈㈡澘
+ /// </summary>
+ public const int uDeviceModelId222 = 30028;
//鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄澶囨墍灞炵绫荤殑缈昏瘧鍚嶅瓧,浠�40000寮�濮嬧槄鈽呪槄鈽�
/// <summary>
- /// 鑷畾涔夎澶囨墍灞濱D涓�100鐨勭炕璇戝悕瀛楋細绐楀笜
+ /// 鑷畾涔夎澶囨墍灞濱D涓�100鐨勭炕璇戝悕瀛楋細閬槼
/// </summary>
public const int uDeviceBelongId100 = 40000;
/// <summary>
@@ -5283,7 +5626,7 @@
/// </summary>
public const int uDeviceBelongId2500 = 40004;
/// <summary>
- /// 鑷畾涔夎澶囨墍灞濱D涓�2800鐨勭炕璇戝悕瀛楋細鏅鸿兘闂ㄩ攣
+ /// 鑷畾涔夎澶囨墍灞濱D涓�2800鐨勭炕璇戝悕瀛楋細闂ㄩ攣
/// </summary>
public const int uDeviceBelongId2800 = 40005;
/// <summary>
@@ -5295,7 +5638,7 @@
/// </summary>
public const int uDeviceBelongId3900 = 40007;
/// <summary>
- /// 鑷畾涔夎澶囨墍灞濱D涓�4100鐨勭炕璇戝悕瀛楋細绌烘皵寮�鍏�
+ /// 鑷畾涔夎澶囨墍灞濱D涓�4100鐨勭炕璇戝悕瀛楋細鏅鸿兘绌哄紑
/// </summary>
public const int uDeviceBelongId4100 = 40008;
/// <summary>
@@ -5311,12 +5654,28 @@
/// </summary>
public const int uDeviceBelongId10 = 40011;
/// <summary>
- /// 鑷畾涔夎澶囨墍灞濱D涓�10鐨勭炕璇戝悕瀛楋細娓╁害浼犳劅鍣�
+ /// 鑷畾涔夎澶囨墍灞濱D涓�11鐨勭炕璇戝悕瀛楋細娓╁害浼犳劅鍣�
/// </summary>
public const int uDeviceBelongId11 = 40012;
/// <summary>
- /// 鑷畾涔夎澶囨墍灞濱D涓�10鐨勭炕璇戝悕瀛楋細婀垮害浼犳劅鍣�
+ /// 鑷畾涔夎澶囨墍灞濱D涓�12鐨勭炕璇戝悕瀛楋細婀垮害浼犳劅鍣�
/// </summary>
public const int uDeviceBelongId12 = 40013;
+ /// <summary>
+ /// 鑷畾涔夎澶囨墍灞濱D涓�13鐨勭炕璇戝悕瀛楋細寮�鍏�
+ /// </summary>
+ public const int uDeviceBelongId13 = 15665;
+ /// <summary>
+ /// 鑷畾涔夎澶囨墍灞濱D涓�14鐨勭炕璇戝悕瀛楋細鎻掑骇
+ /// </summary>
+ public const int uDeviceBelongId14 = 15666;
+ /// <summary>
+ /// 鑷畾涔夎澶囨墍灞濱D涓�15鐨勭炕璇戝悕瀛楋細鐏厜
+ /// </summary>
+ public const int uDeviceBelongId15 = 15071;
+ /// <summary>
+ /// 鑷畾涔夎澶囨墍灞濱D涓�16鐨勭炕璇戝悕瀛楋細骞叉帴鐐�
+ /// </summary>
+ public const int uDeviceBelongId16 = 40014;
}
}
--
Gitblit v1.8.0