From 944b87b6bcccb095cd73f13f4410fb20faf48f74 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期三, 25 十二月 2019 11:21:06 +0800
Subject: [PATCH] 2019.12.25
---
ZigbeeApp/Shared/R.cs | 124 +++++++++++++++++++++++++++++++++++++----
1 files changed, 111 insertions(+), 13 deletions(-)
diff --git a/ZigbeeApp/Shared/R.cs b/ZigbeeApp/Shared/R.cs
index 1078a12..574b6db 100644
--- a/ZigbeeApp/Shared/R.cs
+++ b/ZigbeeApp/Shared/R.cs
@@ -586,6 +586,7 @@
public const int Favorite = 10001;
+
/// <summary>
/// 鎵嬫満鍙�
/// </summary>
@@ -650,20 +651,20 @@
/// 纭畾
/// </summary>
public const int Confrim = 10115;
- /// <summary>
- /// 璇ヨ处鍙峰凡娉ㄥ唽锛屽彲鐩存帴鐧诲綍
- /// </summary>
- public const int AccountHasBeenRegistered = 10116;
+ /// <summary>
+ /// 璇ョ敤鎴峰凡瀛樺湪锛屽彲鐩存帴鐧诲綍
+ /// </summary>
+ public const int AccountHasBeenRegistered = 10116;
/// <summary>
/// 鎻愪緵鐨勫弬鏁伴敊璇�
/// </summary>
public const int PARAMETEROREMPTY = 10117;
+ /// <summary>
+ /// 纭瀵嗙爜涓嶄竴鑷达紝璇烽噸鏂拌緭鍏�
+ /// </summary>
+ public const int TwoPasswordInconsistency = 10118;
/// <summary>
- /// 涓ゆ瀵嗙爜涓嶄竴鑷�
- /// </summary>
- public const int TwoPasswordInconsistency = 10118;
- /// <summary>
- /// 楠岃瘉鐮侀敊璇�
+ /// 楠岃瘉鐮侀敊璇紝璇烽噸鏂拌緭鍏�
/// </summary>
public const int VALIDCODEANDPHONENOEQUAL = 10119;
/// <summary>
@@ -746,7 +747,18 @@
/// 鎵嬫満鍙烽敊璇紝璇烽噸鏂拌緭鍏�
/// </summary>
public const int ThePhoneError = 10139;
-
+ /// <summary>
+ /// 璇疯緭鍏ラ暱搴︿负6-13涓瓧绗︾殑瀵嗙爜
+ /// </summary>
+ public const int ThePWDLengthError = 10140;
+ /// <summary>
+ /// 浣犲凡琚己鍒朵笅绾匡紒
+ /// </summary>
+ public const int YouHaveBeenSignOut = 10141;
+ /// <summary>
+ /// 鏂板瘑鐮佸拰鍘熷瘑鐮佷竴鑷�
+ /// </summary>
+ public const int NEWPASSWORDANDOLDPASSWORDEQUAL = 10142;
/// <summary>
@@ -788,7 +800,7 @@
/// </summary>
public const int TheAppVersionIsNewest = 10160;
/// <summary>
- /// 鏇存柊
+ /// 鏇存柊鏈�鏂扮増
/// </summary>
public const int Update = 10161;
/// <summary>
@@ -800,13 +812,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
@@ -876,7 +908,7 @@
/// </summary>
public const int Save = 11021;
/// <summary>
- /// 鎻愮ず
+ /// 鎻愰啋
/// </summary>
public const int TIP = 11022;
/// <summary>
@@ -923,6 +955,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>
@@ -973,6 +1017,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
@@ -1183,6 +1262,8 @@
/// </summary>
public const int TheSceneIsDelaying = 13149;
+
+
/// <summary>
/// 閫夋嫨鎽嗛
/// </summary>
@@ -1216,6 +1297,23 @@
/// </summary>
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;
+
#endregion
--
Gitblit v1.8.0