From 3add06f19c3c68289ca58fb61d15dfa059c5c8f5 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期四, 22 七月 2021 09:21:07 +0800
Subject: [PATCH] Merge branch 'wxr7-ez' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into wxr7-ez
---
HDL_ON/Common/R.cs | 22 +++++++++++++++++++++-
1 files changed, 21 insertions(+), 1 deletions(-)
diff --git a/HDL_ON/Common/R.cs b/HDL_ON/Common/R.cs
index b0096f8..24c3126 100644
--- a/HDL_ON/Common/R.cs
+++ b/HDL_ON/Common/R.cs
@@ -5,6 +5,14 @@
public static class StringId
{
/// <summary>
+ /// 鍙互寮�濮嬩娇鐢ㄧ幆澧冧紶鎰熷櫒浜�
+ /// </summary>
+ public const int CanStartUsingEnvironmentalSensor = 481;
+ /// <summary>
+ /// 鐜浼犳劅鍣�
+ /// </summary>
+ public const int SensorEnvironment = 480;
+ /// <summary>
/// 椋庨噺
/// </summary>
public const int AirVolume = 479;
@@ -1386,7 +1394,7 @@
public const int xuanzehongwaipinpai= 6081;
public const int yaotou = 6082;
public const int disu = 6083;
- public const int zhongsu = 6084;
+ public const int fengsuqiehuan = 6084;
public const int gaosu = 6085;
public const int zidong = 6086;
public const int wendujia = 6087;
@@ -1397,6 +1405,8 @@
public const int shebeibucunzai = 6092;
public const int shebeibuzaixian = 6093;
public const int wangguanshebeibuzaixian = 6094;
+ public const int anniuchaochu30 = 6095;
+
public const int newAutomation = 7000;
public const int editAutomation = 7001;
@@ -1534,6 +1544,16 @@
public const int yizhixing = 7133;
public const int mubiaozhuangtai = 7134;
public const int diedao = 7135;
+ public const int wendu = 7136;
+ public const int shidu = 7137;
+ public const int pm25 = 7138;
+ public const int co2 = 7139;
+ public const int tvoc = 7140;
+ public const int chaobiao = 7141;
+ public const int yanzhong = 7142;
+ public const int piangao = 7143;
+ public const int youxiu = 7144;
+
#region LE鏂板
/// <summary>
--
Gitblit v1.8.0