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 | 64 +++++++++++++++++++++++++-------
1 files changed, 50 insertions(+), 14 deletions(-)
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Language.ini b/ZigbeeApp/GateWay.Droid/Assets/Language.ini
index 5f78b79..d23cfa6 100755
--- a/ZigbeeApp/GateWay.Droid/Assets/Language.ini
+++ b/ZigbeeApp/GateWay.Droid/Assets/Language.ini
@@ -312,7 +312,10 @@
307=璀﹀憡锛佹椂鏁堟�у父寮�鍏抽棴闂ㄩ攣鍔熻兘澶辫触锛岃鎵嬪姩鍙栨秷甯稿紑妯″紡銆�
308=璀﹀憡锛佹椂鏁堟�у父寮�鍒犻櫎澶辫触銆�
309=鏃舵晥鎬у父寮�鍒犻櫎澶辫触锛岀户缁�滃父寮�妯″紡鈥濊鍓嶅線闂ㄩ攣鐢ㄦ埛鐣岄潰璁剧疆;
-
+310=璇疯緭鍏ュ悎娉曠殑鏁板瓧
+311=鎵嬪姩
+312= 鑳屽厜鐏鑹�
+313=闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝淇″彿鍥炬爣{0}蹇棯锛� 杩涘叆閰嶇綉鐘舵�併�備俊鍙峰浘鏍囧父浜垯閰嶇綉鎴愬姛
5097=鍙栨秷
5098=纭畾
@@ -570,9 +573,22 @@
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=甯哥敤
@@ -626,7 +642,7 @@
-10150=鏀规埧闂村悕绉板凡瀛樺湪
+10150=鎴块棿鍚嶇О宸插瓨鍦�
10151=鍦烘櫙鍚嶄笉鑳戒负绌�
10152=鎺у埗鍦烘櫙澶辫触
10153=鍦烘櫙涓虹┖
@@ -661,7 +677,7 @@
11013=淇℃伅缂栬緫
11014=鍔熻兘鍚嶇О
11015=鎵�灞炲尯鍩�
-11016=鎵�灞炴ā鍧�
+11016=鎵�灞炶澶�
11017=鏈煡
11018=鍒嗕韩
11019=鍒嗕韩鐨�
@@ -1810,6 +1826,19 @@
16101=甯稿紑妯″紡缁撴潫(鑷姩鍖栬Е鍙�)
16102=涓存椂瀵嗙爜寮�閿佹垚鍔�
16103=涓存椂瀵嗙爜寮�閿佸け璐�
+16104=鐢垫満绌鸿皟妯″潡
+16105=涓滆姖绌鸿皟妯″潡
+16106=鏍煎姏绌鸿皟妯″潡
+16107=缇庣殑绌鸿皟妯″潡
+16108=铏氭嫙缃戝叧
+16109=鐜勫叧
+16110=鍘ㄦ埧
+16111=璧板粖
+16112=铏氭嫙璐﹀彿
+16113=鐏叏寮�
+16114=鐏叏鍏�
+16115=甯稿紑鑷姩鍖栨墜鍔ㄥ彇娑�
+16116=娓稿浣撻獙
;鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄帴鍙ｇ殑杩斿洖淇℃伅缈昏瘧,浠�18000寮�濮嬧槄鈽呪槄鈽�
18004=鎸囧畾缃戝叧宸茬粡琚粦瀹�
@@ -1893,7 +1922,9 @@
;鏂规偊鐜闈㈡澘鍏ョ綉鎿嶄綔鎸囩ず
21021=鎸変綇闈㈡澘鍔熻兘(function)鎸夐敭锛屾墍鏈夋寜閿畕0}鎸囩ず鐏寒璧凤紝鍒欓厤缃戞垚鍔�
;绐楀笜闈㈡澘鐨勫叆缃戞搷浣滄寚绀�
-21022=闀挎寜闈㈡澘宸︿笂瑙掓寜閿紝鎵�鏈夋寜閿畕0}鎸囩ず鐏寒璧凤紝鍒欓厤缃戞垚鍔�
+21022=闀挎寜闈㈡澘宸︿笂瑙掓寜閿紝鎵�鏈夋寜閿畕0}鎸囩ず鐏寒璧凤紝鍒欓厤缃戞垚鍔�
+;鍚搁《鐕冩皵浼犳劅鍣ㄧ殑鍏ョ綉鎿嶄綔鎸囩ず
+21023=闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝缁胯壊蹇棯{0}杩涘叆閰嶇綉鐘舵�侊紝缁跨伅甯镐寒鍒欏叆缃戞垚鍔�
;鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄ā鍧桰D鐨勫畼鏂瑰悕瀛�,浠�30000寮�濮嬧槄鈽呪槄鈽�
30000=绱ф�ユ寜閽�
@@ -1913,14 +1944,14 @@
30014=1浠igbee缃戝叧(楂樼骇缃戝叧妗岄潰妯″紡)
30015=璋冭瘯璁惧
30016=Zigbee鏅鸿兘绠＄姸鐢垫満
-30017=zigbee涓户鍣�
+30017=Zigbee涓户鍣�
30018=12鎸夐敭瑙︽懜闈㈡澘(1璺户鐢靛櫒搴曞骇)
30019=4鎸夐敭瑙︽懜闈㈡澘(鍙甫鐢垫簮搴曞骇)
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鎸夐敭闈㈡澘
@@ -1935,6 +1966,7 @@
30036=鏂规偊/2璺獥甯橀潰鏉�-Z
30037=S-one
30038=鏂规偊鏂伴灏忔ā鍧�
+30039=Zigbee鍚搁《鐕冩皵浼犳劅鍣�
;鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄澶囨墍灞炵绫荤殑缈昏瘧鍚嶅瓧,浠�40000寮�濮嬧槄鈽呪槄鈽�
40000=閬槼
@@ -1955,6 +1987,7 @@
40015=鎻掑骇
40016=鐏厜
40017=骞叉帴鐐�
+40018=鏂伴
;鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄ā鍧桰D鐨勮澶囬粯璁ゅ娉ㄥ悕瀛�,浠�50000寮�濮�.娉�:瀹冨苟涓嶉渶瑕佸啀R.cs鏂囦欢涓畾涔夆槄鈽呪槄鈽�
50000=绱ф�ユ寜閽�
@@ -1991,11 +2024,12 @@
50031=Zigbee鏂规偊鍥涘紑鍏帶闈㈡澘
50032=Zigbee鏂规偊鏂伴闈㈡澘
50033=Zigbee鏂规偊鐜闈㈡澘
-50034=Zigbee绠�绾�4鎸夐敭闈㈡澘
-50035=Zigbee绠�绾�2璺潰鏉�
+50034=Zigbee绠�绾�4鎸夐敭鍦烘櫙闈㈡澘
+50035=Zigbee绠�绾�2璺獥甯橀潰鏉�
50036=Zigbee鏂规偊2璺獥甯橀潰鏉�
50037=Zigbee鏅鸿兘闂ㄩ攣
50038=鏂伴鎺у埗灏忔ā鍧�
+50039=Zigbee鍚搁《鐕冩皵浼犳劅鍣�
;鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄ā鍧桰D鐨勮澶囩被鍨嬪悕瀛�,浠�60000寮�濮�.娉�:瀹冨苟涓嶉渶瑕佸啀R.cs鏂囦欢涓畾涔夆槄鈽呪槄鈽�
60000=浼犳劅鍣�
@@ -2036,4 +2070,6 @@
70021=闂ㄧ獥浼犳劅鍣�
70022=娓╂箍搴︿紶鎰熷櫒
70023=涓户鍣�
-70024=鏅鸿兘绌哄紑
\ No newline at end of file
+70024=鏅鸿兘绌哄紑
+70025=鍚搁《鐕冩皵浼犳劅鍣�
+70026=PM2.5绌烘皵璐ㄩ噺浼犳劅鍣�
\ No newline at end of file
--
Gitblit v1.8.0