From 3dcbd186c42c598c0c08d1cd37034cf2baa09e54 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 30 十二月 2019 15:47:51 +0800
Subject: [PATCH] 合并了代码
---
ZigbeeApp/Shared/R.cs | 189 ++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 179 insertions(+), 10 deletions(-)
diff --git a/ZigbeeApp/Shared/R.cs b/ZigbeeApp/Shared/R.cs
index b47132c..9496171 100755
--- a/ZigbeeApp/Shared/R.cs
+++ b/ZigbeeApp/Shared/R.cs
@@ -309,6 +309,12 @@
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 ClearAllTargeta1 = 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;
@@ -580,6 +586,10 @@
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;
#region 鐧诲綍娉ㄥ唽
/// <summary>
@@ -638,7 +648,7 @@
/// </summary>
public const int LoginByAccountPWD = 10110;
/// <summary>
- /// 鍙戦�侀獙璇佺爜
+ /// 鑾峰彇楠岃瘉鐮�
/// </summary>
public const int SendVerificationCode = 10111;
/// <summary>
@@ -765,6 +775,18 @@
/// 鏂板瘑鐮佸拰鍘熷瘑鐮佷竴鑷�
/// </summary>
public const int NEWPASSWORDANDOLDPASSWORDEQUAL = 10142;
+ /// <summary>
+ /// 璇峰厛鑾峰彇楠岃瘉鐮�
+ /// </summary>
+ public const int NORECORD = 10143;
+ /// <summary>
+ /// 蹇樿瀵嗙爜锛�
+ /// </summary>
+ public const int ForgotPWD_1 = 10144;
+ /// <summary>
+ /// 宸叉湁璐﹀彿锛熺櫥褰�
+ /// </summary>
+ public const int LoginByAccountPWD_1 = 10145;
/// <summary>
@@ -799,6 +821,10 @@
/// 缃戝叧涓嶅湪绾�
/// </summary>
public const int TheMainGatewayIsNotOnLine = 10157;
+ /// <summary>
+ /// 涓嬩竴姝�
+ /// </summary>
+ public const int Next = 10158;
/// <summary>
@@ -965,6 +991,14 @@
/// 纭畾瑕佺Щ闄よ鍔熻兘锛�
/// </summary>
public const int DeleteFunction = 11034;
+ /// <summary>
+ /// 娣诲姞鍔熻兘
+ /// </summary>
+ public const int AddFunction = 11035;
+ /// <summary>
+ /// 娣诲姞寤舵椂
+ /// </summary>
+ public const int AddDelayTime = 11036;
#region 璁惧绫诲瀷
/// <summary>
@@ -1015,6 +1049,41 @@
/// 娓╂箍搴︿紶鎰熷櫒
/// </summary>
public const int TemperatureAndHumiditySensor = 12112;
+
+
+ /// <summary>
+ /// 鏈変汉
+ /// </summary>
+ public const int IASZone_Statu_HavePerson = 12500;
+ /// <summary>
+ /// 鏃犱汉
+ /// </summary>
+ public const int IASZone_Statu_NoPerson = 12501;
+ /// <summary>
+ /// 婕忔按
+ /// </summary>
+ public const int IASZone_Statu_HaveWater = 12502;
+ /// <summary>
+ /// 姝ｅ父
+ /// </summary>
+ public const int IASZone_Statu_Normal = 12503;
+ /// <summary>
+ /// 寮�鍚�
+ /// </summary>
+ public const int IASZone_Statu_Open = 12504;
+ /// <summary>
+ /// 闂悎
+ /// </summary>
+ public const int IASZone_Statu_Close = 12505;
+ /// <summary>
+ /// 鎶ヨ
+ /// </summary>
+ public const int IASZone_Statu_Alarm = 12506;
+ /// <summary>
+ /// 瀹夊叏
+ /// </summary>
+ public const int IASZone_Statu_Safe = 12507;
+
#endregion
@@ -1261,11 +1330,11 @@
public const int NeedCleanAC = 13511;
/// <summary>
- /// 娌″姛鑳� 璇峰厛娣诲姞
+ /// 杩樻病鏈夊姛鑳藉摝
/// </summary>
public const int NoFunction_Tip = 13600;
/// <summary>
- /// 娌″満鏅� 璇峰厛娣诲姞
+ /// 杩樻病鏈夊満鏅摝
/// </summary>
public const int NoScene_Tip = 13601;
/// <summary>
@@ -1276,6 +1345,10 @@
/// 鑾峰彇涓�...
/// </summary>
public const int Getting = 13603;
+ /// <summary>
+ /// 褰撳墠 浜害
+ /// </summary>
+ public const int CurrentLightLevel = 13604;
@@ -1828,7 +1901,7 @@
/// </summary>
public const int uUserName = 15147;
/// <summary>
- /// Email
+ /// 閭
/// </summary>
public const int uEmail = 15148;
/// <summary>
@@ -2872,13 +2945,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>
@@ -5063,6 +5136,102 @@
/// 濂界殑
/// </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;
//鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄帴鍙ｇ殑杩斿洖淇℃伅缈昏瘧,浠�18000寮�濮嬧槄鈽呪槄鈽�
/// <summary>
@@ -5395,7 +5564,7 @@
//鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄澶囨墍灞炵绫荤殑缈昏瘧鍚嶅瓧,浠�40000寮�濮嬧槄鈽呪槄鈽�
/// <summary>
- /// 鑷畾涔夎澶囨墍灞濱D涓�100鐨勭炕璇戝悕瀛楋細绐楀笜
+ /// 鑷畾涔夎澶囨墍灞濱D涓�100鐨勭炕璇戝悕瀛楋細閬槼
/// </summary>
public const int uDeviceBelongId100 = 40000;
/// <summary>
@@ -5415,7 +5584,7 @@
/// </summary>
public const int uDeviceBelongId2500 = 40004;
/// <summary>
- /// 鑷畾涔夎澶囨墍灞濱D涓�2800鐨勭炕璇戝悕瀛楋細鏅鸿兘闂ㄩ攣
+ /// 鑷畾涔夎澶囨墍灞濱D涓�2800鐨勭炕璇戝悕瀛楋細闂ㄩ攣
/// </summary>
public const int uDeviceBelongId2800 = 40005;
/// <summary>
--
Gitblit v1.8.0