From f77a3add1e7ab266e473da9128bbe5758ba3a890 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期日, 20 十二月 2020 19:29:03 +0800
Subject: [PATCH] Merge branch 'NewFilePath' into CJL

---
 HDL_ON/Common/R.cs |   16 ++++++++++++++--
 1 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/HDL_ON/Common/R.cs b/HDL_ON/Common/R.cs
old mode 100755
new mode 100644
index 21dda1c..9198ebf
--- a/HDL_ON/Common/R.cs
+++ b/HDL_ON/Common/R.cs
@@ -4,10 +4,15 @@
 {
     public static class StringId
     {
-        public const int WholeZone = 377;
+        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 WholeZone = 377;
         public const int CannotEnterSpecialCharacters = 376;
         public const int GatewayOfflineCannotCreateScene = 375;
         public const int ResidenceDeletedSwitchToAnotherResidence = 374;
@@ -774,7 +779,14 @@
         /// 浣跨敤鏉冮檺
         /// </summary>
         public const int PermissionToUse = 9060;
-
+        /// <summary>
+        /// 浣跨敤鏉冮檺
+        /// </summary>
+        public const int PleaseTryToForgetPassword = 9061;
+        /// <summary>
+        /// 鏌ョ湅
+        /// </summary>
+        public const int LookOver = 9062;
 
         #region 缃戠粶璇锋眰鍝嶅簲閿欒鎻愮ず淇℃伅
         /// <summary>

--
Gitblit v1.8.0