From b68cdc7e103a00d5df73e4b75603be8da1815b4a Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期三, 29 四月 2020 13:59:52 +0800
Subject: [PATCH] 上传版本
---
ZigbeeApp/Shared/R.cs | 299 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 284 insertions(+), 15 deletions(-)
diff --git a/ZigbeeApp/Shared/R.cs b/ZigbeeApp/Shared/R.cs
index 69b7488..aa36b64 100755
--- a/ZigbeeApp/Shared/R.cs
+++ b/ZigbeeApp/Shared/R.cs
@@ -330,11 +330,7 @@
/// </summary>
public const int GetPanelProximityFail = 233;
/// <summary>
- /// 闀滃儚ID涓�2310鐨勮澶囩殑榛樿鍚嶅瓧锛氭柟鎮︽柊椋庡皬妯″潡
- /// </summary>
- public const int DeviceModelId2310 = 234;
- /// <summary>
- /// 闀滃儚ID涓�2310鐨勮澶囩殑榛樿鍚嶅瓧锛氭柟鎮︽柊椋庡皬妯″潡
+ /// 鎸変綇闈㈡澘妯″紡
/// </summary>
public const int AddFreshAirPanelMsg = 235;
/// <summary>
@@ -511,14 +507,57 @@
/// </summary>
public const int InvalidTimeIsEmpty = 297;
/// <summary>
- /// 澶辨晥鏃堕棿涓嶈兘澶т簬36灏忔椂
+ /// 澶辨晥鏃堕棿涓嶈兘澶т簬72灏忔椂
/// </summary>
- public const int InvalidTimeMoreThan36 = 298;
+ public const int InvalidTimeMoreThan72 = 298;
/// <summary>
/// 澶辨晥鏃堕棿涓嶈兘灏忎簬1灏忔椂
/// </summary>
public const int InvalidTimeLessThan1 = 299;
-
+ /// <summary>
+ /// 鏂伴
+ /// </summary>
+ public const int FreshAir = 300;
+ /// <summary>
+ /// 闈炵鐞嗗憳涓嶈兘鍦ㄥ父寮�妯″紡涓嬫搷浣�
+ /// </summary>
+ public const int OnlyMasterOperate = 301;
+ /// <summary>
+ /// 缁戝畾鏂伴
+ /// </summary>
+ public const int BindFreshAirTarget = 302;
+ /// <summary>
+ /// 娓╁害鏉ユ簮
+ /// </summary>
+ public const int TemperatureSource = 303;
+ /// <summary>
+ /// 婀垮害鏉ユ簮
+ /// </summary>
+ public const int HumiditySource = 304;
+ /// <summary>
+ /// PM2.5鏉ユ簮
+ /// </summary>
+ public const int PM25Source = 305;
+ /// <summary>
+ /// 璀﹀憡锛佹娆″父寮�妯″紡榛樿闂ㄩ攣涓�鐩村紑鐫�锛屾病鏈夊疄鐜拌嚜鍔ㄥ叧闂姛鑳�
+ /// </summary>
+ public const int AddLogicNormallyModeFailed = 307;
+ /// <summary>
+ /// 璀﹀憡锛佹椂鏁堟�у父寮�鍒犻櫎澶辫触銆�
+ /// </summary>
+ public const int CancelLogicNormallyModeFailed = 308;
+ /// <summary>
+ /// 鏃舵晥鎬у父寮�鍒犻櫎澶辫触锛岀户缁�滃父寮�妯″紡鈥濊鍓嶅線闂ㄩ攣鐢ㄦ埛鐣岄潰璁剧疆
+ /// </summary>
+ public const int CancelLogicNormallyModeFailed2 = 309;
+ /// <summary>
+ /// 璇疯緭鍏ュ悎娉曠殑鏁板瓧
+ /// </summary>
+ public const int IllegalNumber = 310;
+ /// <summary>
+ /// 鎵嬪姩
+ /// </summary>
+ public const int Manual = 311;
public readonly static int cancel = 5097;
public readonly static int confrim = 5098;
@@ -776,6 +815,14 @@
public readonly static int openmode = 5380;
public readonly static int addnull = 5381;
public readonly static int look = 5382;
+ public readonly static int closeUp = 5383;
+ public readonly static int yearSone = 5384;
+ public readonly static int monthSone = 5385;
+ public readonly static int daySone = 5386;
+ public readonly static int numberSone = 5387;
+ public readonly static int openAutomationSone = 5388;
+ public readonly static int timeSetSone= 5389;
+
#region 鐧诲綍娉ㄥ唽
/// <summary>
@@ -1102,9 +1149,9 @@
/// </summary>
public const int BelongZone = 11015;
/// <summary>
- /// 鎵�灞炴ā鍧�
+ /// 鎵�灞炶澶�
/// </summary>
- public const int BelongModel = 11016;
+ public const int BelongDevice = 11016;
/// <summary>
/// 鏈煡
/// </summary>
@@ -4028,15 +4075,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>
@@ -4728,7 +4775,7 @@
/// </summary>
public const int uGetPictrueFromAlbum = 15874;
/// <summary>
- /// 鍑虹幇鏈煡閿欒
+ /// 鎶辨瓑锛岀▼搴忓嚭鐜伴敊璇�
/// </summary>
public const int uUnKnownError = 15875;
/// <summary>
@@ -5571,6 +5618,119 @@
/// 淇敼鍦烘櫙鍚嶇О澶辫触
/// </summary>
public const int uEditorSceneNameFail = 16087;
+ /// <summary>
+ /// 闂ㄩ攣鎶ヨ淇℃伅9锛氬父寮�妯″紡寮�鍚�(缃戝叧瑙﹀彂)
+ /// </summary>
+ public const int uDoorLockAlarmMsg9 = 16088;
+ /// <summary>
+ /// 闂ㄩ攣鎶ヨ淇℃伅10锛氬父寮�妯″紡缁撴潫(缃戝叧瑙﹀彂)
+ /// </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;
+ /// <summary>
+ /// 鎮ㄧ殑鏉冮檺宸茬粡鍙樻洿,璇烽噸鏂扮櫥闄�
+ /// </summary>
+ public const int uYouAccessHadChangedPleaseTakeToAdmin = 16094;
+ /// <summary>
+ /// 鎴戝凡闃呰骞跺悓鎰�
+ /// </summary>
+ public const int uMyHadReadAndAgree = 16095;
+ /// <summary>
+ /// 闅愮鏉冩斂绛�
+ /// </summary>
+ public const int uPrivacyPolicy = 16096;
+ /// <summary>
+ /// 鍜�
+ /// </summary>
+ public const int uAnd = 16097;
+ /// <summary>
+ /// 鏈嶅姟鏉℃
+ /// </summary>
+ public const int uTermsOfService = 16098;
+ /// <summary>
+ /// 璇峰厛闃呰骞跺悓鎰忋�婇殣绉佹潈鏀跨瓥銆嬪拰銆婃湇鍔℃潯娆俱��
+ /// </summary>
+ public const int uPleaseReadAndAgreePrivacyPolicyMsg = 16099;
+ /// <summary>
+ /// 闂ㄩ攣鎶ヨ淇℃伅11锛氬父寮�妯″紡寮�鍚�(鑷姩鍖栬Е鍙�)
+ /// </summary>
+ public const int uDoorLockAlarmMsg11 = 16100;
+ /// <summary>
+ /// 闂ㄩ攣鎶ヨ淇℃伅12锛氬父寮�妯″紡缁撴潫(鑷姩鍖栬Е鍙�)
+ /// </summary>
+ public const int uDoorLockAlarmMsg12 = 16101;
+ /// <summary>
+ /// 闂ㄩ攣鎶ヨ淇℃伅13锛氫复鏃跺瘑鐮佸紑閿佹垚鍔�
+ /// </summary>
+ public const int uDoorLockAlarmMsg13 = 16102;
+ /// <summary>
+ /// 闂ㄩ攣鎶ヨ淇℃伅14锛氫复鏃跺瘑鐮佸紑閿佸け璐�
+ /// </summary>
+ public const int uDoorLockAlarmMsg14 = 16103;
+ /// <summary>
+ /// 鐢垫満绌鸿皟妯″潡
+ /// </summary>
+ public const int uSaecAirConditioningModule = 16104;
+ /// <summary>
+ /// 涓滆姖绌鸿皟妯″潡
+ /// </summary>
+ public const int uToshibaAirConditioningModule = 16105;
+ /// <summary>
+ /// 鏍煎姏绌鸿皟妯″潡
+ /// </summary>
+ public const int uGreeAirConditioningModule = 16106;
+ /// <summary>
+ /// 缇庣殑绌鸿皟妯″潡
+ /// </summary>
+ public const int uMideaAirConditioningModule = 16107;
+ /// <summary>
+ /// 铏氭嫙缃戝叧
+ /// </summary>
+ public const int uVirtualGateway = 16108;
+ /// <summary>
+ /// 鐜勫叧
+ /// </summary>
+ public const int uVestibule = 16109;
+ /// <summary>
+ /// 鍘ㄦ埧
+ /// </summary>
+ public const int uKitchen = 16110;
+ /// <summary>
+ /// 璧板粖
+ /// </summary>
+ public const int uCorridor = 16111;
+ /// <summary>
+ /// 铏氭嫙璐﹀彿
+ /// </summary>
+ public const int uVirtualAccount = 16112;
+ /// <summary>
+ /// 鐏叏寮�
+ /// </summary>
+ public const int uAllLightOpen = 16113;
+ /// <summary>
+ /// 鐏叏鍏�
+ /// </summary>
+ public const int uAllLightClose = 16114;
+ /// <summary>
+ /// 甯稿紑鑷姩鍖栨墜鍔ㄥ彇娑�
+ /// </summary>
+ public const int uNormallyOpenLogicManualClose = 16115;
+
//鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄帴鍙ｇ殑杩斿洖淇℃伅缈昏瘧,浠�18000寮�濮嬧槄鈽呪槄鈽�
/// <summary>
@@ -5956,7 +6116,10 @@
/// 闀滃儚ID涓�2802鐨勮澶囩殑瀹樻柟鍚嶅瓧锛歋-one
/// </summary>
public const int uDeviceModelId2802 = 30037;
-
+ /// <summary>
+ /// 闀滃儚ID涓�2310鐨勮澶囩殑榛樿鍚嶅瓧锛氭柟鎮︽柊椋庡皬妯″潡
+ /// </summary>
+ public const int uDeviceModelId2310 = 30038;
//鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄澶囨墍灞炵绫荤殑缈昏瘧鍚嶅瓧,浠�40000寮�濮嬧槄鈽呪槄鈽�
/// <summary>
@@ -6031,8 +6194,114 @@
/// 鑷畾涔夎澶囨墍灞濱D涓�16鐨勭炕璇戝悕瀛楋細骞叉帴鐐�
/// </summary>
public const int uDeviceBelongId16 = 40017;
+ /// <summary>
+ /// 鑷畾涔夎澶囨墍灞濱D涓�2310鐨勭炕璇戝悕瀛楋細鏂伴
+ /// </summary>
+ public const int uDeviceBelongId2310 = 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