From 31497bb69602433d94c8a28ea01c3ee3c7cc8576 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 24 十月 2019 14:32:30 +0800
Subject: [PATCH] 完全合并了Wjc，Xm 的 代码
---
ZigbeeApp/Shared/R.cs | 277 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 268 insertions(+), 9 deletions(-)
diff --git a/ZigbeeApp/Shared/R.cs b/ZigbeeApp/Shared/R.cs
index 08e348f..7c7e1f0 100755
--- a/ZigbeeApp/Shared/R.cs
+++ b/ZigbeeApp/Shared/R.cs
@@ -277,9 +277,15 @@
public readonly static int SetTempPasswordTip4 = 190;
public readonly static int SetTempPasswordTip5 = 191;
public readonly static int SetTempPasswordTip1 = 192;
-
-
-
+ public readonly static int NextStepXm = 193;
+ public readonly static int DeviceRemarkXm = 194;
+ public readonly static int SetSuccessXm = 195;
+ public readonly static int SetFailedXm = 196;
+ public readonly static int SetFailedXm1 = 197;
+ public readonly static int ClearFailedXm1 = 198;
+ public readonly static int ClearFailedXm = 199;
+ public readonly static int ModifyTempPasswordTip1 = 200;
+ public readonly static int ModifyTempPasswordTip2 = 201;
public readonly static int RemindSetting = 548;
public readonly static int AddNewUser = 650;
@@ -538,6 +544,7 @@
public readonly static int logictemplate = 5358;
public readonly static int onlight = 5359;
public readonly static int offlight = 5360;
+ public readonly static int OnOffSwitch=5361;
@@ -1234,7 +1241,7 @@
/// <summary>
/// 鎺у埗闈㈡澘
/// </summary>
- public static readonly int OnOffSwitch = 12101;
+ //public static readonly int OnOffSwitch = 12101;
/// <summary>
/// 缁х數鍣�
/// </summary>
@@ -4098,11 +4105,11 @@
/// </summary>
public const int uSearchGatewayFailMsg1 = 15779;
/// <summary>
- /// 1.闀挎寜ZB/RST閿�20绉掞紝缃戝叧鎭㈠鍑哄巶璁剧疆锛屾寚绀虹伅鍏ㄩ儴鐔剓0}鐏悗锛岄噸鏂板叆缃戙��
+ /// 1.闀挎寜ZB/RST閿�20绉掞紝缃戝叧鎭㈠鍑哄巶璁剧疆锛屾寚绀虹伅鍏ㄩ儴鐔勭伃鍚庯紝閲嶆柊鍏ョ綉銆�
/// </summary>
public const int uSearchGatewayFailMsg2 = 15780;
/// <summary>
- /// 2.鐐规寜HID/WCFG閿紝杩涘叆缃戝叧鎹㈢粦妯″紡锛岀郴缁熸寚绀虹伅蹇棯{0}5绉掋��
+ /// 2.鐐规寜HID/WCFG閿紝杩涘叆缃戝叧鎹㈢粦妯″紡锛岀郴缁熸寚绀虹伅蹇棯5绉掋��
/// </summary>
public const int uSearchGatewayFailMsg3 = 15781;
/// <summary>
@@ -4133,6 +4140,218 @@
/// 姝ｅ湪鎹㈢粦缃戝叧锛岃绋嶅�欌��
/// </summary>
public const int uIsReBindingPleaseWaiting = 15788;
+ /// <summary>
+ /// 璁惧閰嶇疆
+ /// </summary>
+ public const int uDeviceSettion = 15789;
+ /// <summary>
+ /// 鏁版嵁涓婁紶涓庝笅杞�
+ /// </summary>
+ public const int uDataUploadAndDownLoad = 15790;
+ /// <summary>
+ /// 缃戝叧ID
+ /// </summary>
+ public const int uGatewayID = 15791;
+ /// <summary>
+ /// 鍗忚皟鍣∕AC
+ /// </summary>
+ public const int uCoordinatorMac = 15792;
+ /// <summary>
+ /// 鍗忚皟鍣ㄤ俊閬�
+ /// </summary>
+ public const int uCoordinatorChannel = 15793;
+ /// <summary>
+ /// 鍗忚鍣≒anID
+ /// </summary>
+ public const int uCoordinatorPanid = 15794;
+ /// <summary>
+ /// 缁胯壊鎸囩ず鐏紦鎱㈤棯鐑�
+ /// </summary>
+ public const int uGreanPilotLampLinghtSlowly = 15795;
+ /// <summary>
+ /// 闀挎寜{0}绉�
+ /// </summary>
+ public const int uLongClickSomeSecond = 15796;
+ /// <summary>
+ /// 鏂瑰悜涓庨檺浣�
+ /// </summary>
+ public const int uDirectionAndLimit = 15797;
+ /// <summary>
+ /// 鎵嬫媺鎺у埗
+ /// </summary>
+ public const int uHandPullControl = 15798;
+ /// <summary>
+ /// 鍒囨崲鎵嬫媺鎺у埗澶辫触
+ /// </summary>
+ public const int uChangeHandPullControlFail = 15799;
+ /// <summary>
+ /// 鏂瑰悜
+ /// </summary>
+ public const int uDirection = 15800;
+ /// <summary>
+ /// 闄愪綅
+ /// </summary>
+ public const int uLimit = 15801;
+ /// <summary>
+ /// 寮�闄愪綅
+ /// </summary>
+ public const int uOpenLimit = 15802;
+ /// <summary>
+ /// 鍚堥檺浣�
+ /// </summary>
+ public const int uCloseLimit = 15803;
+ /// <summary>
+ /// 閲嶇疆鐢垫満
+ /// </summary>
+ public const int uResetElectricalMachinery = 15804;
+ /// <summary>
+ /// 閲嶇疆鐢垫満灏嗗垵濮嬪寲{0}鏂瑰悜涓庨檺浣嶈缃紝纭缁х画锛�
+ /// </summary>
+ public const int uResetElectricalMachineryMsg = 15805;
+ /// <summary>
+ /// 閫夋嫨鏂瑰悜
+ /// </summary>
+ public const int uDirectionSelect = 15806;
+ /// <summary>
+ /// 姝ｅ悜
+ /// </summary>
+ public const int uForwardDirection = 15807;
+ /// <summary>
+ /// 鍙嶅悜
+ /// </summary>
+ public const int uReverseDirection = 15808;
+ /// <summary>
+ /// 绐楀笜鏂瑰悜璁剧疆澶辫触
+ /// </summary>
+ public const int uSetCurtainDirectionFail = 15809;
+ /// <summary>
+ /// 鑾峰彇绐楀笜鏂瑰悜涓庨檺浣嶈缃け璐�
+ /// </summary>
+ public const int uGetCurtainDirectionAndLimitSettionFail = 15810;
+ /// <summary>
+ /// 閲嶇疆绐楀笜闄愪綅鐐瑰け璐�
+ /// </summary>
+ public const int uDeleteCurtainLimitFail = 15811;
+ /// <summary>
+ /// 璁剧疆绐楀笜闄愪綅鐐瑰け璐�
+ /// </summary>
+ public const int uCommitCurtainLimitFail = 15812;
+ /// <summary>
+ /// 纭褰撳墠浣嶇疆{0}涓哄紑闄愪綅?
+ /// </summary>
+ public const int uCommitCurtainOpenLimitMsg = 15813;
+ /// <summary>
+ /// 纭褰撳墠浣嶇疆{0}涓哄悎闄愪綅?
+ /// </summary>
+ public const int uCommitCurtainCloseLimitMsg = 15814;
+ /// <summary>
+ /// 閲嶇疆绐楀笜澶辫触
+ /// </summary>
+ public const int uRestoreCurtainFail = 15815;
+ /// <summary>
+ /// 涓婇檺浣�
+ /// </summary>
+ public const int uUpLimit = 15816;
+ /// <summary>
+ /// 涓嬮檺浣�
+ /// </summary>
+ public const int uDownLimit = 15817;
+ /// <summary>
+ /// 纭褰撳墠浣嶇疆涓轰笂闄愪綅?
+ /// </summary>
+ public const int uCommitCurtainUpLimitMsg = 15818;
+ /// <summary>
+ /// 纭褰撳墠浣嶇疆涓轰笅闄愪綅?
+ /// </summary>
+ public const int uCommitCurtainDownLimitMsg = 15819;
+ /// <summary>
+ /// 濡傛灉婊¤冻
+ /// </summary>
+ public const int uIfSatisfied = 15820;
+ /// <summary>
+ /// 灏变細
+ /// </summary>
+ public const int uResultDo = 15821;
+ /// <summary>
+ /// 瑙﹀彂鐩爣
+ /// </summary>
+ public const int uTriggerTarget = 15822;
+ /// <summary>
+ /// 寤舵椂
+ /// </summary>
+ public const int uDelayed = 15823;
+ /// <summary>
+ /// 鍒�
+ /// </summary>
+ public const int uMinute = 15824;
+ /// <summary>
+ /// 绉�
+ /// </summary>
+ public const int uSecond = 15825;
+ /// <summary>
+ /// 鐓ф槑绛夌骇
+ /// </summary>
+ public const int uLightLevel = 15826;
+ /// <summary>
+ /// 浣�
+ /// </summary>
+ public const int uLow = 15827;
+ /// <summary>
+ /// 楂�
+ /// </summary>
+ public const int uHigh = 15828;
+ /// <summary>
+ /// 娌℃湁鍙互娣诲姞鐨勭洰鏍�
+ /// </summary>
+ public const int uNotHadAddTarget = 15829;
+ /// <summary>
+ /// 閫嗘椂閽堟嫥寮�鐢垫睜鍚庣洊
+ /// </summary>
+ public const int uUnscrewTheBatteryAnticlockwise = 15830;
+ /// <summary>
+ /// 缁胯壊鎸囩ず鐏揩閫熼棯鐑�
+ /// </summary>
+ public const int uGreanPilotLampLinghtQuickly = 15831;
+ /// <summary>
+ /// 宸ヤ綔
+ /// </summary>
+ public const int uWork = 15832;
+ /// <summary>
+ /// 閰嶅
+ /// </summary>
+ public const int uPair = 15833;
+ /// <summary>
+ /// 绾㈣壊鎸囩ず鐏棯鐑�
+ /// </summary>
+ public const int uRedPilotLampLinght = 15834;
+ /// <summary>
+ /// 鎸囩ず鐏彉缁块棯鐑�
+ /// </summary>
+ public const int uPilotLampTurnGreenAndBlinks = 15835;
+ /// <summary>
+ /// 闀挎寜{0}绉�(鎸夐敭/LED)
+ /// </summary>
+ public const int uLongClickPanelLEDSomeSecond = 15836;
+ /// <summary>
+ /// 璁惧娣诲姞鎸囧紩
+ /// </summary>
+ public const int uAddDeviceHelp1 = 15837;
+ /// <summary>
+ /// 鍙兘鐢变簬褰撳墠缃戠粶杈冨樊鎴栬澶囧凡琚粬浜虹粦瀹氥��
+ /// </summary>
+ public const int uAddDeviceHelp2 = 15838;
+ /// <summary>
+ /// 1.璇风‘淇濇墜鏈轰笌璁惧涔嬮棿鐨勮窛绂昏冻澶熻繎锛屽苟涓斿懆鍥寸綉缁滅幆澧冩病鏈夊己骞叉壈銆�
+ /// </summary>
+ public const int uAddDeviceHelp3 = 15839;
+ /// <summary>
+ /// 2.鍚屾椂闇�纭搴旂敤鐨勫畾浣嶆潈闄愭湭琚叧闂�傝嫢鎵嬪姩鍏抽棴浜嗗簲鐢ㄥ畾浣嶆潈闄愬彲鑳藉鑷存棤娉曡嚜鎷斿彂鐜拌澶囥��
+ /// </summary>
+ public const int uAddDeviceHelp4 = 15840;
+ /// <summary>
+ /// 3.濡傛灉浠嶅缁堟棤娉曞彂鐜拌澶囷紝鍙兘鍥犱负璁惧宸茬粡琚粬浜虹粦瀹氫簡銆傚鏋滀綘骞朵笉娓呮鏄皝杩炴帴浜嗚澶囷紝鍙互杩涜閲嶇疆锛岄噸缃柟寮忚鏌ラ槄璇存槑涔︼紝鏍规嵁鎸囧紩鎿嶄綔銆�
+ /// </summary>
+ public const int uAddDeviceHelp5 = 15841;
//鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄帴鍙ｇ殑杩斿洖淇℃伅缈昏瘧,浠�18000寮�濮嬧槄鈽呪槄鈽�
/// <summary>
@@ -4291,6 +4510,46 @@
/// 鍥涙寜閿潰鏉� -> 闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝鎸囩ず鐏彉缁裤�侀棯鐑亄0}杩涘叆閰嶇綉鐘舵�併�傜豢鐏揩闂�3绉掑垯閰嶇綉鎴愬姛
/// </summary>
public const int uAddFourButtonPanelMsg = 21005;
+ /// <summary>
+ /// Zigbee鏅鸿兘寮�鍚堝笜鐢垫満 -> 闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝鎸囩ず鐏瘂0}鍙樼豢闂儊锛屽垯杩涘叆閰嶇綉鐘舵�亄0}缁跨伅鐔勭伃鍒欓厤缃戞垚鍔�
+ /// </summary>
+ public const int uAddCurtainAutoOpenMsg = 21006;
+ /// <summary>
+ /// Zigbee鏅鸿兘绠＄姸鐢垫満 -> 闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝鎸囩ず鐏瘂0}鍙樼豢闂儊锛屽垯杩涘叆閰嶇綉鐘舵�亄0}缁跨伅鐔勭伃鍒欓厤缃戞垚鍔�
+ /// </summary>
+ public const int uAddCurtainSiphonateMsg = 21007;
+ /// <summary>
+ /// 绾㈠浼犳劅鍣� -> 闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝缁胯壊蹇棯{0}杩涘叆閰嶇綉鐘舵�侊紝缁跨伅甯镐寒鍒欏叆缃戞垚鍔�
+ /// </summary>
+ public const int uAddSensorInfraredMsg = 21008;
+ /// <summary>
+ /// 闂ㄧ獥浼犳劅鍣� -> 闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝缁胯壊蹇棯{0}杩涘叆閰嶇綉鐘舵�侊紝缁跨伅甯镐寒鍒欏叆缃戞垚鍔�
+ /// </summary>
+ public const int uAddSensorDoorWindowMsg = 21009;
+ /// <summary>
+ /// 鐕冩皵浼犳劅鍣� -> 闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝缁胯壊蹇棯{0}杩涘叆閰嶇綉鐘舵�侊紝缁跨伅甯镐寒鍒欏叆缃戞垚鍔�
+ /// </summary>
+ public const int uAddSensorCarbonMonoxideMsg = 21010;
+ /// <summary>
+ /// 鐑熼浘浼犳劅鍣� -> 闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝缁胯壊蹇棯{0}杩涘叆閰嶇綉鐘舵�侊紝缁跨伅甯镐寒鍒欏叆缃戞垚鍔�
+ /// </summary>
+ public const int uAddSensorFireMsg = 21011;
+ /// <summary>
+ /// 姘存蹈浼犳劅鍣� -> 闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝缁胯壊蹇棯{0}杩涘叆閰嶇綉鐘舵�侊紝缁跨伅甯镐寒鍒欏叆缃戞垚鍔�
+ /// </summary>
+ public const int uAddSensorWaterMsg = 21012;
+ /// <summary>
+ /// 绌烘皵寮�鍏� -> 鎸夐敭浠庡伐浣滄ā寮忔嫧鍒伴厤瀵规ā寮�,5绉掑悗绾㈢伅{0}鎱㈤棯鐑佹椂鎷ㄥ洖宸ヤ綔妯″紡,{0}杩涘叆閰嶇綉妯″紡,绾㈢伅甯镐寒鍒欓厤缃戞垚鍔�
+ /// </summary>
+ public const int uAddAirSwitchCloudContrMsg = 21013;
+ /// <summary>
+ /// 涓户鍣� -> 闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝鎸囩ず鐏彉缁块棯鐑亄0}杩涘叆閰嶇綉鐘舵�侊紝缁跨伅鐔勭伃鍒欏叆缃戞垚鍔�
+ /// </summary>
+ public const int uAddRepeaterZigbeeMsg = 21014;
+ /// <summary>
+ /// 绌鸿皟 -> 闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝鎸囩ず鐏瘂0}鍙樼豢闂儊,杩涘叆閰嶇綉鐘舵�亄0}缁跨伅姣�5绉掗棯鐑佷竴娆″垯鍏ョ綉鎴愬姛
+ /// </summary>
+ public const int uAddAirConditionerZbGatewayMsg = 21015;
//鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄ā鍧桰D鐨勭炕璇戝悕瀛�,浠�30000寮�濮嬧槄鈽呪槄鈽�
/// <summary>
@@ -4306,7 +4565,7 @@
/// </summary>
public const int uDeviceModelId1302 = 30002;
/// <summary>
- /// 闀滃儚ID涓�1304(鏆傚畾)鐨勮澶囩殑榛樿鍚嶅瓧锛氭按渚典紶鎰熷櫒
+ /// 闀滃儚ID涓�1304(鏆傚畾)鐨勮澶囩殑榛樿鍚嶅瓧锛氭按娴镐紶鎰熷櫒
/// </summary>
public const int uDeviceModelId1304 = 30003;
/// <summary>
@@ -4318,11 +4577,11 @@
/// </summary>
public const int uDeviceModelId1301 = 30005;
/// <summary>
- /// 闀滃儚ID涓�4100鐨勮澶囩殑榛樿鍚嶅瓧锛歓IGBEE寰柇浜戞帶鍒跺櫒
+ /// 闀滃儚ID涓�4100鐨勮澶囩殑榛樿鍚嶅瓧锛歓igbee寰柇浜戞帶鍒跺櫒
/// </summary>
public const int uDeviceModelId4100 = 30006;
/// <summary>
- /// 闀滃儚ID涓�100鐨勮澶囩殑榛樿鍚嶅瓧锛歓IGBEE鏅鸿兘寮�鍚堝笜鐢垫満
+ /// 闀滃儚ID涓�100鐨勮澶囩殑榛樿鍚嶅瓧锛歓igbee鏅鸿兘寮�鍚堝笜鐢垫満
/// </summary>
public const int uDeviceModelId100 = 30007;
/// <summary>
--
Gitblit v1.8.0