From fffd8afca5b69a592e9ba8913204f83f478e2f17 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期三, 06 五月 2020 17:28:35 +0800
Subject: [PATCH] 增加获取颜色接口（请合并代码）
---
ZigbeeApp/GateWay.Droid/Assets/Language.ini | 48 +++++++++++++++++++++++++++++++++++-------------
1 files changed, 35 insertions(+), 13 deletions(-)
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Language.ini b/ZigbeeApp/GateWay.Droid/Assets/Language.ini
index 548e959..926188e 100755
--- a/ZigbeeApp/GateWay.Droid/Assets/Language.ini
+++ b/ZigbeeApp/GateWay.Droid/Assets/Language.ini
@@ -309,11 +309,11 @@
303=娓╁害鏉ユ簮
304=婀垮害鏉ユ簮
305=PM2.5鏉ユ簮
-307=涓嶈兘鍒涘缓鑷姩鍖栧父寮�妯″紡
-308=涓嶈兘鍙栨秷鑷姩鍖栧父寮�妯″紡
-
-
-
+307=璀﹀憡锛佹椂鏁堟�у父寮�鍏抽棴闂ㄩ攣鍔熻兘澶辫触锛岃鎵嬪姩鍙栨秷甯稿紑妯″紡銆�
+308=璀﹀憡锛佹椂鏁堟�у父寮�鍒犻櫎澶辫触銆�
+309=鏃舵晥鎬у父寮�鍒犻櫎澶辫触锛岀户缁�滃父寮�妯″紡鈥濊鍓嶅線闂ㄩ攣鐢ㄦ埛鐣岄潰璁剧疆;
+310=璇疯緭鍏ュ悎娉曠殑鏁板瓧
+311=鎵嬪姩
5097=鍙栨秷
5098=纭畾
@@ -571,8 +571,13 @@
5380=甯稿紑妯″紡
5381=娣诲姞鏉′欢鎴栬�呮坊鍔犲姛鑳戒负绌�
5382=鏌ョ湅
-
-
+5383=鍏抽棴
+5384=骞�
+5385=鏈�
+5386=鏃�
+5387=鍙�
+5388=甯稿紑鑷姩鍖�
+5389=鏃舵晥鎬у父寮�璁剧疆
10000=HDL Home
@@ -627,7 +632,7 @@
-10150=鏀规埧闂村悕绉板凡瀛樺湪
+10150=鎴块棿鍚嶇О宸插瓨鍦�
10151=鍦烘櫙鍚嶄笉鑳戒负绌�
10152=鎺у埗鍦烘櫙澶辫触
10153=鍦烘櫙涓虹┖
@@ -662,7 +667,7 @@
11013=淇℃伅缂栬緫
11014=鍔熻兘鍚嶇О
11015=鎵�灞炲尯鍩�
-11016=鎵�灞炴ā鍧�
+11016=鎵�灞炶澶�
11017=鏈煡
11018=鍒嗕韩
11019=鍒嗕韩鐨�
@@ -1744,7 +1749,7 @@
16034=闂厜鐏�
16035=鎴块棿鐨勫唴瀹瑰湪姝ゅ鏄剧ず
16036=鎴戠煡閬撲簡
-16037=鍒嗕韩鏁版嵁宸茬粡鍙樻洿,璇烽噸鏂扮櫥闄�
+16037=鍒嗕韩鏁版嵁宸茬粡鍙樻洿,璇烽噸鏂扮櫥褰�
16038=宸ヤ綔妯″紡
16039=鎺у埗妯″紡
16040=瑙﹀彂妯″紡
@@ -1801,12 +1806,28 @@
16091=甯稿紑妯″紡鎵嬪姩寮�鍚�
16092=甯稿紑妯″紡鎵嬪姩鍙栨秷
16093=甯稿紑妯″紡鍚敤{0}灏忔椂
-16094=鎮ㄧ殑鏉冮檺宸茬粡鍙樻洿,璇烽噸鏂扮櫥闄�
+16094=鎮ㄧ殑鏉冮檺宸茬粡鍙樻洿,璇烽噸鏂扮櫥褰�
16095=鎴戝凡闃呰骞跺悓鎰�
16096=闅愮鏉冩斂绛�
16097=鍜�
16098=鏈嶅姟鏉℃
16099=璇峰厛闃呰骞跺悓鎰忋�婇殣绉佹潈鏀跨瓥銆嬪拰銆婃湇鍔℃潯娆俱��
+16100=甯稿紑妯″紡寮�鍚�(鑷姩鍖栬Е鍙�)
+16101=甯稿紑妯″紡缁撴潫(鑷姩鍖栬Е鍙�)
+16102=涓存椂瀵嗙爜寮�閿佹垚鍔�
+16103=涓存椂瀵嗙爜寮�閿佸け璐�
+16104=鐢垫満绌鸿皟妯″潡
+16105=涓滆姖绌鸿皟妯″潡
+16106=鏍煎姏绌鸿皟妯″潡
+16107=缇庣殑绌鸿皟妯″潡
+16108=铏氭嫙缃戝叧
+16109=鐜勫叧
+16110=鍘ㄦ埧
+16111=璧板粖
+16112=铏氭嫙璐﹀彿
+16113=鐏叏寮�
+16114=鐏叏鍏�
+16115=甯稿紑鑷姩鍖栨墜鍔ㄥ彇娑�
;鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄帴鍙ｇ殑杩斿洖淇℃伅缈昏瘧,浠�18000寮�濮嬧槄鈽呪槄鈽�
18004=鎸囧畾缃戝叧宸茬粡琚粦瀹�
@@ -1952,6 +1973,7 @@
40015=鎻掑骇
40016=鐏厜
40017=骞叉帴鐐�
+40018=鏂伴
;鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄ā鍧桰D鐨勮澶囬粯璁ゅ娉ㄥ悕瀛�,浠�50000寮�濮�.娉�:瀹冨苟涓嶉渶瑕佸啀R.cs鏂囦欢涓畾涔夆槄鈽呪槄鈽�
50000=绱ф�ユ寜閽�
@@ -1988,8 +2010,8 @@
50031=Zigbee鏂规偊鍥涘紑鍏帶闈㈡澘
50032=Zigbee鏂规偊鏂伴闈㈡澘
50033=Zigbee鏂规偊鐜闈㈡澘
-50034=Zigbee绠�绾�4鎸夐敭闈㈡澘
-50035=Zigbee绠�绾�2璺潰鏉�
+50034=Zigbee绠�绾�4鎸夐敭鍦烘櫙闈㈡澘
+50035=Zigbee绠�绾�2璺獥甯橀潰鏉�
50036=Zigbee鏂规偊2璺獥甯橀潰鏉�
50037=Zigbee鏅鸿兘闂ㄩ攣
50038=鏂伴鎺у埗灏忔ā鍧�
--
Gitblit v1.8.0