From fa6bcb2e9907772480f99205f36ec2a1ce735a22 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 09 一月 2020 14:11:07 +0800
Subject: [PATCH] 合并代码
---
ZigbeeApp/Shared/R.cs | 25 +++++++++++++++++++++----
1 files changed, 21 insertions(+), 4 deletions(-)
diff --git a/ZigbeeApp/Shared/R.cs b/ZigbeeApp/Shared/R.cs
index 732e838..7a6f2ee 100755
--- a/ZigbeeApp/Shared/R.cs
+++ b/ZigbeeApp/Shared/R.cs
@@ -901,10 +901,10 @@
/// 缂栬緫
/// </summary>
public const int Edit = 11011;
- /// <summary>
- /// 璁剧疆鍔熻兘
- /// </summary>
- public const int FunctionSetting = 11012;
+ /// <summary>
+ /// 鍔熻兘璁剧疆
+ /// </summary>
+ public const int FunctionSetting = 11012;
/// <summary>
/// 淇℃伅缂栬緫
/// </summary>
@@ -1001,6 +1001,11 @@
/// 娣诲姞寤舵椂
/// </summary>
public const int AddDelayTime = 11036;
+ /// <summary>
+ /// 绌鸿皟妯″紡涓虹┖锛岃鍏堥厤缃�
+ /// </summary>
+ public const int AC_Model_None = 11037;
+
#region 璁惧绫诲瀷
/// <summary>
@@ -5274,6 +5279,18 @@
/// 鍔炲叕瀹�
/// </summary>
public const int uWorkRoom = 16060;
+ /// <summary>
+ /// 鐢垫満鏁版嵁寮傚父,璇烽噸缃數鏈�
+ /// </summary>
+ public const int uCurtainDataIsErrorPleaseResetCurtain = 16061;
+ /// <summary>
+ /// 鑾峰彇绌鸿皟鎽嗛鐘舵�佸け璐�
+ /// </summary>
+ public const int uGetAirConditionerSwingFunctionFail = 16062;
+ /// <summary>
+ /// 璁剧疆绌鸿皟鎽嗛澶辫触
+ /// </summary>
+ public const int uSetAirConditionerSwingFunctionFail = 16063;
//鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄帴鍙ｇ殑杩斿洖淇℃伅缈昏瘧,浠�18000寮�濮嬧槄鈽呪槄鈽�
--
Gitblit v1.8.0