From bff8993501334c4f3c5f902216fe03253be747f8 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期三, 15 四月 2020 16:59:01 +0800
Subject: [PATCH] 合并新代码
---
ZigbeeApp20200414/Shared/R.cs | 159 +++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 143 insertions(+), 16 deletions(-)
diff --git a/ZigbeeApp20200414/Shared/R.cs b/ZigbeeApp20200414/Shared/R.cs
index ba2c881..c27b71b 100644
--- a/ZigbeeApp20200414/Shared/R.cs
+++ b/ZigbeeApp20200414/Shared/R.cs
@@ -332,9 +332,9 @@
/// <summary>
/// 闀滃儚ID涓�2310鐨勮澶囩殑榛樿鍚嶅瓧锛氭柟鎮︽柊椋庡皬妯″潡
/// </summary>
- public const int DeviceModelId2310 = 234;
+ public const int uDeviceModelId2310 = 234;
/// <summary>
- /// 闀滃儚ID涓�2310鐨勮澶囩殑榛樿鍚嶅瓧锛氭柟鎮︽柊椋庡皬妯″潡
+ /// 鎸変綇闈㈡澘妯″紡
/// </summary>
public const int AddFreshAirPanelMsg = 235;
/// <summary>
@@ -518,9 +518,9 @@
/// 澶辨晥鏃堕棿涓嶈兘灏忎簬1灏忔椂
/// </summary>
public const int InvalidTimeLessThan1 = 299;
- /// <summary>
- /// 鏂伴
- /// </summary>
+ /// <summary>
+ /// 鏂伴
+ /// </summary>
public const int FreshAir = 300;
/// <summary>
/// 闈炵鐞嗗憳涓嶈兘鍦ㄥ父寮�妯″紡涓嬫搷浣�
@@ -542,7 +542,14 @@
/// PM2.5鏉ユ簮
/// </summary>
public const int PM25Source = 305;
-
+ /// <summary>
+ /// 涓嶈兘鍒涘缓鑷姩鍖栧父寮�妯″紡
+ /// </summary>
+ public const int AddLogicNormallyModeFailed = 307;
+ /// <summary>
+ /// 涓嶈兘鍙栨秷鑷姩鍖栧父寮�妯″紡
+ /// </summary>
+ public const int CancelLogicNormallyModeFailed = 308;
public readonly static int cancel = 5097;
public readonly static int confrim = 5098;
@@ -4052,15 +4059,15 @@
/// </summary>
public const int uDoorLockAlarmMsg5 = 15699;
/// <summary>
- /// 闂ㄩ攣鎶ヨ淇℃伅6锛氬父寮�妯″紡寮�鍚�
+ /// 闂ㄩ攣鎶ヨ淇℃伅6锛氬父寮�妯″紡寮�鍚�(闂ㄩ攣瑙﹀彂)
/// </summary>
public const int uDoorLockAlarmMsg6 = 15700;
/// <summary>
- /// 闂ㄩ攣鎶ヨ淇℃伅7锛氬父寮�妯″紡缁撴潫
+ /// 闂ㄩ攣鎶ヨ淇℃伅7锛氬父寮�妯″紡缁撴潫(闂ㄩ攣瑙﹀彂)
/// </summary>
public const int uDoorLockAlarmMsg7 = 15701;
/// <summary>
- /// 闂ㄩ攣鎶ヨ淇℃伅8锛氶棬閾冭Е鍙�
+ /// 闂ㄩ攣鎶ヨ淇℃伅8锛氭湁浜鸿闂�
/// </summary>
public const int uDoorLockAlarmMsg8 = 15702;
/// <summary>
@@ -5595,6 +5602,31 @@
/// 淇敼鍦烘櫙鍚嶇О澶辫触
/// </summary>
public const int uEditorSceneNameFail = 16087;
+ /// <summary>
+ /// 闂ㄩ攣鎶ヨ淇℃伅8锛氬父寮�妯″紡寮�鍚�(缃戝叧瑙﹀彂)
+ /// </summary>
+ public const int uDoorLockAlarmMsg9 = 16088;
+ /// <summary>
+ /// 闂ㄩ攣鎶ヨ淇℃伅8锛氬父寮�妯″紡缁撴潫(缃戝叧瑙﹀彂)
+ /// </summary>
+ public const int uDoorLockAlarmMsg10 = 16089;
+ /// <summary>
+ /// 甯稿紑妯″紡
+ /// </summary>
+ public const int uNormallyOpenMode = 16090;
+ /// <summary>
+ /// 甯稿紑妯″紡鎵嬪姩寮�鍚�
+ /// </summary>
+ public const int uNormallyOpenModeManualOpen = 16091;
+ /// <summary>
+ /// 甯稿紑妯″紡鎵嬪姩鍙栨秷
+ /// </summary>
+ public const int uNormallyOpenModeManualClose = 16092;
+ /// <summary>
+ /// 甯稿紑妯″紡鍚敤{0}灏忔椂
+ /// </summary>
+ public const int uNormallyOpenModeOpenSomeTime = 16093;
+
//鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄帴鍙ｇ殑杩斿洖淇℃伅缈昏瘧,浠�18000寮�濮嬧槄鈽呪槄鈽�
/// <summary>
@@ -5981,8 +6013,6 @@
/// </summary>
public const int uDeviceModelId2802 = 30037;
- //锛燂紵锛燂紵鏂规偊鏂伴闈㈡澘
-
//鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄澶囨墍灞炵绫荤殑缈昏瘧鍚嶅瓧,浠�40000寮�濮嬧槄鈽呪槄鈽�
/// <summary>
@@ -6058,12 +6088,109 @@
/// </summary>
public const int uDeviceBelongId16 = 40017;
- /// <summary>
- /// 鑷畾涔夎澶囨墍灞濱D涓�18鐨勭炕璇戝悕瀛楋細鏂伴
- /// </summary>
- public const int uDeviceBelongId18 = 40018;
-
//鈽呪槄鈽呪槄妯″潡ID鐨勮澶囬粯璁ゅ娉ㄥ悕瀛�,浠�50000寮�濮�,杩欓噷涓嶉渶瑕佸畾涔�,鍙啓鍦↙anguage.ini鏂囦欢閲岄潰鈽呪槄鈽呪槄
//鈽呪槄鈽呪槄妯″潡ID鐨勮澶囩被鍨嬪悕瀛�,浠�60000寮�濮�,杩欓噷涓嶉渶瑕佸畾涔�,鍙啓鍦↙anguage.ini鏂囦欢閲岄潰鈽呪槄鈽呪槄
+
+ //鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄坊鍔犳柊璁惧鐣岄潰閭ｉ噷鏄剧ず鐨勫悕瀛�,浠�70000寮�濮嬧槄鈽呪槄鈽�
+ /// <summary>
+ /// 2鎸夐敭闈㈡澘
+ /// </summary>
+ public const int uDeviceDirectionName1 = 70000;
+ /// <summary>
+ /// 3鎸夐敭闈㈡澘
+ /// </summary>
+ public const int uDeviceDirectionName2 = 70001;
+ /// <summary>
+ /// 4鎸夐敭闈㈡澘
+ /// </summary>
+ public const int uDeviceDirectionName3 = 70002;
+ /// <summary>
+ /// 鏂规偊鍗曞紑鍙屾帶闈㈡澘
+ /// </summary>
+ public const int uDeviceDirectionName4 = 70003;
+ /// <summary>
+ /// 鏂规偊鍙屽紑鍥涙帶闈㈡澘
+ /// </summary>
+ public const int uDeviceDirectionName5 = 70004;
+ /// <summary>
+ /// 鏂规偊鍥涘紑鍏帶闈㈡澘
+ /// </summary>
+ public const int uDeviceDirectionName6 = 70005;
+ /// <summary>
+ /// 鏂规偊鏂伴灏忔ā鍧�
+ /// </summary>
+ public const int uDeviceDirectionName7 = 70006;
+ /// <summary>
+ /// 鏂规偊鏂伴闈㈡澘
+ /// </summary>
+ public const int uDeviceDirectionName8 = 70007;
+ /// <summary>
+ /// 鏂规偊鐜闈㈡澘
+ /// </summary>
+ public const int uDeviceDirectionName9 = 70008;
+ /// <summary>
+ /// 绐楀笜闈㈡澘
+ /// </summary>
+ public const int uDeviceDirectionName10 = 70009;
+ /// <summary>
+ /// 3璺户鐢靛櫒
+ /// </summary>
+ public const int uDeviceDirectionName11 = 70010;
+ /// <summary>
+ /// 1璺皟鍏夊櫒
+ /// </summary>
+ public const int uDeviceDirectionName12 = 70011;
+ /// <summary>
+ /// 绐楀笜鐢垫満
+ /// </summary>
+ public const int uDeviceDirectionName13 = 70012;
+ /// <summary>
+ /// 鍗峰笜鐢垫満
+ /// </summary>
+ public const int uDeviceDirectionName14 = 70013;
+ /// <summary>
+ /// 绌鸿皟缃戝叧
+ /// </summary>
+ public const int uDeviceDirectionName15 = 70014;
+ /// <summary>
+ /// 闂ㄩ攣
+ /// </summary>
+ public const int uDeviceDirectionName16 = 70015;
+ /// <summary>
+ /// PIR浼犳劅鍣�
+ /// </summary>
+ public const int uDeviceDirectionName17 = 70016;
+ /// <summary>
+ /// 绾㈠浼犳劅鍣�
+ /// </summary>
+ public const int uDeviceDirectionName18 = 70017;
+ /// <summary>
+ /// 鐕冩皵浼犳劅鍣�
+ /// </summary>
+ public const int uDeviceDirectionName19 = 70018;
+ /// <summary>
+ /// 鐑熼浘浼犳劅鍣�
+ /// </summary>
+ public const int uDeviceDirectionName20 = 70019;
+ /// <summary>
+ /// 姘存蹈浼犳劅鍣�
+ /// </summary>
+ public const int uDeviceDirectionName21 = 70020;
+ /// <summary>
+ /// 闂ㄧ獥浼犳劅鍣�
+ /// </summary>
+ public const int uDeviceDirectionName22 = 70021;
+ /// <summary>
+ /// 娓╂箍搴︿紶鎰熷櫒
+ /// </summary>
+ public const int uDeviceDirectionName23 = 70022;
+ /// <summary>
+ /// 涓户鍣�
+ /// </summary>
+ public const int uDeviceDirectionName24 = 70023;
+ /// <summary>
+ /// 鏅鸿兘绌哄紑
+ /// </summary>
+ public const int uDeviceDirectionName25 = 70024;
}
}
--
Gitblit v1.8.0