From fe3b2466c68b5db70d38e78039703add3b8b1dfe Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 31 十二月 2020 19:29:43 +0800
Subject: [PATCH] 合并了代码
---
ZigbeeApp/Shared/R.cs | 69 ++++++++++++++++++++++++++++++++++
1 files changed, 68 insertions(+), 1 deletions(-)
diff --git a/ZigbeeApp/Shared/R.cs b/ZigbeeApp/Shared/R.cs
index ccf3348..1f348e8 100755
--- a/ZigbeeApp/Shared/R.cs
+++ b/ZigbeeApp/Shared/R.cs
@@ -838,7 +838,74 @@
/// 璁剧疆鏅捐。鏋舵秷姣掓椂闂村け璐�
/// </summary>
public const int AirerDisinfectTimeFailed = 389;
-
+ /// <summary>
+ /// PM 2.5浼犳劅鍣�
+ /// </summary>
+ public const int Pm2P5Sensor = 390;
+ /// <summary>
+ /// CO2浼犳劅鍣�
+ /// </summary>
+ public const int CO2Sensor = 391;
+ /// <summary>
+ /// 璁剧疆LED鐏�
+ /// </summary>
+ public const int SetAirQualitySensorLight = 392;
+ /// <summary>
+ /// 鏌ョ湅鍘嗗彶璁板綍
+ /// </summary>
+ public const int CheckAirQualitySensorHistory = 393;
+ /// <summary>
+ /// 璁惧LED鐏�
+ /// </summary>
+ public const int Pollution = 394;
+ /// <summary>
+ /// LED璁剧疆
+ /// </summary>
+ public const int LEDSet = 395;
+ /// <summary>
+ /// 璁惧LED鐏�
+ /// </summary>
+ public const int DeviceLED = 396;
+ /// <summary>
+ /// 璁剧疆鏃堕棿
+ /// </summary>
+ public const int LEDSetTime = 397;
+ /// <summary>
+ /// 涓婂崍
+ /// </summary>
+ public const int Morning = 398;
+ /// <summary>
+ /// 涓嬪崍
+ /// </summary>
+ public const int Afternoon = 399;
+ /// <summary>
+ /// 鑾峰彇鍒楄〃鏁版嵁閮ㄥ垎涓㈠け锛岃鍒锋柊閲嶆柊鑾峰彇
+ /// </summary>
+ public const int GetLedTimeLost = 400;
+ /// <summary>
+ /// LED鐏叧闂�
+ /// </summary>
+ public const int LedClose = 401;
+ /// <summary>
+ /// 璇疯缃紑濮嬫椂闂�
+ /// </summary>
+ public const int StartTimeEmpty = 402;
+ /// <summary>
+ /// 璇疯缃紑缁撴潫鏃堕棿
+ /// </summary>
+ public const int EndTimeEmpty = 403;
+ /// <summary>
+ /// 鏈�澶氬彲璁剧疆5鏉″け鏁堟椂闂存
+ /// </summary>
+ public const int LedBindFull = 404;
+ /// <summary>
+ /// 寮�濮嬫椂闂翠笉鑳藉ぇ浜庣粨鏉熸椂闂�
+ /// </summary>
+ public const int LedBindTip1 = 405;
+ /// <summary>
+ /// 缁撴潫鏃堕棿涓嶈兘灏忎簬寮�濮嬫椂闂�
+ /// </summary>
+ public const int LedBindTip2 = 406;
public readonly static int cancel = 5097;
public readonly static int confrim = 5098;
--
Gitblit v1.8.0