From f676a4c180fc54cc82eecbfcd24d32fe7d8581db Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 26 三月 2021 18:16:58 +0800
Subject: [PATCH] Merge branch 'CJL' into temp-wxr

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

diff --git a/HDL_ON/Common/R.cs b/HDL_ON/Common/R.cs
index 3d2d9c9..fbf9563 100644
--- a/HDL_ON/Common/R.cs
+++ b/HDL_ON/Common/R.cs
@@ -4,6 +4,10 @@
 {
     public static class StringId
     {
+        //public const int EnergyMonitoring = 439;
+        public const int EnvirSensorValueTip = 438;
+        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;
@@ -864,6 +868,10 @@
         public const int bunengchaoguo10 = 6074;
         public const int yaokongqiquyu = 6075;
         public const int bianjixinxi = 6076;
+        public const int banbenshengji = 6077;
+        public const int xitongweihuzhong = 6078;
+        public const int huoqushujushibao = 6079;
+        public const int zanshibuzhichigaigongneng = 6080;
 
 
 

--
Gitblit v1.8.0