From fd9e8772f7122a0ca8096b98489b59ab6f716b1f Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期一, 11 一月 2021 14:55:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/NewFilePath' into WJC

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

diff --git a/HDL_ON/Common/R.cs b/HDL_ON/Common/R.cs
index e1987e7..b08bfd4 100644
--- a/HDL_ON/Common/R.cs
+++ b/HDL_ON/Common/R.cs
@@ -4,6 +4,7 @@
 {
     public static class StringId
     {
+        public const int ConfirmAdd = 408;
         public const int Reading = 407;
         public const int MeetingGuests = 406;
         public const int Cozy = 405;
@@ -12,6 +13,7 @@
         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;
@@ -532,8 +534,27 @@
         public const int timeNoSet = 7077;
         public const int conditioncNullOrtargetNull = 7078;
         public const int gatewayNotOnline = 7079;
-
-
+        public const int timespecia = 7080;
+        public const int sunrise = 7081;
+        public const int sunset = 7082;
+        public const int at = 7083;
+        public const int punctually = 7084;
+        public const int advanced = 7085;
+        public const int minute = 7086;
+        public const int shiwaibainhua=7087;
+        public const int xuanzeshiwaibianhuatiaojian = 7088;
+        public const int shuwaigongneng = 7089;
+        public const int tianqibianhua = 7090;
+        public const int shiwaihuanjingbianhua = 7091;
+        public const int wendugaoyu = 7092;
+        public const int wendudiyu = 7093;
+        public const int shidugaoyu = 7094;
+        public const int shidudiyu = 7095;
+        public const int pmgaoyu = 7096;
+        public const int pmdiyu = 7097;
+        public const int clearday =7098;
+        public const int cloudy= 7099;
+        public const int rain = 7100;
 
 
         #region LE鏂板

--
Gitblit v1.8.0