From d78515ac4ac8cf4a1785d9df18058d6724f12b79 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 14 一月 2021 19:34:59 +0800
Subject: [PATCH] 合并xm2021-01-13 wjc2021-02-06
---
ZigbeeApp/Shared/R.cs | 199 ++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 187 insertions(+), 12 deletions(-)
diff --git a/ZigbeeApp/Shared/R.cs b/ZigbeeApp/Shared/R.cs
index 23895c5..e46417b 100755
--- a/ZigbeeApp/Shared/R.cs
+++ b/ZigbeeApp/Shared/R.cs
@@ -906,6 +906,14 @@
/// 缁撴潫鏃堕棿涓嶈兘灏忎簬寮�濮嬫椂闂�
/// </summary>
public const int LedBindTip2 = 406;
+ /// <summary>
+ /// 鍚嶇О澶暱锛屼繚瀛樺け璐ワ紝璇烽噸鏂拌缃�
+ /// </summary>
+ public const int LedNameTooLong = 407;
+ /// <summary>
+ /// CO2鏉ユ簮
+ /// </summary>
+ public const int CO2Source = 408;
public readonly static int cancel = 5097;
public readonly static int confrim = 5098;
@@ -5690,7 +5698,7 @@
/// </summary>
public const int uAddApWirelessGatewayMsg1 = 15908;
/// <summary>
- /// 鎵嬫満鍘昏缃繛鎺ョ綉鍏崇儹鐐箋0}鍗砲dlZigbeeGW-xxxx,瀵嗙爜hdl123456{0}鍙煡鐪嬬綉鍏宠儗闈㈡爣绛炬煡鐪嬬儹鐐瑰悕瀛楀拰瀵嗙爜
+ /// 1.缃戝叧鐑偣鐨勮处鍙蜂负hdlZigbeeGW-XXX,瀵嗙爜涓篽dl123456{0}2.鍏蜂綋璐﹀彿鍜屽瘑鐮佸彲鏌ョ湅缃戝叧鏍囩{0}3.鐐瑰嚮"{1}"瀹屾垚鎵嬫満杩炴帴缃戝叧鐑偣{0}4.鐐瑰嚮涓嬩竴姝�
/// </summary>
public const int uAddApWirelessGatewayMsg2 = 15909;
/// <summary>
@@ -5990,11 +5998,16 @@
/// </summary>
public const int uAddGatewayGuide = 15985;
/// <summary>
- /// 1.璇风敤缃戠嚎杩炴帴缃戝叧缃戝彛鍒拌矾鐢卞櫒锛屽苟瑙傚療缃戝彛LED浜苟闂儊鎴栬瀵熷澹崇綉鍙ｆ寚绀虹伅浜苟闂儊
+ /// 璇风敤缃戠嚎杩炴帴缃戝叧缃戝彛鍒拌矾鐢卞櫒锛岀綉鍏充笂鐢垫垨鑰呮仮澶嶅嚭鍘傝
+ /// 缃箣鍚庯紝绯荤粺杩涜閲嶅惎锛屾寔缁�50绉掞紙绯荤粺鎸囩ず鐏疭YS甯镐寒锛夛紝
+ /// 寰呯郴缁熸寚绀虹伅SYS鍙樻垚1绉掑懆鏈熼棯鐑侊紝姝ゆ椂鍙互浣跨敤鎵嬫満APP
+ /// 杩涜娣诲姞缃戝叧姝ラ銆�
/// </summary>
public const int uAddWiredGatewayHelp1 = 15986;
/// <summary>
- /// 2.缃戝叧閲嶅惎澶х害闇�瑕�1鍒嗛挓锛岃繖鏃惰瀵熷澹崇郴缁熸寚绀虹伅锛屽鏋�1绉掗棯鐑侊紝琛ㄧず缃戝叧杩炴帴璺敱鍣ㄦ甯革紝鍙互鐢ˋPP杩涜娣诲姞缃戝叧姝ラ
+ /// 鎭㈠鍑哄巶璁剧疆锛氶暱鎸塟B/RST鎸夐敭10绉掞紝姝ゆ椂Z igee缃戠粶鎸�
+ /// 绀虹伅锛圸B锛夌姸鎬佷负蹇棯锛屽緟涓変釜鐏叏鐏紝琛ㄧず鎭㈠鍑哄巶璁剧疆
+ /// 鎴愬姛锛屽垯鍙澗寮�鎸夐敭锛岀綉鍏冲紑濮嬮噸鍚郴缁�
/// </summary>
public const int uAddWiredGatewayHelp2 = 15987;
/// <summary>
@@ -6009,14 +6022,6 @@
/// 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>
@@ -6546,7 +6551,7 @@
/// </summary>
public const int uAddMiniGateway = 16124;
/// <summary>
- /// 鎻掔數鍚�,闀挎寜缃戝叧寮�鍏抽敭5绉抺0}绯荤粺鐏父浜�60绉掑悗鍒欒繘鍏ラ厤缃戠姸鎬�
+ /// 1.涓婄數,绯荤粺鍚姩(缁跨伅闂儊50绉�){0}2.閰嶇綉妯″紡(钃濊壊甯镐寒20绉�){0}3.缃戝叧寤虹珛WI-FI鐑偣鎴愬姛(钃濈伅5绉掑懆鏈熼棯鐑�){0}4.鐐瑰嚮涓嬩竴姝�
/// </summary>
public const int uAddMiniGatewayMsg1 = 16125;
/// <summary>
@@ -6813,6 +6818,176 @@
/// 鍏抽棴椋庡共
/// </summary>
public const int uCloseAirdry = 16193;
+ /// <summary>
+ /// 缃戝叧涓婄數閰嶇綉
+ /// </summary>
+ public const int uGatewayPowerDistributionNetwork = 16194;
+ /// <summary>
+ /// 鎵嬫満杩炴帴缃戝叧鐑偣
+ /// </summary>
+ public const int uMobileConnectionGatewayHotspot = 16195;
+ /// <summary>
+ /// 璇疯緭鍏IFI鍜屽瘑鐮�
+ /// </summary>
+ public const int uPleaseInputWifiAndPassword = 16196;
+ /// <summary>
+ /// 鍙戦�佸眬鍩熺綉璐﹀彿銆佸瘑鐮�
+ /// </summary>
+ public const int uSendLanAccountAndPassword = 16197;
+ /// <summary>
+ /// 1.濉啓璺敱鍣ㄧ殑璐﹀彿鍜屽瘑鐮亄0}2.鐐瑰嚮涓嬩竴姝ワ紝灏嗚矾鐢卞櫒璐﹀彿鍜屽瘑鐮佸彂閫佽嚦缃戝叧{0}3.缃戝叧鎺ユ敹鎴愬姛锛岀櫧鍏夐棯鐑�
+ /// </summary>
+ public const int uAddMiniGatewayMsg2 = 16198;
+ /// <summary>
+ /// 缃戝叧杩炴帴璺敱鍣�
+ /// </summary>
+ public const int uGatewayConnectionRouter = 16199;
+ /// <summary>
+ /// 1.缃戝叧鎺ユ敹璺敱鍣ㄨ处鍙峰拰瀵嗙爜鎴愬姛{0}2.绯荤粺閲嶅惎(缁跨伅闂儊50绉�){0}3.杩炴帴灞�鍩熺綉鎴愬姛(钃濈伅1绉掑懆鏈熼棯鐑�){0}4.鐐瑰嚮"{1}"瀹屾垚鎵嬫満杩炴帴瀹跺涵WIFI{0}5.鐐瑰嚮涓嬩竴姝�
+ /// </summary>
+ public const int uAddMiniGatewayMsg3 = 16200;
+ /// <summary>
+ /// 鎵嬫満杩炴帴缃戝叧
+ /// </summary>
+ public const int uMobileConnectionGateway = 16201;
+ /// <summary>
+ /// 1.app鑻ユ樉绀鸿繛鎺ョ殑缃戝叧璁惧,琛ㄦ槑杩炴帴鎴愬姛{0}2.璇峰墠寰�娣诲姞鍏朵粬璁惧{0}3.鑻ラ暱鏃堕棿鏃犳硶杩炴帴鎴愬姛,璇峰墠寰�"鏌ョ湅甯姪"
+ /// </summary>
+ public const int uAddMiniGatewayMsg4 = 16202;
+ /// <summary>
+ /// 寮傚父鎯呭喌澶勭悊
+ /// </summary>
+ public const int uExceptionHandling = 16203;
+ /// <summary>
+ /// 缃戝叧纭欢鏂囦欢甯姪
+ /// </summary>
+ public const int uGatewayHardwareFileHelp = 16204;
+ /// <summary>
+ /// 鎿嶄綔鎸囧紩
+ /// </summary>
+ public const int uOperationGuide = 16205;
+ /// <summary>
+ /// 1銆佹寜鍑诲紑鍏抽敭,鑻ュ紑鍏抽敭鍜屽鐏棤寮傚父,鍒欏鐏寒璧风櫧鑹茬幆褰㈢伅鍏�
+ /// </summary>
+ public const int uAddMiniGatewayHelp1 = 16206;
+ /// <summary>
+ /// 2銆侀暱鎸夋垨鐭寜鎭㈠鍑哄巶璁剧疆璁剧疆鎸夐敭,鑻ユ寜閿拰鐘舵�佹寚绀虹伅鏃犲紓甯�,鍒欏揩闂豢鑹茬伅鍏�
+ /// </summary>
+ public const int uAddMiniGatewayHelp2 = 16207;
+ /// <summary>
+ /// 鎭㈠鍑哄巶璁剧疆:鐢ㄥ崱閽堥暱鎸夋仮澶嶅嚭鍘傝缃寜閿�10绉�,姝ゆ椂缃戝叧鐘舵�佷负鎸囩ず鐏豢鑹插揩闂�,寰呯伅鍏夐棯鐑佸仠姝�,鍗冲彲鏉惧紑鎸夐敭,缃戝叧寮�濮嬬郴缁熼噸鍚�(缁垮厜涓�绉掑懆鏈熼棯鐑�)
+ /// </summary>
+ public const int uAddMiniGatewayHelp3 = 16208;
+ /// <summary>
+ /// 鎹㈢粦:鑻ラ渶瑕佹洿鎹㈢粦瀹氳处鍙�,涓嶆竻闄ゆ暟鎹�,鐭寜鎭㈠鍑哄巶閿�,60绉掑唴閲嶆柊鐢ㄦ柊鐨勮处鍙锋悳绱㈢綉鍏冲嵆鍙�
+ /// </summary>
+ public const int uAddMiniGatewayHelp4 = 16209;
+ /// <summary>
+ /// 1銆佹坊鍔犵綉鍏宠繃绋嬩腑锛屽眬鍩熺綉璐﹀彿鍜屽瘑鐮佸彂閫侀敊璇紝缃戝叧涓�鐩�
+ ///鎸佺画淇濇寔姝ｅ湪鑱旂綉鐘舵�侊紙鎸佺画钃濈伅锛�3鍒嗛挓锛岄殢鍚庤浆鎴愬缓绔嬬綉
+ ///鍏崇儹鐐圭姸鎬侊紙钃濈伅5绉掗棿闅旈棯鐑侊級锛屾鏃跺彲鎵嬫満APP閫�鍑鸿嚦缃�
+ ///鍏虫坊鍔犻〉闈紝閲嶆柊杩涜缃戝叧娣诲姞锛岄噸鏂板彂閫佽处鍙凤紝瀵嗙爜
+ /// </summary>
+ public const int uAddMiniGatewayHelp5 = 16210;
+ /// <summary>
+ ///2銆佸湪缃戝叧宸茬粡杩炴帴灞�鍩熺綉鐘舵�佷笅锛堣摑鑹茬伅1绉掗棿闅旈棯鐑侊級锛�
+ ///鎵嬫満APP涓嶅皬蹇冮��鍑轰簡杩炴帴鐣岄潰锛屽彲鍓嶅線鏈夌嚎缃戝叧鐣岄潰锛岀洿
+ ///鎺ヨ繘琛岀綉鍏宠繛鎺�
+ /// </summary>
+ public const int uAddMiniGatewayHelp6 = 16211;
+ /// <summary>
+ ///3銆佸湪缃戝叧宸茬粡杩炴帴灞�鍩熺綉鐘舵�佷笅锛堣摑鑹茬伅1绉掗棿闅旈棯鐑侊級锛�
+ ///鎵嬫満APP涓�鐩磋繛鎺ヤ笉涓婄綉鍏筹紝鍙互鍏堥��鍑篈PP鍚庡彴锛岄噸鏂扮櫥
+ ///鍏ヨ繘琛岃繛鎺�
+ /// </summary>
+ public const int uAddMiniGatewayHelp7 = 16212;
+ /// <summary>
+ /// 4銆乄IFI鏈夋尝鍔紝瀵艰嚧缃戝叧鑱旂綉澶辫触锛堟寔缁摑鐏級锛屽彲閲嶆柊涓婄數
+ /// </summary>
+ public const int uAddMiniGatewayHelp8 = 16213;
+ /// <summary>
+ /// 1銆佺煭鎸塟B/RST鎸夐敭 锛孼B缃戠粶鎸囩ず鐏竴鐩撮棯鐑侊紝鍒欒〃闈㈡鎸夐敭鍜屾寚绀虹伅鍧囨甯�
+ /// </summary>
+ public const int uAddWirelessGatewayHelp1 = 16214;
+ /// <summary>
+ ///2銆佺煭鎸塇ID/WCFG鎸夐敭锛岀郴缁熸寚绀虹伅SYS闂儊锛岃〃闈㈡鎸夐敭鍜屾寚绀虹伅鍧囨甯�
+ /// </summary>
+ public const int uAddWirelessGatewayHelp2 = 16215;
+ /// <summary>
+ ///3銆丷ESTART鎸夐敭涓洪噸鍚敭锛岀煭鎸夋鎸夐敭锛岀綉鍏抽噸鍚紝绯荤粺鎸囩ず鐏紑濮嬪父浜�
+ /// </summary>
+ public const int uAddWirelessGatewayHelp3 = 16216;
+ /// <summary>
+ ///1銆佹仮澶嶅嚭鍘傝缃細闀挎寜ZB/RST閿綅10绉掞紝10绉掑唴锛孼igbee
+ ///缃戠粶鎸囩ず鐏紙ZB锛夌姸鎬佷负蹇棯锛�10绉掗挓鍚庯紝绯荤粺鎸囩ず鐏疭YS
+ ///蹇棯5绉掞紝5绉掑唴杩炵画鎸塟B/RST閿袱娆★紝鑻ユ墍鏈夌伅鐔勭伃锛屽垯鎭�
+ ///澶嶅嚭鍘傝缃垚鍔燂紝缃戝叧寮�濮嬮噸鍚郴缁熴��
+ /// </summary>
+ public const int uAddWirelessGatewayHelp4 = 16217;
+ /// <summary>
+ ///2銆佺‘璁ゆ墜鏈篈PP鏄惁杩炴帴缃戝叧锛屽彲鍦ˋPP杩涜瀹氫綅鎿嶄綔锛岃嫢杩炴帴姝ｅ父锛岀綉鍏崇郴缁熸寚绀虹伅浼氬揩闂�
+ /// </summary>
+ public const int uAddWirelessGatewayHelp5 = 16218;
+ /// <summary>
+ ///3銆丄P閰嶇綉妯″紡锛氬彲閫氳繃闀挎寜HID/WCFG鎸夐敭 5绉掞紝浣跨綉鍏崇洿
+ ///鎺ヨ繘鍏ュ缓绔嬬儹鐐规ā寮忥紝鐏厜鐘舵�佸彉鍖栦负鎸変笅鎸夐敭锛岀郴缁熸寚绀虹伅
+ ///SYS蹇棯5绉掑悗锛岀郴缁熸寚绀虹伅SYS鍙樹负甯镐寒妯″紡锛屾鏃剁儹鐐瑰畬鎴�
+ ///寤虹珛
+ /// </summary>
+ public const int uAddWirelessGatewayHelp6 = 16219;
+ /// <summary>
+ ///1銆佹坊鍔犵綉鍏宠繃绋嬩腑锛屽眬鍩熺綉璐﹀彿鍜屽瘑鐮佸彂閫侀敊璇紝绯荤粺閲嶅惎
+ ///鍚庯紝缃戝叧涓�鐩存寔缁繚鎸佹鍦ㄨ仈缃戠姸鎬侊紙绯荤粺鎸囩ず鐏疭YS 3绉掑懆
+ ///鏈熼棯鐑侊紝鐏厜鍋忔殫锛屾寔缁�3鍒嗛挓锛夛紝闅忓悗杞垚寤虹珛缃戝叧鐑偣鐘�
+ ///鎬侊紙绯荤粺鎸囩ず鐏疭YS 5绉掗棿闅旈棯鐑侊紝鐏厜鍋忎寒锛夛紝姝ゆ椂鍙墜鏈�
+ ///APP閫�鍑鸿嚦缃戝叧娣诲姞椤甸潰锛岄噸鏂拌繘琛岀綉鍏虫坊鍔狅紝閲嶆柊鍙戦�佽处鍙凤紝
+ ///瀵嗙爜
+ /// </summary>
+ public const int uAddWirelessGatewayHelp7 = 16220;
+ /// <summary>
+ ///2銆佸湪缃戝叧宸茬粡杩炴帴灞�鍩熺綉鐘舵�佷笅锛堢郴缁熸寚绀虹伅SYS 1绉掗棿闅�
+ ///闂儊锛夛紝鎵嬫満APP涓嶅皬蹇冮��鍑轰簡杩炴帴鐣岄潰锛屽彲鍓嶅線娣诲姞鏈夌嚎缃�
+ ///鍏崇晫闈紝鐩存帴杩涜缃戝叧杩炴帴
+ /// </summary>
+ public const int uAddWirelessGatewayHelp8 = 16221;
+ /// <summary>
+ ///3銆佸湪缃戝叧宸茬粡杩炴帴灞�鍩熺綉鐘舵�佷笅锛堢郴缁熸寚绀虹伅SYS 1绉掗棿闅�
+ ///闂儊锛夛紝鎵嬫満APP涓�鐩磋繛鎺ヤ笉涓婄綉鍏筹紝鍙互鍏堥��鍑篈PP鍚庡彴锛�
+ ///閲嶆柊鐧诲叆杩涜杩炴帴鎴栧湪鏈夌嚎缃戝叧鐣岄潰鐩存帴鎼滅储缃戝叧
+ /// </summary>
+ public const int uAddWirelessGatewayHelp9 = 16222;
+ /// <summary>
+ ///4銆乄IFI鏈夋尝鍔紝瀵艰嚧缃戝叧鑱旂綉澶辫触锛屽彲閲嶆柊涓婄數
+ /// </summary>
+ public const int uAddWirelessGatewayHelp10 = 16223;
+ /// <summary>
+ /// 1.璇风‘淇濈綉鍏崇敤缃戠嚎姝ｅ父杩炴帴璺敱鍣▄0}2.缃戝彛鎸囩ず鐏疞AN鏃犺寰嬮棯鐑亄0}3.绯荤粺鎸囩ず鐏疭YS涓�1绉掑懆鏈熼棯鐑侊紝鐏厜鍋忔殫{0}4.鎵嬫満APP鍜岀綉鍏抽娆¤繛鎺�,璇峰皢鎵嬫満淇濇寔鍦ㄤ笌缃戝叧鍚屼竴涓眬鍩熺綉涓�(WIFI){0}5.杩涜鈥滀笅涓�姝モ�濇搷浣�
+ /// </summary>
+ public const int uAddWiredGatewayMsg1 = 16224;
+ /// <summary>
+ /// 1.涓婄數,绯荤粺鍚姩(绯荤粺鎸囩ず鐏疭YS 7绉掑悗浜捣,鎸佺画50绉掑父浜�){0}2.缃戝叧杩炴帴灞�鍩熺綉(SYS 3绉掑懆鏈熼棯鐑�,鐏厜鍋忔殫,鎸佺画20绉�){0}3.缃戝叧寤虹珛WI-FI鐑偣(SYS 5绉掑懆鏈熼棯鐑�,鐏厜鍙樹寒){0}4.缃戝叧寤虹珛鐑偣鎴愬姛{0}5.鐐瑰嚮涓嬩竴姝�
+ /// </summary>
+ public const int uAddWirelessApGatewayMsg1 = 16225;
+ /// <summary>
+ /// 1.濉啓璺敱鍣ㄧ殑璐﹀彿鍜屽瘑鐮亄0}2.鐐瑰嚮涓嬩竴姝ワ紝灏嗚矾鐢卞櫒璐﹀彿鍜屽瘑鐮佸彂閫佽嚦缃戝叧{0}3.缃戝叧鎺ユ敹鎴愬姛,绯荤粺鎸囩ず鐏疭YS闂儊
+ /// </summary>
+ public const int uAddWirelessApGatewayMsg2 = 16226;
+ /// <summary>
+ /// 1.绯荤粺閲嶅惎(SYS 7绉掑悗浜捣,鎸佺画50绉掑父浜�){0}2.缃戝叧姝ｅ湪杩炴帴璺敱鍣�(SYS 3绉掑懆鏈熼棯鐑�,鐏厜鍋忔殫){0}3.缃戝叧杩炴帴璺敱鍣ㄦ垚鍔�(SYS 1绉掑懆鏈熼棯鐑�,鐏厜鍋忔殫){0}4.杩涜鎵嬫満APP鍜岀綉鍏崇殑杩炴帴{0}5.棣栨杩炴帴灏嗘墜鏈轰繚鎸佸湪涓庣綉鍏冲悓涓�涓眬鍩熺綉涓�(WIFI){0}6.鐐瑰嚮"{1}"瀹屾垚鎵嬫満杩炴帴瀹跺涵WIFI{0}7.杩涜"涓嬩竴姝�"鎿嶄綔
+ /// </summary>
+ public const int uAddWirelessApGatewayMsg3 = 16227;
+ /// <summary>
+ /// 澶�
+ /// </summary>
+ public const int uDate1 = 16228;
+ /// <summary>
+ /// 鍛�
+ /// </summary>
+ public const int uWeek1 = 16229;
+ /// <summary>
+ /// 涓湀
+ /// </summary>
+ public const int uOneMonth1 = 16230;
//鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄帴鍙ｇ殑杩斿洖淇℃伅缈昏瘧,浠�18000寮�濮嬧槄鈽呪槄鈽�
--
Gitblit v1.8.0