From b129359c5a0df75f63d9131e5e41d3060ac38cc3 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期一, 30 十二月 2019 14:14:06 +0800
Subject: [PATCH] 2019.12.30
---
ZigbeeApp/Shared/R.cs | 112 ++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 105 insertions(+), 7 deletions(-)
diff --git a/ZigbeeApp/Shared/R.cs b/ZigbeeApp/Shared/R.cs
index 6693dd6..bdf0ef7 100644
--- a/ZigbeeApp/Shared/R.cs
+++ b/ZigbeeApp/Shared/R.cs
@@ -632,7 +632,7 @@
/// </summary>
public const int LoginByAccountPWD = 10110;
/// <summary>
- /// 鍙戦�侀獙璇佺爜
+ /// 鑾峰彇楠岃瘉鐮�
/// </summary>
public const int SendVerificationCode = 10111;
/// <summary>
@@ -755,6 +755,22 @@
/// 浣犲凡琚己鍒朵笅绾匡紒
/// </summary>
public const int YouHaveBeenSignOut = 10141;
+ /// <summary>
+ /// 鏂板瘑鐮佸拰鍘熷瘑鐮佷竴鑷�
+ /// </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>
@@ -789,6 +805,10 @@
/// 缃戝叧涓嶅湪绾�
/// </summary>
public const int TheMainGatewayIsNotOnLine = 10157;
+ /// <summary>
+ /// 涓嬩竴姝�
+ /// </summary>
+ public const int Next = 10158;
/// <summary>
@@ -796,7 +816,7 @@
/// </summary>
public const int TheAppVersionIsNewest = 10160;
/// <summary>
- /// 鏇存柊
+ /// 鏇存柊鏈�鏂扮増
/// </summary>
public const int Update = 10161;
/// <summary>
@@ -808,13 +828,33 @@
/// </summary>
public const int UpdateAppFail = 10163;
/// <summary>
- /// 鏇存柊涓�...
+ /// 姝ｅ湪鏇存柊涓�...
/// </summary>
public const int Updating = 10164;
/// <summary>
/// 鍙栨秷鏇存柊
/// </summary>
public const int CancelUpdating = 10165;
+ /// <summary>
+ /// 鐗堟湰鍙�
+ /// </summary>
+ public const int VersionCode = 10166;
+ /// <summary>
+ /// 鏈嶅姟鍗忚
+ /// </summary>
+ public const int SLA = 10167;
+ /// <summary>
+ /// 鐗堟湰鏇存柊
+ /// </summary>
+ public const int UpdateVersion = 10168;
+ /// <summary>
+ /// 鍗忚鏂囨湰淇℃伅鍐呭
+ /// </summary>
+ public const int SLA_Title = 10169;
+ /// <summary>
+ /// 鍗忚璇︾粏
+ /// </summary>
+ public const int SLA_Detail = 10170;
#endregion
@@ -884,7 +924,7 @@
/// </summary>
public const int Save = 11021;
/// <summary>
- /// 鎻愮ず
+ /// 鎻愰啋
/// </summary>
public const int TIP = 11022;
/// <summary>
@@ -931,6 +971,18 @@
/// 閫夋嫨鍦烘櫙鍥剧墖
/// </summary>
public const int SelectScenePic = 11033;
+ /// <summary>
+ /// 纭畾瑕佺Щ闄よ鍔熻兘锛�
+ /// </summary>
+ public const int DeleteFunction = 11034;
+ /// <summary>
+ /// 娣诲姞鍔熻兘
+ /// </summary>
+ public const int AddFunction = 11035;
+ /// <summary>
+ /// 娣诲姞寤舵椂
+ /// </summary>
+ public const int AddDelayTime = 11036;
#region 璁惧绫诲瀷
/// <summary>
@@ -981,6 +1033,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
@@ -1227,14 +1314,25 @@
public const int NeedCleanAC = 13511;
/// <summary>
- /// 娌″姛鑳� 璇峰厛娣诲姞
+ /// 杩樻病鏈夊姛鑳藉摝
/// </summary>
public const int NoFunction_Tip = 13600;
/// <summary>
- /// 娌″満鏅� 璇峰厛娣诲姞
+ /// 杩樻病鏈夊満鏅摝
/// </summary>
public const int NoScene_Tip = 13601;
-
+ /// <summary>
+ /// 鏃�
+ /// </summary>
+ public const int No = 13602;
+ /// <summary>
+ /// 鑾峰彇涓�...
+ /// </summary>
+ public const int Getting = 13603;
+ /// <summary>
+ /// 褰撳墠 浜害
+ /// </summary>
+ public const int CurrentLightLevel = 13604;
--
Gitblit v1.8.0