From 9a4b76398009cf76c508d61f7e48fb6f5cb7ac2d Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期二, 21 七月 2020 09:46:53 +0800
Subject: [PATCH] 请合并最新多功能面板代码
---
ZigbeeApp/Shared/R.cs | 89 ++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 84 insertions(+), 5 deletions(-)
diff --git a/ZigbeeApp/Shared/R.cs b/ZigbeeApp/Shared/R.cs
old mode 100755
new mode 100644
index de1dffb..646002c
--- a/ZigbeeApp/Shared/R.cs
+++ b/ZigbeeApp/Shared/R.cs
@@ -350,7 +350,7 @@
/// </summary>
public const int AddFreshAirModulPanelMsg = 239;
/// <summary>
- /// 璁剧疆甯稿紑妯″紡鍚庯紝鎮ㄧ殑闂ㄩ攣灏嗗缁坽0}澶勪簬鎵撳紑鐘舵�侊紝纭寮�鍚紵
+ /// 璁剧疆甯稿紑妯″紡鍚庯紝鎮ㄧ殑闂ㄩ攣灏嗗缁坽0}澶勪簬鎵撳紑鐘舵�侊紝纭寮�鍚紵
/// </summary>
public const int SetDoorLockNomallyOpen = 241;
/// <summary>
@@ -622,6 +622,46 @@
/// 闀挎寜鈥滃紑鍏斥�濇寜閿�5绉�
/// </summary>
public const int LongPressButtonSwitch = 327;
+ /// <summary>
+ /// 鏈�澶氬彲娣诲姞{0}涓�
+ /// </summary>
+ public const int AddMoreTip = 328;
+ /// <summary>
+ /// 缁戝畾
+ /// </summary>
+ public const int Bind = 329;
+ /// <summary>
+ /// 330=璇ヨ澶囨槸缁х數鍣紝褰撳墠鍙敮鎸佸甫鏈夎皟鍏夌殑鐏厜缁戝畾
+ /// </summary>
+ public readonly static int CanSelectDimmer = 330;
+ /// <summary>
+ /// 璇ヨ澶囨槸璋冨厜鐏紝褰撳墠鍙敮鎸佷笉甯︽湁璋冨厜鐨勭伅鍏夌粦瀹�
+ /// </summary>
+ public readonly static int CanSelectRelay = 331;
+ /// <summary>
+ /// 绌鸿皟鐩爣
+ /// </summary>
+ public const int AcTargets = 332;
+ /// <summary>
+ /// 涓嶇粦瀹氫换浣曠洰鏍�
+ /// </summary>
+ public const int BindEmptyTargets = 333;
+ /// <summary>
+ /// /鐫＄湢鏃堕棿
+ /// </summary>
+ public const int SleepTime = 334;
+ /// <summary>
+ /// 璀﹀憡锛佹暟鎹嚭閿欙紝蹇呴』鍒锋柊鍒楄〃锛屽惁鍒欐帶鍒剁幇璞￠敊涔�
+ /// </summary>
+ public const int UpdateBindList = 335;
+ /// <summary>
+ /// 鍚屾
+ /// </summary>
+ public const int Synchronization = 336;
+ /// <summary>
+ /// 鍚屾澶辫触
+ /// </summary>
+ public const int SynchronizationFailed = 337;
public readonly static int cancel = 5097;
public readonly static int confrim = 5098;
@@ -902,6 +942,19 @@
public readonly static int executeSone = 5403;
public readonly static int hour1 = 5404;
public readonly static int mi = 5405;
+ 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;
+
/// <summary>
@@ -2938,7 +2991,7 @@
/// </summary>
public const int uCarbonMonoxideRevealed = 15393;
/// <summary>
- /// 鏈変笉鏄庣墿浣撶粡杩�
+ /// 鏈変汉缁忚繃
/// </summary>
public const int uHadUnKnowObjectPassed = 15394;
/// <summary>
@@ -5753,7 +5806,22 @@
/// 灏忓鐏紑鍏�
/// </summary>
public const int uMiniLightSwitch = 16133;
-
+ /// <summary>
+ /// 璁剧疆璁惧鍔熻兘绫诲瀷澶辫触
+ /// </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;
@@ -5990,7 +6058,10 @@
/// 鍚搁《鐕冩皵浼犳劅鍣� -> 闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝缁胯壊蹇棯{0}杩涘叆閰嶇綉鐘舵�侊紝缁跨伅甯镐寒鍒欏叆缃戞垚鍔�
/// </summary>
public const int uAddSensorCeilingGasMsg = 21023;
-
+ /// <summary>
+ /// 鐞冨瀷绉诲姩浼犳劅鍣� -> 闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝鎸囩ず鐏彉缁裤�侀棯鐑亄0}杩涘叆閰嶇綉鐘舵�侊紝缁跨伅鐔勭伃鍒欓厤缃戞垚鍔�
+ /// </summary>
+ public const int uAddSensorSphericalMotionMsg = 21024;
//鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄ā鍧桰D鐨勫畼鏂瑰悕瀛�,浠�30000寮�濮嬧槄鈽呪槄鈽�
/// <summary>
@@ -6173,6 +6244,10 @@
/// 闀滃儚ID涓�20000鐨勮澶囩殑瀹樻柟鍚嶅瓧锛氳壊娓╃伅
/// </summary>
public const int uDeviceModelId20000 = 30044;
+ /// <summary>
+ /// 闀滃儚ID涓�1205鐨勮澶囩殑瀹樻柟鍚嶅瓧锛氱悆鍨嬬Щ鍔ㄤ紶鎰熷櫒
+ /// </summary>
+ public const int uDeviceModelId1205 = 30045;
//鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄澶囨墍灞炵绫荤殑缈昏瘧鍚嶅瓧,浠�40000寮�濮嬧槄鈽呪槄鈽�
/// <summary>
@@ -6375,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