From 18a7f9f40e5fab3bee5d4ac3d8fd0273dea052d6 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期日, 26 四月 2020 12:05:28 +0800
Subject: [PATCH] 先上传一个非最新的版本
---
ZigbeeApp/Shared/R.cs | 103 +++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 91 insertions(+), 12 deletions(-)
diff --git a/ZigbeeApp/Shared/R.cs b/ZigbeeApp/Shared/R.cs
index 9fd3b3f..5171c94 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,9 +507,9 @@
/// </summary>
public const int InvalidTimeIsEmpty = 297;
/// <summary>
- /// 澶辨晥鏃堕棿涓嶈兘澶т簬36灏忔椂
+ /// 澶辨晥鏃堕棿涓嶈兘澶т簬72灏忔椂
/// </summary>
- public const int InvalidTimeMoreThan36 = 298;
+ public const int InvalidTimeMoreThan72 = 298;
/// <summary>
/// 澶辨晥鏃堕棿涓嶈兘灏忎簬1灏忔椂
/// </summary>
@@ -526,7 +522,34 @@
/// 闈炵鐞嗗憳涓嶈兘鍦ㄥ父寮�妯″紡涓嬫搷浣�
/// </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;
public readonly static int cancel = 5097;
public readonly static int confrim = 5098;
@@ -4736,7 +4759,7 @@
/// </summary>
public const int uGetPictrueFromAlbum = 15874;
/// <summary>
- /// 鍑虹幇鏈煡閿欒
+ /// 鎶辨瓑锛岀▼搴忓嚭鐜伴敊璇�
/// </summary>
public const int uUnKnownError = 15875;
/// <summary>
@@ -5580,17 +5603,70 @@
/// </summary>
public const int uEditorSceneNameFail = 16087;
/// <summary>
- /// 闂ㄩ攣鎶ヨ淇℃伅8锛氬父寮�妯″紡寮�鍚�(缃戝叧瑙﹀彂)
+ /// 闂ㄩ攣鎶ヨ淇℃伅9锛氬父寮�妯″紡寮�鍚�(缃戝叧瑙﹀彂)
/// </summary>
public const int uDoorLockAlarmMsg9 = 16088;
/// <summary>
- /// 闂ㄩ攣鎶ヨ淇℃伅8锛氬父寮�妯″紡缁撴潫(缃戝叧瑙﹀彂)
+ /// 闂ㄩ攣鎶ヨ淇℃伅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;
+
//鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄帴鍙ｇ殑杩斿洖淇℃伅缈昏瘧,浠�18000寮�濮嬧槄鈽呪槄鈽�
/// <summary>
@@ -5976,7 +6052,10 @@
/// 闀滃儚ID涓�2802鐨勮澶囩殑瀹樻柟鍚嶅瓧锛歋-one
/// </summary>
public const int uDeviceModelId2802 = 30037;
-
+ /// <summary>
+ /// 闀滃儚ID涓�2310鐨勮澶囩殑榛樿鍚嶅瓧锛氭柟鎮︽柊椋庡皬妯″潡
+ /// </summary>
+ public const int DeviceModelId2310 = 30038;
//鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄澶囨墍灞炵绫荤殑缈昏瘧鍚嶅瓧,浠�40000寮�濮嬧槄鈽呪槄鈽�
/// <summary>
--
Gitblit v1.8.0