From 3a26f6025130dcaae4aa82ea19b16ad902450eb8 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 28 十一月 2019 11:43:47 +0800
Subject: [PATCH] 合并全部代码完成
---
ZigbeeApp/Shared/R.cs | 32 +++++++++++++++++++++++++++++++-
1 files changed, 31 insertions(+), 1 deletions(-)
diff --git a/ZigbeeApp/Shared/R.cs b/ZigbeeApp/Shared/R.cs
index 60ad83f..826ff6b 100755
--- a/ZigbeeApp/Shared/R.cs
+++ b/ZigbeeApp/Shared/R.cs
@@ -306,6 +306,7 @@
public readonly static int UnlockFailed = 219;
public readonly static int DoorlockPasswordDispear = 220;
public readonly static int BindUnknownError = 221;
+ public readonly static int OffLineScene = 222;
public readonly static int RemindSetting = 548;
public readonly static int AddNewUser = 650;
@@ -879,6 +880,18 @@
/// 涓户鍣�
/// </summary>
public const int Repeater = 12109;
+ /// <summary>
+ /// 娓╁害浼犳劅鍣�
+ /// </summary>
+ public const int TemperatureSensor = 12110;
+ /// <summary>
+ /// 婀垮害浼犳劅鍣�
+ /// </summary>
+ public const int HumiditySensor = 12111;
+ /// <summary>
+ /// 娓╂箍搴︿紶鎰熷櫒
+ /// </summary>
+ public const int TemperatureAndHumiditySensor = 12112;
#endregion
@@ -1084,6 +1097,10 @@
/// 鎴戠殑鐩稿唽
/// </summary>
public const int MyAblums = 13148;
+ /// <summary>
+ /// 璇ュ満鏅鍦ㄥ欢鏃讹紝璇风◢鍚�
+ /// </summary>
+ public const int TheSceneIsDelaying = 13149;
/// <summary>
/// 閫夋嫨鎽嗛
@@ -1113,6 +1130,11 @@
/// 5鎸�
/// </summary>
public const int Swing_Fifth = 13506;
+ /// <summary>
+ /// 璇锋竻娲佹护缃�
+ /// </summary>
+ public const int NeedCleanAC = 13511;
+
#endregion
@@ -4990,7 +5012,15 @@
/// <summary>
/// 姝ｅ湪涓婁紶澶囦唤鏂囦欢
/// </summary>
- public const int uBackupFileUploading = 15975;
+ public const int uBackupFileUploading = 15975;
+ /// <summary>
+ /// 纭鍒犻櫎鍏ㄩ儴娑堟伅?
+ /// </summary>
+ public const int uDeleteAllMessageMsg = 15976;
+ /// <summary>
+ /// 纭鏍囪鍏ㄩ儴娑堟伅涓哄凡璇�?
+ /// </summary>
+ public const int uUnTipAllMessageMsg = 15977;
//鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄帴鍙ｇ殑杩斿洖淇℃伅缈昏瘧,浠�18000寮�濮嬧槄鈽呪槄鈽�
/// <summary>
--
Gitblit v1.8.0