From dbc23459fdf4e8b74a5f955fbb9fc631b4babc70 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期三, 17 三月 2021 11:56:16 +0800
Subject: [PATCH] Merge branch 'temp-wxr' into WJC

---
 HDL_ON/Common/R.cs |   24 ++++++++++++++++++++++++
 1 files changed, 24 insertions(+), 0 deletions(-)

diff --git a/HDL_ON/Common/R.cs b/HDL_ON/Common/R.cs
index 91bb3b0..8a16b35 100644
--- a/HDL_ON/Common/R.cs
+++ b/HDL_ON/Common/R.cs
@@ -4,6 +4,13 @@
 {
     public static class StringId
     {
+        public const int DeviceList = 437;
+        public const int AddedDevice = 436;
+        public const int RemoteControl = 435;
+        public const int TimeSwitch = 434;
+        public const int WaterValve = 433;
+        public const int Use3tyBrandListTip = 432;
+        public const int Not3tyBrandListTip = 431;
         public const int MinuteUint = 430;
         public const int HourUint = 429;
         public const int AnionTime = 428;
@@ -843,6 +850,23 @@
         public const int dianqi = 6058;
         public const int tianjiashibai = 6059;
         public const int chongshii = 6060;
+        public const int pipeiyaokongqi = 6061;
+        public const int dianjianniu = 6062;
+        public const int shifouyouxiangying = 6063;
+        public const int kongzhishibai = 6064;
+        public const int kongzhichenggong = 6065;
+        public const int kaiguankai = 6066; 
+        public const int moshizhileng = 6067;   
+        public const int fengsuzhongfeng = 6068; 
+        public const int wendu26 = 6069;
+        public const int shanchushebei = 6070;
+        public const int xiugaimingzi = 6071;
+        public const int querenshanchu = 6072;
+        public const int quxiao = 6073;
+        public const int bunengchaoguo10 = 6074;
+        public const int yaokongqiquyu = 6075;
+        public const int bianjixinxi = 6076;
+
 
 
 

--
Gitblit v1.8.0