From 41f9c8837b0551c68f8fd798c06951fa716b7ab8 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期一, 11 一月 2021 14:05:29 +0800
Subject: [PATCH] Merge branch 'NewFilePath' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into NewFilePath
---
HDL_ON/Common/R.cs | 28 ++++++++++++++++++++++++----
1 files changed, 24 insertions(+), 4 deletions(-)
diff --git a/HDL_ON/Common/R.cs b/HDL_ON/Common/R.cs
old mode 100755
new mode 100644
index 21dda1c..187de9b
--- a/HDL_ON/Common/R.cs
+++ b/HDL_ON/Common/R.cs
@@ -4,10 +4,19 @@
{
public static class StringId
{
- public const int WholeZone = 377;
+ public const int ConfirmAdd = 408;
+ public const int Reading = 407;
+ public const int MeetingGuests = 406;
+ public const int Cozy = 405;
+ public const int QuickAdjustment = 404;
+ public const int ColorTemperature = 403;
public const int Retry = 402;
public const int QRCodeIsInvalid = 401;
public const int WellComBackHome = 400;
+ public const int FunctionNotOpen = 380;
+ public const int FadeSpeed = 379;
+ public const int FadeTime = 378;
+ public const int WholeZone = 377;
public const int CannotEnterSpecialCharacters = 376;
public const int GatewayOfflineCannotCreateScene = 375;
public const int ResidenceDeletedSwitchToAnotherResidence = 374;
@@ -524,7 +533,7 @@
public const int targetNull = 7076;
public const int timeNoSet = 7077;
public const int conditioncNullOrtargetNull = 7078;
-
+ public const int gatewayNotOnline = 7079;
@@ -727,7 +736,7 @@
/// </summary>
public const int LogWithAccountAndPassword = 9048;
/// <summary>
- /// 瀵嗙爜杩炵画杈撻敊娆℃暟宸茶揪鍒�10娆�,鐢ㄦ埛宸茶閿佸畾,璇锋鏃�0鐐瑰悗鍐嶇櫥闄�
+ /// 瀵嗙爜閿欒娆℃暟杩囧锛岃处鍙疯閿佸畾锛�
/// </summary>
public const int AccountLoginLock = 9049;
/// <summary>
@@ -774,7 +783,18 @@
/// 浣跨敤鏉冮檺
/// </summary>
public const int PermissionToUse = 9060;
-
+ /// <summary>
+ /// 浣跨敤鏉冮檺
+ /// </summary>
+ public const int PleaseTryToForgetPassword = 9061;
+ /// <summary>
+ /// 鏌ョ湅
+ /// </summary>
+ public const int LookOver = 9062;
+ /// <summary>
+ /// 杩樻湁{0}娆℃満浼氥��
+ /// </summary>
+ public const int AFewMoreChances = 9063;
#region 缃戠粶璇锋眰鍝嶅簲閿欒鎻愮ず淇℃伅
/// <summary>
--
Gitblit v1.8.0