From d87400af518ebc9274f4447f06476959c3aa5102 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期二, 14 七月 2020 16:29:42 +0800
Subject: [PATCH] Merge branch 'dev-tzy' into dev-2020xm
---
ZigbeeApp/Shared/R.cs | 41 ++++++++++++++++++++++++++++++++++++-----
1 files changed, 36 insertions(+), 5 deletions(-)
diff --git a/ZigbeeApp/Shared/R.cs b/ZigbeeApp/Shared/R.cs
index 524782f..3349e43 100644
--- a/ZigbeeApp/Shared/R.cs
+++ b/ZigbeeApp/Shared/R.cs
@@ -945,6 +945,15 @@
public readonly static int nightLightSwitch = 5406;
public readonly static int colorTemperature = 5407;
public readonly static int buzzer = 5408;
+ public readonly static int ambientLight = 5409;
+ public readonly static int illuminanceValue = 5410;
+ public readonly static int dark = 5411;
+ public readonly static int bright = 5412;
+ public readonly static int tipIlluminanceValue = 5413;
+ public readonly static int videoIntercom = 5414;
+ public readonly static int dong = 5415;
+ public readonly static int unit = 5416;
+ public readonly static int theOutdoorUnit = 5417;
@@ -2982,7 +2991,7 @@
/// </summary>
public const int uCarbonMonoxideRevealed = 15393;
/// <summary>
- /// 鏈変笉鏄庣墿浣撶粡杩�
+ /// 鏈変汉缁忚繃
/// </summary>
public const int uHadUnKnowObjectPassed = 15394;
/// <summary>
@@ -5801,7 +5810,18 @@
/// 璁剧疆璁惧鍔熻兘绫诲瀷澶辫触
/// </summary>
public const int uSetDeviceFunctionTypeFail = 16134;
-
+ /// <summary>
+ /// 鑾峰彇鍦烘櫙鍒楄〃澶辫触,缃戝叧鍥炲瓒呮椂
+ /// </summary>
+ public const int uGetSceneListFailAndTimeOut = 16135;
+ /// <summary>
+ /// 闇�閲嶆柊缁戝畾
+ /// </summary>
+ public const int uNeedToRebind = 16136;
+ /// <summary>
+ /// 鍑虹幇鎰忓鎯呭喌,鏁版嵁涓㈠け
+ /// </summary>
+ public const int uUnKnownErrorAndLostData = 16137;
@@ -6031,14 +6051,17 @@
/// </summary>
public const int uAddFangyueEnvironmentPanelMsg = 21021;
/// <summary>
- /// 绐楀笜闈㈡澘 -> 闀挎寜闈㈡澘宸︿笂瑙掓寜閿紝鎵�鏈夋寜閿畕0}鎸囩ず鐏寒璧凤紝鍒欓厤缃戞垚鍔�
+ /// 绐楀笜闈㈡澘 -> 闀挎寜闈㈡澘宸︿笂瑙掓寜閿紝鎵�鏈夋寜閿畕0}鎸囩ず鐏寒璧凤紝鍒欓厤缃戞垚鍔�
/// </summary>
public const int uAddCurtaunPanelMsg = 21022;
/// <summary>
/// 鍚搁《鐕冩皵浼犳劅鍣� -> 闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝缁胯壊蹇棯{0}杩涘叆閰嶇綉鐘舵�侊紝缁跨伅甯镐寒鍒欏叆缃戞垚鍔�
/// </summary>
public const int uAddSensorCeilingGasMsg = 21023;
-
+ /// <summary>
+ /// 鐞冨瀷绉诲姩浼犳劅鍣� -> 闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝鎸囩ず鐏彉缁裤�侀棯鐑亄0}杩涘叆閰嶇綉鐘舵�侊紝缁跨伅鐔勭伃鍒欓厤缃戞垚鍔�
+ /// </summary>
+ public const int uAddSensorSphericalMotionMsg = 21024;
//鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄ā鍧桰D鐨勫畼鏂瑰悕瀛�,浠�30000寮�濮嬧槄鈽呪槄鈽�
/// <summary>
@@ -6221,6 +6244,10 @@
/// 闀滃儚ID涓�20000鐨勮澶囩殑瀹樻柟鍚嶅瓧锛氳壊娓╃伅
/// </summary>
public const int uDeviceModelId20000 = 30044;
+ /// <summary>
+ /// 闀滃儚ID涓�1205鐨勮澶囩殑瀹樻柟鍚嶅瓧锛氱悆鍨嬬Щ鍔ㄤ紶鎰熷櫒
+ /// </summary>
+ public const int uDeviceModelId1205 = 30045;
//鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄澶囨墍灞炵绫荤殑缈昏瘧鍚嶅瓧,浠�40000寮�濮嬧槄鈽呪槄鈽�
/// <summary>
@@ -6423,7 +6450,11 @@
/// <summary>
/// 绠�绾︾幆澧冮潰鏉�
/// </summary>
- public const int uDeviceDirectionName29 = 70028;
+ public const int uDeviceDirectionName29 = 70028;
+ /// <summary>
+ /// 鐞冨瀷绉诲姩浼犳劅鍣�
+ /// </summary>
+ public const int uDeviceDirectionName30 = 70029;
}
}
--
Gitblit v1.8.0