From 8245dd3bba861d60556cd4804b39bca74c19c329 Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期二, 29 十月 2019 14:35:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-tzy' into dev-wjc
---
ZigbeeApp/Shared/R.cs | 42 ++++++++++++++++++++++++++++++++++++------
1 files changed, 36 insertions(+), 6 deletions(-)
diff --git a/ZigbeeApp/Shared/R.cs b/ZigbeeApp/Shared/R.cs
index 4edcb02..e664844 100644
--- a/ZigbeeApp/Shared/R.cs
+++ b/ZigbeeApp/Shared/R.cs
@@ -3390,9 +3390,9 @@
/// <summary>
/// 鏃犲彲鍏变韩鐨勬埧闂�
/// </summary>
- public const int uNotShardDeviceInAllRoomMsg = 15583;
- /// <summary>
- /// 纭畾绉婚櫎閫変腑鐨勫満鏅紵
+ public const int uNotCanShardRoomMsg = 15583;
+ /// <summary>
+ /// 纭畾绉婚櫎閫変腑鐨勫満鏅紵
/// </summary>
public const int uConfirmRemoveSelectSceneMsg = 15584;
/// <summary>
@@ -3698,9 +3698,39 @@
/// <summary>
/// 骞叉帴鐐瑰娉ㄤ慨鏀规垚鍔�!
/// </summary>
- public const int uDryContactReNoteSuccess = 15669;
- /// <summary>
- /// 鑳屽厜鐏�
+ public const int uMode_Dry = 15853;
+ /// <summary>
+ /// 鎵撳紑绌鸿皟澶辫触
+ /// </summary>
+ public const int uOpenAirConditionerFail = 15854;
+ /// <summary>
+ /// 鍏抽棴绌鸿皟澶辫触
+ /// </summary>
+ public const int uCloseAirConditionerFail = 15855;
+ /// <summary>
+ /// 璇锋敞鎰忔竻娲楁护缃戝摝
+ /// </summary>
+ public const int uPleaseClreanACfilter = 15856;
+ /// <summary>
+ /// 鏃犲彲鍏变韩鐨勫満鏅�
+ /// </summary>
+ public const int uNotCanShardSceneMsg = 15857;
+ /// <summary>
+ /// 鏃犲彲鍏变韩鐨勮澶�
+ /// </summary>
+ public const int uNotCanShardDeviceMsg = 15858;
+
+ //鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄帴鍙ｇ殑杩斿洖淇℃伅缈昏瘧,浠�18000寮�濮嬧槄鈽呪槄鈽�
+ /// <summary>
+ /// 鎸囧畾缃戝叧宸茬粡琚粦瀹�
+ /// </summary>
+ public const int BindGwToHome_BindGatewaysExists = 18004;
+ /// <summary>
+ /// 鐢ㄦ埛涓嶅瓨鍦ㄤ簬姝や綇瀹�
+ /// </summary>
+ public const int BindSubAccount_NoExist = 18005;
+ /// <summary>
+ /// 璐﹀彿宸茬粡瀛樺湪浜庢浣忓畢
/// </summary>
public const int uBackLight = 15670;
/// <summary>
--
Gitblit v1.8.0