From 6bca8fcd37a48808a0b9c9342fc1be0adddfece6 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期五, 08 五月 2020 17:46:44 +0800
Subject: [PATCH] 请合并最新代码，优化绑定信息
---
ZigbeeApp/GateWay.Droid/Assets/Language.ini | 244 ++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 220 insertions(+), 24 deletions(-)
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Language.ini b/ZigbeeApp/GateWay.Droid/Assets/Language.ini
index 9c7a3d0..d23cfa6 100755
--- a/ZigbeeApp/GateWay.Droid/Assets/Language.ini
+++ b/ZigbeeApp/GateWay.Droid/Assets/Language.ini
@@ -152,8 +152,8 @@
147=鎵嬪娍寮�閿�
148=璇风粦瀹氳繙绋嬪紑閿佺殑闂ㄩ攣
149=鍘昏缃�
-150=璇峰墠寰�涓汉涓績{0}璁剧疆浜屾瀹夊叏楠岃瘉鏂瑰紡
-151=璁剧疆浜屾瀹夊叏楠岃瘉鏂瑰紡
+150=璇峰墠寰�涓汉涓績{0}寮�鍚繙绋嬪紑閿侀獙璇�
+151=璇峰墠寰�涓汉涓績{0}璁剧疆浜屾瀹夊叏楠岃瘉鏂瑰紡
152=寮�鍚繙绋嬪紑閿侀獙璇�
153=闂ㄩ攣
154=杩滅▼寮�閿�
@@ -237,7 +237,6 @@
231=鎺ヨ繎鎰熷簲
232=鎺ヨ繎鎰熷簲鍔熻兘璁剧疆缃け璐�
233=鑾峰彇鎺ヨ繎鎰熷簲鍔熻兘澶辫触
-234=鏂规偊鏂伴灏忔ā鍧�
235=鎸変綇闈㈡澘妯″紡锛圡ode)鍜岄閫燂紙Fan)鎸夐敭{0}缁胯壊鎸囩ず鐏寒璧枫�傚垯閰嶇綉鎴愬姛
;涓夋寜閿潰鏉垮叆缃戞搷浣滄寚绀�
236=缁胯壊鎸囩ず鐏棯鐑�
@@ -245,7 +244,6 @@
238=闀挎寜5绉掞紙鎸夐敭锛�
239=闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝鎸囩ず鐏彉缁裤�侀棯鐑亄0}杩涘叆閰嶇綉鐘舵�併�傜豢鐏唲鐏垯閰嶇綉鎴愬姛
;涓夋寜閿潰鏉垮叆缃戞搷浣滄寚绀�
-240= S-one
241=璁剧疆甯稿紑妯″紡鍚庯紝鎮ㄧ殑闂ㄩ攣灏嗗缁坽0}澶勪簬鎵撳紑鐘舵�侊紝纭寮�鍚紵
242=鐢甸噺
243=甯稿紑妯″紡宸插紑鍚�
@@ -271,7 +269,53 @@
263=鍖�
264=涓�
265=瑗�
-266=褰撳墠璁惧涓嶆敮鎸佽鍔熻兘
+266=褰撳墠璁惧涓嶅湪绾�
+267=鑾峰彇闊抽噺澶辫触
+268=纭畾鍙栨秷璇ユ垚鍛樼殑杩滅▼寮�閿佹潈闄�
+269=闆舵椂鍖�
+270=涓滀竴鍖�
+271=涓滀簩鍖�
+272=涓滀笁鍖�
+273=涓滃洓鍖�
+274=涓滀簲鍖�
+275=涓滃叚鍖�
+276=涓滀竷鍖�
+277=涓滃叓鍖�
+278=涓滀節鍖�
+279=涓滃崄鍖�
+280=涓滃崄涓�鍖�
+281=涓滃崄浜屽尯
+282=瑗夸竴鍖�
+283=瑗夸簩鍖�
+284=瑗夸笁鍖�
+285=瑗垮洓鍖�
+286=瑗夸簲鍖�
+287=瑗垮叚鍖�
+288=瑗夸竷鍖�
+289=瑗垮叓鍖�
+290=瑗夸節鍖�
+291=瑗垮崄鍖�
+292=瑗垮崄涓�鍖�
+293=瑗垮崄浜屽尯
+294= 鐢熸晥鏃ユ湡涓嶈兘灏忎簬褰撳墠鏃ユ湡
+295= 鐢熸晥鏃堕棿涓嶈兘澶т簬澶辨晥鏃堕棿
+296= 澶辨晥鏃堕棿涓嶈兘灏忎簬鐢熸晥鏃堕棿
+297= 澶辨晥鏃堕棿涓嶈兘鐪佺暐
+298= 澶辨晥鏃堕棿涓嶈兘澶т簬72灏忔椂
+299= 澶辨晥鏃堕棿涓嶈兘灏忎簬1灏忔椂
+300=鏂伴
+301=闈炵鐞嗗憳涓嶈兘鍦ㄥ父寮�妯″紡涓嬫搷浣�
+302=缁戝畾鏂伴
+303=娓╁害鏉ユ簮
+304=婀垮害鏉ユ簮
+305=PM2.5鏉ユ簮
+307=璀﹀憡锛佹椂鏁堟�у父寮�鍏抽棴闂ㄩ攣鍔熻兘澶辫触锛岃鎵嬪姩鍙栨秷甯稿紑妯″紡銆�
+308=璀﹀憡锛佹椂鏁堟�у父寮�鍒犻櫎澶辫触銆�
+309=鏃舵晥鎬у父寮�鍒犻櫎澶辫触锛岀户缁�滃父寮�妯″紡鈥濊鍓嶅線闂ㄩ攣鐢ㄦ埛鐣岄潰璁剧疆;
+310=璇疯緭鍏ュ悎娉曠殑鏁板瓧
+311=鎵嬪姩
+312= 鑳屽厜鐏鑹�
+313=闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝淇″彿鍥炬爣{0}蹇棯锛� 杩涘叆閰嶇綉鐘舵�併�備俊鍙峰浘鏍囧父浜垯閰嶇綉鎴愬姛
5097=鍙栨秷
5098=纭畾
@@ -527,8 +571,24 @@
5378=鎺ㄩ�佸唴瀹逛笉鑳戒负绌�.
5379=鏆傛棤鑱斿姩浜嬩欢{\r\n} 璇风偣鍑诲彸涓婅娣诲姞
5380=甯稿紑妯″紡
-
-
+5381=娣诲姞鏉′欢鎴栬�呮坊鍔犲姛鑳戒负绌�
+5382=鏌ョ湅
+5383=鍏抽棴
+5384=骞�
+5385=鏈�
+5386=鏃�
+5387=鍙�
+5388=甯稿紑鑷姩鍖�
+5389=鏃舵晥鎬у父寮�璁剧疆
+5390=澶辨晥璁剧疆
+5391=灏忔椂
+5392=闂ㄩ攣濮嬬粓鎵撳紑
+5393=璁剧疆甯稿紑妯″紡鍚庯紝鎮ㄧ殑闂ㄩ攣灏嗗缁坽0}澶勪簬鎵撳紑鐘舵�侊紝纭寮�鍚紵
+5394=涓嶈兘灏忎簬1灏忔椂
+5395=澶т簬12灏忔椂
+5396=鎴�
+5397=鏃堕棿涓虹┖
+5398=鍙敮鎸佹暟瀛楄緭鍏�
10000=HDL Home
10001=甯哥敤
@@ -582,7 +642,7 @@
-10150=鏀规埧闂村悕绉板凡瀛樺湪
+10150=鎴块棿鍚嶇О宸插瓨鍦�
10151=鍦烘櫙鍚嶄笉鑳戒负绌�
10152=鎺у埗鍦烘櫙澶辫触
10153=鍦烘櫙涓虹┖
@@ -617,7 +677,7 @@
11013=淇℃伅缂栬緫
11014=鍔熻兘鍚嶇О
11015=鎵�灞炲尯鍩�
-11016=鎵�灞炴ā鍧�
+11016=鎵�灞炶澶�
11017=鏈煡
11018=鍒嗕韩
11019=鍒嗕韩鐨�
@@ -1364,9 +1424,9 @@
15697=妯″潡鏇存崲鐢垫睜
15698=閿欒灏濊瘯寮�閿佽鎶�
15699=鏆村姏寮�闂�
-15700=甯稿紑妯″紡寮�鍚�
-15701=甯稿紑妯″紡缁撴潫
-15702=闂ㄩ搩瑙﹀彂
+15700=甯稿紑妯″紡寮�鍚�(闂ㄩ攣瑙﹀彂)
+15701=甯稿紑妯″紡缁撴潫(闂ㄩ攣瑙﹀彂)
+15702=鏈変汉璁块棶
15703=鍘嗗彶璁板綍
15704=绫诲瀷绛涢��
15705=娓呯┖璁板綍
@@ -1539,8 +1599,8 @@
15872=鏃犳硶璇嗗埆鐨勮澶�
15873=鎷嶇収
15874=浠庣浉鍐屼腑閫夋嫨
-15875=鍑虹幇鏈煡閿欒
-15876=璇疯緭鍏ユ墜鍔�
+15875=鎶辨瓑锛岀▼搴忓嚭鐜伴敊璇�
+15876=璇疯緭鍏ユ墜鍔縜
15877=璇峰啀娆¤緭鍏ユ墜鍔�
15878=鏇存敼鎵嬪娍锛岃杈撳叆鎵嬪娍
15879=纭鎵嬪娍閿欒锛岃閲嶆柊璁剧疆
@@ -1699,7 +1759,7 @@
16034=闂厜鐏�
16035=鎴块棿鐨勫唴瀹瑰湪姝ゅ鏄剧ず
16036=鎴戠煡閬撲簡
-16037=鍒嗕韩鏁版嵁宸茬粡鍙樻洿,璇烽噸鏂扮櫥闄�
+16037=鍒嗕韩鏁版嵁宸茬粡鍙樻洿,璇烽噸鏂扮櫥褰�
16038=宸ヤ綔妯″紡
16039=鎺у埗妯″紡
16040=瑙﹀彂妯″紡
@@ -1737,6 +1797,48 @@
16072=鑳屽厜鐏寒搴�
16073=鎵撳紑
16074=鏃ョ珛绌鸿皟妯″潡
+16075=瀹夎浣嶇疆
+16076=鎵�灞炰綇瀹�
+16077=涓嶅垎閰�
+16078=瀹ゅ唴鏈�
+16079=鎸夐敭
+16080=鍒嗕韩浣忓畢宸叉洿鏀癸紝璇疯仈绯荤鐞嗗憳锛�
+16081=鑾峰彇鎵ц鐩爣澶辫触
+16082=娌℃湁鍙互娣诲姞鐨勫満鏅�
+16083=璇锋坊鍔犳墽琛岀洰鏍�
+16084=娣诲姞鎵ц鐩爣澶辫触
+16085=涓埆鎵ц鐩爣娣诲姞澶辫触
+16086=鍒濆鍖栨墽琛岀洰鏍囧け璐�
+16087=淇敼鍦烘櫙鍚嶇О澶辫触
+16088=甯稿紑妯″紡寮�鍚�(缃戝叧瑙﹀彂)
+16089=甯稿紑妯″紡缁撴潫(缃戝叧瑙﹀彂)
+16090=甯稿紑妯″紡
+16091=甯稿紑妯″紡鎵嬪姩寮�鍚�
+16092=甯稿紑妯″紡鎵嬪姩鍙栨秷
+16093=甯稿紑妯″紡鍚敤{0}灏忔椂
+16094=鎮ㄧ殑鏉冮檺宸茬粡鍙樻洿,璇烽噸鏂扮櫥褰�
+16095=鎴戝凡闃呰骞跺悓鎰�
+16096=闅愮鏉冩斂绛�
+16097=鍜�
+16098=鏈嶅姟鏉℃
+16099=璇峰厛闃呰骞跺悓鎰忋�婇殣绉佹潈鏀跨瓥銆嬪拰銆婃湇鍔℃潯娆俱��
+16100=甯稿紑妯″紡寮�鍚�(鑷姩鍖栬Е鍙�)
+16101=甯稿紑妯″紡缁撴潫(鑷姩鍖栬Е鍙�)
+16102=涓存椂瀵嗙爜寮�閿佹垚鍔�
+16103=涓存椂瀵嗙爜寮�閿佸け璐�
+16104=鐢垫満绌鸿皟妯″潡
+16105=涓滆姖绌鸿皟妯″潡
+16106=鏍煎姏绌鸿皟妯″潡
+16107=缇庣殑绌鸿皟妯″潡
+16108=铏氭嫙缃戝叧
+16109=鐜勫叧
+16110=鍘ㄦ埧
+16111=璧板粖
+16112=铏氭嫙璐﹀彿
+16113=鐏叏寮�
+16114=鐏叏鍏�
+16115=甯稿紑鑷姩鍖栨墜鍔ㄥ彇娑�
+16116=娓稿浣撻獙
;鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄帴鍙ｇ殑杩斿洖淇℃伅缈昏瘧,浠�18000寮�濮嬧槄鈽呪槄鈽�
18004=鎸囧畾缃戝叧宸茬粡琚粦瀹�
@@ -1820,9 +1922,11 @@
;鏂规偊鐜闈㈡澘鍏ョ綉鎿嶄綔鎸囩ず
21021=鎸変綇闈㈡澘鍔熻兘(function)鎸夐敭锛屾墍鏈夋寜閿畕0}鎸囩ず鐏寒璧凤紝鍒欓厤缃戞垚鍔�
;绐楀笜闈㈡澘鐨勫叆缃戞搷浣滄寚绀�
-21022=闀挎寜闈㈡澘宸︿笂瑙掓寜閿紝鎵�鏈夋寜閿畕0}鎸囩ず鐏寒璧凤紝鍒欓厤缃戞垚鍔�
+21022=闀挎寜闈㈡澘宸︿笂瑙掓寜閿紝鎵�鏈夋寜閿畕0}鎸囩ず鐏寒璧凤紝鍒欓厤缃戞垚鍔�
+;鍚搁《鐕冩皵浼犳劅鍣ㄧ殑鍏ョ綉鎿嶄綔鎸囩ず
+21023=闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝缁胯壊蹇棯{0}杩涘叆閰嶇綉鐘舵�侊紝缁跨伅甯镐寒鍒欏叆缃戞垚鍔�
-;鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄ā鍧桰D鐨勭炕璇戝悕瀛�,浠�30000寮�濮嬧槄鈽呪槄鈽�
+;鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄ā鍧桰D鐨勫畼鏂瑰悕瀛�,浠�30000寮�濮嬧槄鈽呪槄鈽�
30000=绱ф�ユ寜閽�
30001=鐕冩皵浼犳劅鍣�
30002=鐑熼浘浼犳劅鍣�
@@ -1840,14 +1944,14 @@
30014=1浠igbee缃戝叧(楂樼骇缃戝叧妗岄潰妯″紡)
30015=璋冭瘯璁惧
30016=Zigbee鏅鸿兘绠＄姸鐢垫満
-30017=zigbee涓户鍣�
+30017=Zigbee涓户鍣�
30018=12鎸夐敭瑙︽懜闈㈡澘(1璺户鐢靛櫒搴曞骇)
30019=4鎸夐敭瑙︽懜闈㈡澘(鍙甫鐢垫簮搴曞骇)
-30020=绾㈠浼犳劅鍣�
+30020=Zigbee浜轰綋绉诲姩浼犳劅鍣�(鐞冨舰)
30021=1璺皟鍏夊櫒灏忔ā鍧�
-30022=zigbee杞珺uspro鍗忚杞崲鍣�
-30023=zigbee杞�485鍗忚杞崲鍣�
-30024=zigbee绌鸿皟缃戝叧妯″潡
+30022=Zigbee杞珺uspro鍗忚杞崲鍣�
+30023=Zigbee杞�485鍗忚杞崲鍣�
+30024=Zigbee绌鸿皟缃戝叧妯″潡
30025=H06C
30026=绠�绾�4鎸夐敭闈㈡澘
30027=绠�绾�3鎸夐敭闈㈡澘
@@ -1860,6 +1964,9 @@
30034=绠�绾�4鎸夐敭鍦烘櫙闈㈡澘
30035=绠�绾�2璺獥甯橀潰鏉�
30036=鏂规偊/2璺獥甯橀潰鏉�-Z
+30037=S-one
+30038=鏂规偊鏂伴灏忔ā鍧�
+30039=Zigbee鍚搁《鐕冩皵浼犳劅鍣�
;鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄澶囨墍灞炵绫荤殑缈昏瘧鍚嶅瓧,浠�40000寮�濮嬧槄鈽呪槄鈽�
40000=閬槼
@@ -1870,10 +1977,99 @@
40005=闂ㄩ攣
40006=绌鸿皟
40007=涓户鍣�
-40008=鏅鸿兘绌哄叧
+40008=鏅鸿兘绌哄紑
40009=杞崲鍣�
40010=褰╃伅
40011=娓╂箍搴︿紶鎰熷櫒
40012=娓╁害浼犳劅鍣�
40013=婀垮害浼犳劅鍣�
-40014=骞叉帴鐐�
\ No newline at end of file
+40014=寮�鍏�
+40015=鎻掑骇
+40016=鐏厜
+40017=骞叉帴鐐�
+40018=鏂伴
+
+;鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄ā鍧桰D鐨勮澶囬粯璁ゅ娉ㄥ悕瀛�,浠�50000寮�濮�.娉�:瀹冨苟涓嶉渶瑕佸啀R.cs鏂囦欢涓畾涔夆槄鈽呪槄鈽�
+50000=绱ф�ユ寜閽�
+50001=Zigbee鐕冩皵浼犳劅鍣�
+50002=Zigbee鐕冩皵浼犳劅鍣�
+50003=Zigbee姘存蹈浼犳劅鍣�
+50004=閽ュ寵鎵�
+50005=Zigbee闂ㄧ獥浼犳劅鍣�
+50006=Zigbee鏅鸿兘绌哄紑
+50007=Zigbee寮�鍚堝笜鐢垫満
+50008=Zigbee 4鎸夐敭闈㈡澘
+50009=Zigbee鍚搁《寮忎汉浣撶Щ鍔ㄤ紶鎰熷櫒
+50010=Zigbee澧欒缃戝叧
+50011=Zigbee 3鎸夐敭闈㈡澘
+50012=Zigbee 2鎸夐敭闈㈡澘
+50013=Zigbee 3璺�10A缁х數鍣�
+50014=Zigbee妗岄潰缃戝叧
+50015=璋冭瘯璁惧
+50016=Zigbee鍗峰笜鐢垫満
+50017=Zigbee涓户鍣�
+50018=Zigbee 12鎸夐敭闈㈡澘
+50019=Zigbee 4鎸夐敭闈㈡澘
+50020=Zigbee浜轰綋绉诲姩浼犳劅鍣�(鐞冨舰)
+50021=Zigbee 1璺�1.5A璋冨厜鍣�
+50022=Zigbee杞珺uspro鍗忚杞崲鍣�
+50023=Zigbee杞�485鍗忚杞崲鍣�
+50024=Zigbee绌鸿皟缃戝叧妯″潡
+50025=Zigbee鏅鸿兘闂ㄩ攣
+50026=Zigbee绠�绾�4鎸夐敭闈㈡澘
+50027=Zigbee绠�绾�3鎸夐敭闈㈡澘
+50028=Zigbee绠�绾�2鎸夐敭闈㈡澘
+50029=Zigbee鏂规偊鍗曞紑鍙屾帶闈㈡澘
+50030=Zigbee鏂规偊鍙屽紑鍥涙帶闈㈡澘
+50031=Zigbee鏂规偊鍥涘紑鍏帶闈㈡澘
+50032=Zigbee鏂规偊鏂伴闈㈡澘
+50033=Zigbee鏂规偊鐜闈㈡澘
+50034=Zigbee绠�绾�4鎸夐敭鍦烘櫙闈㈡澘
+50035=Zigbee绠�绾�2璺獥甯橀潰鏉�
+50036=Zigbee鏂规偊2璺獥甯橀潰鏉�
+50037=Zigbee鏅鸿兘闂ㄩ攣
+50038=鏂伴鎺у埗灏忔ā鍧�
+50039=Zigbee鍚搁《鐕冩皵浼犳劅鍣�
+
+;鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄ā鍧桰D鐨勮澶囩被鍨嬪悕瀛�,浠�60000寮�濮�.娉�:瀹冨苟涓嶉渶瑕佸啀R.cs鏂囦欢涓畾涔夆槄鈽呪槄鈽�
+60000=浼犳劅鍣�
+60001=寮�鍏虫ā鍧�
+60002=閬槼妯″潡
+60003=鏅鸿兘闈㈡澘
+60004=鏅鸿兘缃戝叧
+60005=璋冭瘯璁惧
+60006=绯荤粺璁惧
+60007=璋冨厜妯″潡
+60008=杞崲鍣�
+60009=绌鸿皟妯″潡
+60010=鏅鸿兘闂ㄩ攣
+60011=鏂伴妯″潡
+
+;//鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄坊鍔犳柊璁惧鐣岄潰閭ｉ噷鏄剧ず鐨勫悕瀛�,浠�70000寮�濮嬧槄鈽呪槄鈽�
+70000=2鎸夐敭闈㈡澘
+70001=3鎸夐敭闈㈡澘
+70002=4鎸夐敭闈㈡澘
+70003=鏂规偊鍗曞紑鍙屾帶闈㈡澘
+70004=鏂规偊鍙屽紑鍥涙帶闈㈡澘
+70005=鏂规偊鍥涘紑鍏帶闈㈡澘
+70006=鏂规偊鏂伴灏忔ā鍧�
+70007=鏂规偊鏂伴闈㈡澘
+70008=鏂规偊鐜闈㈡澘
+70009=绐楀笜闈㈡澘
+70010=3璺户鐢靛櫒
+70011=1璺皟鍏夊櫒
+70012=绐楀笜鐢垫満
+70013=鍗峰笜鐢垫満
+70014=绌鸿皟缃戝叧
+70015=闂ㄩ攣
+70016=PIR浼犳劅鍣�
+70017=绾㈠浼犳劅鍣�
+70018=鐕冩皵浼犳劅鍣�
+70019=鐑熼浘浼犳劅鍣�
+70020=姘存蹈浼犳劅鍣�
+70021=闂ㄧ獥浼犳劅鍣�
+70022=娓╂箍搴︿紶鎰熷櫒
+70023=涓户鍣�
+70024=鏅鸿兘绌哄紑
+70025=鍚搁《鐕冩皵浼犳劅鍣�
+70026=PM2.5绌烘皵璐ㄩ噺浼犳劅鍣�
\ No newline at end of file
--
Gitblit v1.8.0