From bff8993501334c4f3c5f902216fe03253be747f8 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期三, 15 四月 2020 16:59:01 +0800
Subject: [PATCH] 合并新代码
---
ZigbeeApp20200414/GateWay.Droid/Assets/Language.ini | 58 ++++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 48 insertions(+), 10 deletions(-)
diff --git a/ZigbeeApp20200414/GateWay.Droid/Assets/Language.ini b/ZigbeeApp20200414/GateWay.Droid/Assets/Language.ini
index ab34f65..f66d440 100755
--- a/ZigbeeApp20200414/GateWay.Droid/Assets/Language.ini
+++ b/ZigbeeApp20200414/GateWay.Droid/Assets/Language.ini
@@ -152,8 +152,8 @@
147=鎵嬪娍寮�閿�
148=璇风粦瀹氳繙绋嬪紑閿佺殑闂ㄩ攣
149=鍘昏缃�
-150=璇峰墠寰�涓汉涓績{0}璁剧疆浜屾瀹夊叏楠岃瘉鏂瑰紡
-151=璁剧疆浜屾瀹夊叏楠岃瘉鏂瑰紡
+150=璇峰墠寰�涓汉涓績{0}寮�鍚繙绋嬪紑閿侀獙璇�
+151=璇峰墠寰�涓汉涓績{0}璁剧疆浜屾瀹夊叏楠岃瘉鏂瑰紡
152=寮�鍚繙绋嬪紑閿侀獙璇�
153=闂ㄩ攣
154=杩滅▼寮�閿�
@@ -273,7 +273,6 @@
266=褰撳墠璁惧涓嶅湪绾�
267=鑾峰彇闊抽噺澶辫触
268=纭畾鍙栨秷璇ユ垚鍛樼殑杩滅▼寮�閿佹潈闄�
-269=甯稿紑妯″紡灏嗕簬{0}鍙栨秷
269=闆舵椂鍖�
270=涓滀竴鍖�
271=涓滀簩鍖�
@@ -303,8 +302,14 @@
295= 鐢熸晥鏃堕棿涓嶈兘澶т簬澶辨晥鏃堕棿
296= 澶辨晥鏃堕棿涓嶈兘灏忎簬鐢熸晥鏃堕棿
297= 澶辨晥鏃堕棿涓嶈兘鐪佺暐
-298= 澶辨晥鏃堕棿涓嶈兘澶т簬36灏忔椂
+298= 澶辨晥鏃堕棿涓嶈兘澶т簬72灏忔椂
299= 澶辨晥鏃堕棿涓嶈兘灏忎簬1灏忔椂
+300=鏂伴
+301=闈炵鐞嗗憳涓嶈兘鍦ㄥ父寮�妯″紡涓嬫搷浣�
+302=缁戝畾鏂伴
+303=娓╁害鏉ユ簮
+304=婀垮害鏉ユ簮
+305=PM2.5鏉ユ簮
@@ -1403,9 +1408,9 @@
15697=妯″潡鏇存崲鐢垫睜
15698=閿欒灏濊瘯寮�閿佽鎶�
15699=鏆村姏寮�闂�
-15700=甯稿紑妯″紡寮�鍚�
-15701=甯稿紑妯″紡缁撴潫
-15702=闂ㄩ搩瑙﹀彂
+15700=甯稿紑妯″紡寮�鍚�(闂ㄩ攣瑙﹀彂)
+15701=甯稿紑妯″紡缁撴潫(闂ㄩ攣瑙﹀彂)
+15702=鏈変汉璁块棶
15703=鍘嗗彶璁板綍
15704=绫诲瀷绛涢��
15705=娓呯┖璁板綍
@@ -1789,6 +1794,12 @@
16085=涓埆鎵ц鐩爣娣诲姞澶辫触
16086=鍒濆鍖栨墽琛岀洰鏍囧け璐�
16087=淇敼鍦烘櫙鍚嶇О澶辫触
+16088=甯稿紑妯″紡寮�鍚�(缃戝叧瑙﹀彂)
+16089=甯稿紑妯″紡缁撴潫(缃戝叧瑙﹀彂)
+16090=甯稿紑妯″紡
+16091=甯稿紑妯″紡鎵嬪姩寮�鍚�
+16092=甯稿紑妯″紡鎵嬪姩鍙栨秷
+16093=甯稿紑妯″紡鍚敤{0}灏忔椂
;鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄帴鍙ｇ殑杩斿洖淇℃伅缈昏瘧,浠�18000寮�濮嬧槄鈽呪槄鈽�
18004=鎸囧畾缃戝叧宸茬粡琚粦瀹�
@@ -1895,7 +1906,7 @@
30017=zigbee涓户鍣�
30018=12鎸夐敭瑙︽懜闈㈡澘(1璺户鐢靛櫒搴曞骇)
30019=4鎸夐敭瑙︽懜闈㈡澘(鍙甫鐢垫簮搴曞骇)
-30020=绾㈠浼犳劅鍣�
+30020=Zigbee浜轰綋绉诲姩浼犳劅鍣�(鐞冨舰)
30021=1璺皟鍏夊櫒灏忔ā鍧�
30022=zigbee杞珺uspro鍗忚杞崲鍣�
30023=zigbee杞�485鍗忚杞崲鍣�
@@ -1923,7 +1934,7 @@
40005=闂ㄩ攣
40006=绌鸿皟
40007=涓户鍣�
-40008=鏅鸿兘绌哄叧
+40008=鏅鸿兘绌哄紑
40009=杞崲鍣�
40010=褰╃伅
40011=娓╂箍搴︿紶鎰熷櫒
@@ -1985,4 +1996,31 @@
60007=璋冨厜妯″潡
60008=杞崲鍣�
60009=绌鸿皟妯″潡
-60010=鏅鸿兘闂ㄩ攣
\ No newline at end of file
+60010=鏅鸿兘闂ㄩ攣
+
+;//鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄坊鍔犳柊璁惧鐣岄潰閭ｉ噷鏄剧ず鐨勫悕瀛�,浠�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=鏅鸿兘绌哄紑
\ No newline at end of file
--
Gitblit v1.8.0