From 23fb45dd846ed8b62304c408c6bbe64265d4ac8b Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期五, 20 十二月 2019 18:57:16 +0800
Subject: [PATCH] 代码合并
---
ZigbeeApp/Shared/R.cs | 123 +++++++++++++++++++++++++++++++++++++++-
1 files changed, 118 insertions(+), 5 deletions(-)
diff --git a/ZigbeeApp/Shared/R.cs b/ZigbeeApp/Shared/R.cs
index 23ea4c2..b47132c 100755
--- a/ZigbeeApp/Shared/R.cs
+++ b/ZigbeeApp/Shared/R.cs
@@ -579,6 +579,7 @@
public readonly static int usertip = 5370;
public readonly static int scenetip = 5371;
public readonly static int securitytip = 5372;
+ public readonly static int defaulttext = 5373;
#region 鐧诲綍娉ㄥ唽
/// <summary>
@@ -760,6 +761,10 @@
/// 浣犲凡琚己鍒朵笅绾匡紒
/// </summary>
public const int YouHaveBeenSignOut = 10141;
+ /// <summary>
+ /// 鏂板瘑鐮佸拰鍘熷瘑鐮佷竴鑷�
+ /// </summary>
+ public const int NEWPASSWORDANDOLDPASSWORDEQUAL = 10142;
/// <summary>
@@ -1263,7 +1268,14 @@
/// 娌″満鏅� 璇峰厛娣诲姞
/// </summary>
public const int NoScene_Tip = 13601;
-
+ /// <summary>
+ /// 鏃�
+ /// </summary>
+ public const int No = 13602;
+ /// <summary>
+ /// 鑾峰彇涓�...
+ /// </summary>
+ public const int Getting = 13603;
@@ -4975,6 +4987,82 @@
/// 姝ｅ湪閲嶇疆鐢垫満
/// </summary>
public const int uElectricalMachineryResetting = 16006;
+ /// <summary>
+ /// 澶ч噾绌鸿皟妯″潡
+ /// </summary>
+ public const int uDakAirConditioningModule = 16007;
+ /// <summary>
+ /// 娌℃湁鍙崌绾х殑绌鸿皟妯″潡
+ /// </summary>
+ public const int uNotHadAirConditioningUpdateModule = 16008;
+ /// <summary>
+ /// 绌鸿皟鍗囩骇妯″潡
+ /// </summary>
+ public const int uAirConditioningUpdateModule = 16009;
+ /// <summary>
+ /// 鑾峰彇绌鸿皟妯″潡鐗堟湰澶辫触
+ /// </summary>
+ public const int uGetAirConditionerModelVersionFail = 16010;
+ /// <summary>
+ /// 鍙戦�佸崌绾у懡浠ゅけ璐�
+ /// </summary>
+ public const int uSendUpdateComandFail = 16011;
+ /// <summary>
+ /// 鐗堟湰鍙风浉鍚�,鍗囩骇澶辫触
+ /// </summary>
+ public const int uVersionIsEqualAndUpdateFail = 16012;
+ /// <summary>
+ /// 鏍￠獙鐗堟湰鍙峰け璐�
+ /// </summary>
+ public const int uCheckVersionFail = 16013;
+ /// <summary>
+ /// 妫�娴嬭澶囩増鏈�
+ /// </summary>
+ public const int uCheckDeviceVersion = 16014;
+ /// <summary>
+ /// 鍝嶅簲瓒呮椂,妫�娴嬭澶囩増鏈け璐�
+ /// </summary>
+ public const int uResponseTimeoutsAndCheckDeviceVersionFail = 16015;
+ /// <summary>
+ /// 姝ｅ湪鍙戦�佸崌绾у畬鎴愮殑鍛戒护
+ /// </summary>
+ public const int uSendingFinishUpdateComand = 16016;
+ /// <summary>
+ /// 鍝嶅簲瓒呮椂,鍙戦�佸崌绾у畬鎴愮殑鍛戒护澶辫触
+ /// </summary>
+ public const int uResponseTimeoutsAndSendingFinishUpdateComandFail = 16017;
+ /// <summary>
+ /// 閲嶅伐绌鸿皟妯″潡
+ /// </summary>
+ public const int uHicAirConditioningModule = 16018;
+ /// <summary>
+ /// 鎸囩ず鐏彉缁裤�侀棯鐑�
+ /// </summary>
+ public const int uPilotLinghtInCreanAndLinght = 16019;
+ /// <summary>
+ /// 閽堝瓟寮忛噸缃寜閿�
+ /// </summary>
+ public const int uPinholeTypeResetButton = 16020;
+ /// <summary>
+ /// 淇″彿鍥炬爣蹇棯
+ /// </summary>
+ public const int uSignalIconFlash = 16021;
+ /// <summary>
+ /// 淇″彿鍥炬爣
+ /// </summary>
+ public const int uSignalIcon = 16022;
+ /// <summary>
+ /// 鎻愰啋
+ /// </summary>
+ public const int uRemind = 16023;
+ /// <summary>
+ /// 缁戝畾鎴愬姛锛佷笅娆′綘鍙互鐢ㄥ井淇0}璐﹀彿蹇�熺櫥褰曞暒
+ /// </summary>
+ public const int uBindWebchatSuccessMsg = 16024;
+ /// <summary>
+ /// 濂界殑
+ /// </summary>
+ public const int uWell = 16025;
//鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄帴鍙ｇ殑杩斿洖淇℃伅缈昏瘧,浠�18000寮�濮嬧槄鈽呪槄鈽�
/// <summary>
@@ -5018,7 +5106,7 @@
/// </summary>
public const int ValidatorCode_ValidCodeAndPhoneNoEqual = 18016;
/// <summary>
- /// 鏈彂閫侀獙璇佺爜鍒版璐﹀彿
+ /// 楠岃瘉鐮佸凡澶辨晥
/// </summary>
public const int ValidatorCode_NoRecord = 18017;
/// <summary>
@@ -5177,6 +5265,15 @@
/// 绌鸿皟 -> 闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝鎸囩ず鐏瘂0}鍙樼豢闂儊,杩涘叆閰嶇綉鐘舵�亄0}缁跨伅姣�5绉掗棯鐑佷竴娆″垯鍏ョ綉鎴愬姛
/// </summary>
public const int uAddAirConditionerZbGatewayMsg = 21015;
+ /// <summary>
+ /// Pir浼犳劅鍣� -> 闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝鎸囩ず鐏彉缁裤�亄0}闂儊杩涘叆閰嶇綉鐘舵�併�傜豢鐏唲鐏垯閰嶇綉鎴愬姛
+ /// </summary>
+ public const int uAddSensorPirMsg = 21016;
+ /// <summary>
+ /// 娓╂箍搴︿紶鎰熷櫒 -> 闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝淇″彿鍥炬爣{0}蹇棯锛� 杩涘叆閰嶇綉鐘舵�併�傚浘鏍囧父浜垯閰嶇綉鎴愬姛
+ /// </summary>
+ public const int uAddSensorTemperatureAndHumidityMsg = 21017;
+
//鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄ā鍧桰D鐨勭炕璇戝悕瀛�,浠�30000寮�濮嬧槄鈽呪槄鈽�
/// <summary>
@@ -5330,7 +5427,7 @@
/// </summary>
public const int uDeviceBelongId3900 = 40007;
/// <summary>
- /// 鑷畾涔夎澶囨墍灞濱D涓�4100鐨勭炕璇戝悕瀛楋細绌烘皵寮�鍏�
+ /// 鑷畾涔夎澶囨墍灞濱D涓�4100鐨勭炕璇戝悕瀛楋細鏅鸿兘绌哄紑
/// </summary>
public const int uDeviceBelongId4100 = 40008;
/// <summary>
@@ -5346,12 +5443,28 @@
/// </summary>
public const int uDeviceBelongId10 = 40011;
/// <summary>
- /// 鑷畾涔夎澶囨墍灞濱D涓�10鐨勭炕璇戝悕瀛楋細娓╁害浼犳劅鍣�
+ /// 鑷畾涔夎澶囨墍灞濱D涓�11鐨勭炕璇戝悕瀛楋細娓╁害浼犳劅鍣�
/// </summary>
public const int uDeviceBelongId11 = 40012;
/// <summary>
- /// 鑷畾涔夎澶囨墍灞濱D涓�10鐨勭炕璇戝悕瀛楋細婀垮害浼犳劅鍣�
+ /// 鑷畾涔夎澶囨墍灞濱D涓�12鐨勭炕璇戝悕瀛楋細婀垮害浼犳劅鍣�
/// </summary>
public const int uDeviceBelongId12 = 40013;
+ /// <summary>
+ /// 鑷畾涔夎澶囨墍灞濱D涓�13鐨勭炕璇戝悕瀛楋細寮�鍏�
+ /// </summary>
+ public const int uDeviceBelongId13 = 15665;
+ /// <summary>
+ /// 鑷畾涔夎澶囨墍灞濱D涓�14鐨勭炕璇戝悕瀛楋細鎻掑骇
+ /// </summary>
+ public const int uDeviceBelongId14 = 15666;
+ /// <summary>
+ /// 鑷畾涔夎澶囨墍灞濱D涓�15鐨勭炕璇戝悕瀛楋細鐏厜
+ /// </summary>
+ public const int uDeviceBelongId15 = 15071;
+ /// <summary>
+ /// 鑷畾涔夎澶囨墍灞濱D涓�16鐨勭炕璇戝悕瀛楋細骞叉帴鐐�
+ /// </summary>
+ public const int uDeviceBelongId16 = 40014;
}
}
--
Gitblit v1.8.0