From 5986f63b75bd81c6cef262c670e9251c038cbf5d Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期二, 17 十二月 2019 17:21:07 +0800
Subject: [PATCH] 合并一个版本
---
ZigbeeApp/Shared/R.cs | 202 ++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 176 insertions(+), 26 deletions(-)
diff --git a/ZigbeeApp/Shared/R.cs b/ZigbeeApp/Shared/R.cs
old mode 100644
new mode 100755
index aba0dce..23ea4c2
--- a/ZigbeeApp/Shared/R.cs
+++ b/ZigbeeApp/Shared/R.cs
@@ -307,6 +307,8 @@
public readonly static int DoorlockPasswordDispear = 220;
public readonly static int BindUnknownError = 221;
public readonly static int OffLineScene = 222;
+ public readonly static int SureClearKeyModeAndTargets = 223;
+ public readonly static int BindDeviceTargetIsEmpty = 224;
public readonly static int RemindSetting = 548;
public readonly static int AddNewUser = 650;
@@ -573,7 +575,10 @@
public readonly static int linkageevent = 5366;
public readonly static int current = 5367;
public readonly static int selecfoolr = 5368;
-
+ public readonly static int delaytip = 5369;
+ public readonly static int usertip = 5370;
+ public readonly static int scenetip = 5371;
+ public readonly static int securitytip = 5372;
#region 鐧诲綍娉ㄥ唽
/// <summary>
@@ -584,6 +589,7 @@
/// 甯哥敤
/// </summary>
public const int Favorite = 10001;
+
/// <summary>
@@ -650,20 +656,20 @@
/// 纭畾
/// </summary>
public const int Confrim = 10115;
- /// <summary>
- /// 璇ヨ处鍙峰凡娉ㄥ唽锛屽彲鐩存帴鐧诲綍
- /// </summary>
- public const int AccountHasBeenRegistered = 10116;
+ /// <summary>
+ /// 璇ョ敤鎴峰凡瀛樺湪锛屽彲鐩存帴鐧诲綍
+ /// </summary>
+ public const int AccountHasBeenRegistered = 10116;
/// <summary>
/// 鎻愪緵鐨勫弬鏁伴敊璇�
/// </summary>
public const int PARAMETEROREMPTY = 10117;
+ /// <summary>
+ /// 纭瀵嗙爜涓嶄竴鑷达紝璇烽噸鏂拌緭鍏�
+ /// </summary>
+ public const int TwoPasswordInconsistency = 10118;
/// <summary>
- /// 涓ゆ瀵嗙爜涓嶄竴鑷�
- /// </summary>
- public const int TwoPasswordInconsistency = 10118;
- /// <summary>
- /// 楠岃瘉鐮侀敊璇�
+ /// 楠岃瘉鐮侀敊璇紝璇烽噸鏂拌緭鍏�
/// </summary>
public const int VALIDCODEANDPHONENOEQUAL = 10119;
/// <summary>
@@ -745,7 +751,11 @@
/// <summary>
/// 鎵嬫満鍙烽敊璇紝璇烽噸鏂拌緭鍏�
/// </summary>
- public const int ThePhoneError = 10139;
+ public const int ThePhoneError = 10139;
+ /// <summary>
+ /// 璇疯緭鍏ラ暱搴︿负6-13涓瓧绗︾殑瀵嗙爜
+ /// </summary>
+ public const int ThePWDLengthError = 10140;
/// <summary>
/// 浣犲凡琚己鍒朵笅绾匡紒
/// </summary>
@@ -791,7 +801,7 @@
/// </summary>
public const int TheAppVersionIsNewest = 10160;
/// <summary>
- /// 鏇存柊
+ /// 鏇存柊鏈�鏂扮増
/// </summary>
public const int Update = 10161;
/// <summary>
@@ -803,13 +813,33 @@
/// </summary>
public const int UpdateAppFail = 10163;
/// <summary>
- /// 鏇存柊涓�...
+ /// 姝ｅ湪鏇存柊涓�...
/// </summary>
public const int Updating = 10164;
/// <summary>
/// 鍙栨秷鏇存柊
/// </summary>
public const int CancelUpdating = 10165;
+ /// <summary>
+ /// 鐗堟湰鍙�
+ /// </summary>
+ public const int VersionCode = 10166;
+ /// <summary>
+ /// 鏈嶅姟鍗忚
+ /// </summary>
+ public const int SLA = 10167;
+ /// <summary>
+ /// 鐗堟湰鏇存柊
+ /// </summary>
+ public const int UpdateVersion = 10168;
+ /// <summary>
+ /// 鍗忚鏂囨湰淇℃伅鍐呭
+ /// </summary>
+ public const int SLA_Title = 10169;
+ /// <summary>
+ /// 鍗忚璇︾粏
+ /// </summary>
+ public const int SLA_Detail = 10170;
#endregion
@@ -879,7 +909,7 @@
/// </summary>
public const int Save = 11021;
/// <summary>
- /// 鎻愮ず
+ /// 鎻愰啋
/// </summary>
public const int TIP = 11022;
/// <summary>
@@ -926,6 +956,10 @@
/// 閫夋嫨鍦烘櫙鍥剧墖
/// </summary>
public const int SelectScenePic = 11033;
+ /// <summary>
+ /// 纭畾瑕佺Щ闄よ鍔熻兘锛�
+ /// </summary>
+ public const int DeleteFunction = 11034;
#region 璁惧绫诲瀷
/// <summary>
@@ -1186,6 +1220,8 @@
/// </summary>
public const int TheSceneIsDelaying = 13149;
+
+
/// <summary>
/// 閫夋嫨鎽嗛
/// </summary>
@@ -1218,6 +1254,16 @@
/// 璇锋竻娲佹护缃�
/// </summary>
public const int NeedCleanAC = 13511;
+
+ /// <summary>
+ /// 娌″姛鑳� 璇峰厛娣诲姞
+ /// </summary>
+ public const int NoFunction_Tip = 13600;
+ /// <summary>
+ /// 娌″満鏅� 璇峰厛娣诲姞
+ /// </summary>
+ public const int NoScene_Tip = 13601;
+
@@ -1434,7 +1480,7 @@
/// </summary>
public const int uPleaseWait = 15052;
/// <summary>
- /// 璇风‘淇濈綉鍏充笌缃戠嚎杩炴帴{0}绯荤粺鐏瘡绉掗棯鐑佷竴娆�
+ /// 璇风‘淇濈綉鍏崇敤缃戠嚎姝ｅ父杩炴帴璺敱鍣▄0}姝ｅ父杩炴帴鍒欑郴缁熸寚绀虹伅1绉掗棯鐑�
/// </summary>
public const int ConfirmLineConnectMsg = 15053;
/// <summary>
@@ -4030,11 +4076,11 @@
/// </summary>
public const int uSearchGatewayFailMsg1 = 15779;
/// <summary>
- /// 1.闀挎寜ZB/RST閿�20绉掞紝缃戝叧鎭㈠鍑哄巶璁剧疆锛屾寚绀虹伅鍏ㄩ儴鐔勭伃鍚庯紝閲嶆柊鍏ョ綉銆�
+ /// 1.鐭寜HID/WCFG鎸夐敭,绯荤粺鎸囩ず鐏揩闂�3绉�,缃戝叧杩涘叆鎹㈢粦妯″紡,寮哄埗缃戝叧缁戝畾鍒板綋鍓岮PP
/// </summary>
public const int uSearchGatewayFailMsg2 = 15780;
/// <summary>
- /// 2.鐐规寜HID/WCFG閿紝杩涘叆缃戝叧鎹㈢粦妯″紡锛岀郴缁熸寚绀虹伅蹇棯5绉掋��
+ /// 2.闀挎寜缃戝叧ZB/RST鎸夐敭20绉掍互涓�,鐩村埌鎵�鏈夋寚绀虹伅鍚屾椂鐏�,鍗虫仮澶嶅嚭鍘傝缃苟閲嶅惎
/// </summary>
public const int uSearchGatewayFailMsg3 = 15781;
/// <summary>
@@ -4162,11 +4208,11 @@
/// </summary>
public const int uCommitCurtainLimitFail = 15812;
/// <summary>
- /// 纭褰撳墠浣嶇疆{0}涓哄紑闄愪綅?
+ /// 纭褰撳墠浣嶇疆涓哄紑闄愪綅?
/// </summary>
public const int uCommitCurtainOpenLimitMsg = 15813;
/// <summary>
- /// 纭褰撳墠浣嶇疆{0}涓哄悎闄愪綅?
+ /// 纭褰撳墠浣嶇疆涓哄悎闄愪綅?
/// </summary>
public const int uCommitCurtainCloseLimitMsg = 15814;
/// <summary>
@@ -4538,15 +4584,15 @@
/// </summary>
public const int uWlanConnectHomeWifi = 15906;
/// <summary>
- /// 闀挎寜缃戝叧HID/WCFG鎸夐敭20绉抺0}绯荤粺鐏揩闂�60绉掑垯杩涘叆閰嶇綉鐘舵�亄0}绯荤粺鐏瘡绉掗棯鐑佷竴娆0}鍒欒繛鎺ユ垚鍔�
+ /// 缃戝叧濡傛灉姝ｅ父杩炴帴璺敱鍣▄0}绯荤粺鎸囩ず鐏細1绉掗棯鐑�
/// </summary>
- public const int uAddUdpWirelessGatewayMsg = 15907;
+ public const int uAddUdpWirelessGatewayMsg1 = 15907;
/// <summary>
- /// 闀挎寜缃戝叧HID/WCFG鎸夐敭5绉抺0}绯荤粺鐏父浜�60绉掑悗鍒欒繘鍏ラ厤缃戠姸鎬�
+ /// 璇峰厛闀挎寜HID/WCFG鎸夐敭澶ф5绉抺0}鐩村埌绯荤粺鎸囩ず鐏父浜畕0}缃戝叧杩涘叆AP妯″紡鐑偣
/// </summary>
public const int uAddApWirelessGatewayMsg1 = 15908;
/// <summary>
- /// 璺宠浆鍒扮Щ鍔ㄨ澶嘩LAN璁剧疆{0}閫夋嫨hdlZigbeeGW-xxxx缃戠粶
+ /// 鎵嬫満鍘昏缃繛鎺ョ綉鍏崇儹鐐箋0}鍗砲dlZigbeeGW-xxxx,瀵嗙爜hdl123456{0}鍙煡鐪嬬綉鍏宠儗闈㈡爣绛炬煡鐪嬬儹鐐瑰悕瀛楀拰瀵嗙爜
/// </summary>
public const int uAddApWirelessGatewayMsg2 = 15909;
/// <summary>
@@ -4554,11 +4600,11 @@
/// </summary>
public const int uPleaseInputHomeWifiAccount = 15910;
/// <summary>
- /// 璇峰墠寰�绉诲姩璁惧WLAN璁剧疆{0}閲嶆柊杩炴帴瀹跺涵wiFi
+ /// 鎵嬫満鍘昏缃繛鎺ヨ矾鐢卞櫒
/// </summary>
public const int uAddApWirelessGatewayMsg3 = 15911;
/// <summary>
- /// 绯荤粺鐏瘡绉掗棯鐑佷竴娆0}鍒欒繛鎺ユ垚鍔�
+ /// 缃戝叧濡傛灉姝ｅ父杩炴帴璺敱鍣▄0}绯荤粺鎸囩ず鐏細1绉掗棯鐑�
/// </summary>
public const int uAddApWirelessGatewayMsg4 = 15912;
/// <summary>
@@ -4837,6 +4883,98 @@
/// 姝ｅ湪鑾峰彇鍒嗕韩鏁版嵁
/// </summary>
public const int uShardContentGetting = 15983;
+ /// <summary>
+ /// 璇峰厛鍘昏缃墜鏈鸿繛鎺ュ埌璺敱鍣▄0}鐒跺悗闀挎寜缃戝叧HID/WCFG鎸夐敭澶ф20绉抺0}鐩村埌绯荤粺鎸囩ず鐏揩闂獅0}缃戝叧杩涘叆UDP妯″紡WIFI閰嶇綉
+ /// </summary>
+ public const int uAddUdpWirelessGatewayMsg2 = 15984;
+ /// <summary>
+ /// 缃戝叧娣诲姞鎸囧紩
+ /// </summary>
+ public const int uAddGatewayGuide = 15985;
+ /// <summary>
+ /// 1.璇风敤缃戠嚎杩炴帴缃戝叧缃戝彛鍒拌矾鐢卞櫒锛屽苟瑙傚療缃戝彛LED浜苟闂儊鎴栬瀵熷澹崇綉鍙ｆ寚绀虹伅浜苟闂儊
+ /// </summary>
+ public const int uAddWiredGatewayHelp1 = 15986;
+ /// <summary>
+ /// 2.缃戝叧閲嶅惎澶х害闇�瑕�1鍒嗛挓锛岃繖鏃惰瀵熷澹崇郴缁熸寚绀虹伅锛屽鏋�1绉掗棯鐑侊紝琛ㄧず缃戝叧杩炴帴璺敱鍣ㄦ甯革紝鍙互鐢ˋPP杩涜娣诲姞缃戝叧姝ラ
+ /// </summary>
+ public const int uAddWiredGatewayHelp2 = 15987;
+ /// <summary>
+ /// 缃戝叧纭欢闂甯姪
+ /// </summary>
+ public const int uGatewayHardDeviceHelp = 15988;
+ /// <summary>
+ /// 1.缃戝彛鎸囩ず鐏笉浜�,妫�鏌ョ綉绾挎垨璺敱鍣ㄦ槸鍚︽甯�
+ /// </summary>
+ public const int uWiredGatewayHardDeviceHelp1 = 15989;
+ /// <summary>
+ /// 2.绯荤粺鍚姩涔嬪悗(绯荤粺鎸囩ず鐏�5绉掗棯鐑�,琛ㄧず绯荤粺鍚姩鎴愬姛),绯荤粺鎸囩ず鐏笉鏄�1绉掗棯鐑�,妫�鏌ヨ矾鐢卞櫒鏄惁寮�鍚疍HCP鑷姩鍒嗛厤IP
+ /// </summary>
+ public const int uWiredGatewayHardDeviceHelp2 = 15990;
+ /// <summary>
+ /// 绯荤粺鍚姩涔嬪悗(绯荤粺鎸囩ず鐏�5绉掗棯鐑�,琛ㄧず绯荤粺鍚姩鎴愬姛)
+ /// </summary>
+ public const int uAddWirelessGatewayHelp1 = 15991;
+ /// <summary>
+ /// 2.鏍规嵁APP鎻愮ず杩涘叆涔嬪悗鐨勬楠�
+ /// </summary>
+ public const int uAddWirelessGatewayHelp2 = 15992;
+ /// <summary>
+ /// 1.璇峰厛闀挎寜缃戝叧HID/WCFG鎸夐敭澶ф20绉�,鐩村埌绯荤粺鎸囩ず鐏揩闂�,缃戝叧杩涘叆UDP妯″紡WIFI閰嶇綉
+ /// </summary>
+ public const int uAddWirelessUdpGatewayHelp1 = 15993;
+ /// <summary>
+ /// 1.璇峰厛闀挎寜缃戝叧HID/WCFG鎸夐敭澶ф5绉�,鐩村埌绯荤粺鎸囩ず鐏父浜�,缃戝叧杩涘叆AP妯″紡WIFI閰嶇綉
+ /// </summary>
+ public const int uAddWirelessApGatewayHelp1 = 15994;
+ /// <summary>
+ /// 1.鐭寜HID/WCFG鎸夐敭,鏌ョ湅鎸囩ず鐏槸鍚︽湁鍙樺寲,鍙垽鏂寜閿拰鎸囩ず鐏槸鍚︽崯鍧�
+ /// </summary>
+ public const int uWirelessGatewayHardDeviceHelp1 = 15995;
+ /// <summary>
+ /// 2.闀挎寜HID/WCFG鎸夐敭,鏌ョ湅鎸囩ず鐏槸鍚︽湁鍙樺寲,鍙垽鏂寜閿拰鎸囩ず鐏槸鍚︽崯鍧�
+ /// </summary>
+ public const int uWirelessGatewayHardDeviceHelp2 = 15996;
+ /// <summary>
+ /// 3.绯荤粺鎸囩ず鐏笉鏄�1绉掗棯鐑�,妫�鏌ヨ矾鐢卞櫒鏄惁寮�鍚疍HCP鑷姩鍒嗛厤IP
+ /// </summary>
+ public const int uWirelessGatewayHardDeviceHelp3 = 15997;
+ /// <summary>
+ /// 璇峰墠寰�浣忓畢绠＄悊{0}璁剧疆浣忓畢鐨勫湴鐞嗕綅缃�
+ /// </summary>
+ public const int uGotoResidenceAndSetLocation = 15998;
+ /// <summary>
+ /// 鏈煡妤煎眰
+ /// </summary>
+ public const int uUnKnownFloor = 15999;
+ /// <summary>
+ /// 濡傛灉涓嶈缃綇瀹呯殑鍦扮悊浣嶇疆,鍒欎細褰卞搷鑷姩鍖栧湴鐞嗗洿鏍忓姛鑳界殑璁剧疆
+ /// </summary>
+ public const int uNotSetLocationWillAffectTheAutomaticGeofencingFunction = 16000;
+ /// <summary>
+ /// 绌鸿皟妯″潡鐗堟湰
+ /// </summary>
+ public const int uAirConditionerModelVersion = 16001;
+ /// <summary>
+ /// 閫氫俊鑺墖
+ /// </summary>
+ public const int uCommunicationChip = 16002;
+ /// <summary>
+ /// 绌鸿皟妯″潡
+ /// </summary>
+ public const int uAirConditioningModule = 16003;
+ /// <summary>
+ /// 鑾峰彇澶辫触
+ /// </summary>
+ public const int uGettingFail = 16004;
+ /// <summary>
+ /// 鏃犳硶璇嗗埆
+ /// </summary>
+ public const int uUnDistinguish = 16005;
+ /// <summary>
+ /// 姝ｅ湪閲嶇疆鐢垫満
+ /// </summary>
+ public const int uElectricalMachineryResetting = 16006;
//鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄帴鍙ｇ殑杩斿洖淇℃伅缈昏瘧,浠�18000寮�濮嬧槄鈽呪槄鈽�
/// <summary>
@@ -5066,7 +5204,7 @@
/// </summary>
public const int uDeviceModelId1301 = 30005;
/// <summary>
- /// 闀滃儚ID涓�4100鐨勮澶囩殑榛樿鍚嶅瓧锛歓igbee寰柇浜戞帶鍒跺櫒
+ /// 闀滃儚ID涓�4100鐨勮澶囩殑榛樿鍚嶅瓧锛氭櫤鑳界┖寮�
/// </summary>
public const int uDeviceModelId4100 = 30006;
/// <summary>
@@ -5145,6 +5283,18 @@
/// 闀滃儚ID涓�2800鐨勮澶囩殑榛樿鍚嶅瓧锛欻06C
/// </summary>
public const int uDeviceModelId2800 = 30025;
+ /// <summary>
+ /// 闀滃儚ID涓�220鐨勮澶囩殑榛樿鍚嶅瓧锛氱畝绾�4鎸夐敭闈㈡澘
+ /// </summary>
+ public const int uDeviceModelId220 = 30026;
+ /// <summary>
+ /// 闀滃儚ID涓�221鐨勮澶囩殑榛樿鍚嶅瓧锛氱畝绾�3鎸夐敭闈㈡澘
+ /// </summary>
+ public const int uDeviceModelId221 = 30027;
+ /// <summary>
+ /// 闀滃儚ID涓�222鐨勮澶囩殑榛樿鍚嶅瓧锛氱畝绾�2鎸夐敭闈㈡澘
+ /// </summary>
+ public const int uDeviceModelId222 = 30028;
//鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄澶囨墍灞炵绫荤殑缈昏瘧鍚嶅瓧,浠�40000寮�濮嬧槄鈽呪槄鈽�
/// <summary>
--
Gitblit v1.8.0