From 4b378188ce972df432b23d9cb73babb6cc0679c6 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期五, 17 一月 2020 14:56:15 +0800
Subject: [PATCH] 合并代码 ver.10086
---
ZigbeeApp/Shared/R.cs | 73 ++++++++++++++++++++++++++++++++++++
1 files changed, 73 insertions(+), 0 deletions(-)
diff --git a/ZigbeeApp/Shared/R.cs b/ZigbeeApp/Shared/R.cs
index 7a6f2ee..7a07ac3 100755
--- a/ZigbeeApp/Shared/R.cs
+++ b/ZigbeeApp/Shared/R.cs
@@ -5291,6 +5291,43 @@
/// 璁剧疆绌鸿皟鎽嗛澶辫触
/// </summary>
public const int uSetAirConditionerSwingFunctionFail = 16063;
+ /// <summary>
+ /// 鎸変綇姝ゆ寜閿�
+ /// </summary>
+ public const int uPressAndHoldThisKey = 16064;
+ /// <summary>
+ /// 鎸夐敭鎸囩ず鐏寒璧�
+ /// </summary>
+ public const int uKeyIndicatorLightsUp = 16065;
+ /// <summary>
+ /// 鎺ヨ繎鎰熷簲
+ /// </summary>
+ public const int uProximityInduction = 16066;
+ /// <summary>
+ /// 绌鸿皟鐩爣
+ /// </summary>
+ public const int uAirConditionerTarget = 16067;
+ /// <summary>
+ /// 鍦版殩鐩爣
+ /// </summary>
+ public const int uFloorHeatingTarget = 16068;
+ /// <summary>
+ /// 鏂伴鐩爣
+ /// </summary>
+ public const int uNewWindTarget = 16069;
+ /// <summary>
+ /// 灞忓箷浜害绾у埆
+ /// </summary>
+ public const int uScreenBrightnesLevel = 16070;
+ /// <summary>
+ /// 绾�
+ /// </summary>
+ public const int uRank = 16071;
+ /// <summary>
+ /// 鑳屽厜鐏寒搴�
+ /// </summary>
+ public const int uBacklightBrightness = 16072;
+
//鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄帴鍙ｇ殑杩斿洖淇℃伅缈昏瘧,浠�18000寮�濮嬧槄鈽呪槄鈽�
@@ -5502,6 +5539,22 @@
/// 娓╂箍搴︿紶鎰熷櫒 -> 闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝淇″彿鍥炬爣{0}蹇棯锛� 杩涘叆閰嶇綉鐘舵�併�傚浘鏍囧父浜垯閰嶇綉鎴愬姛
/// </summary>
public const int uAddSensorTemperatureAndHumidityMsg = 21017;
+ /// <summary>
+ /// 鏂规偊2鎸夐敭杞昏Е寮忛潰鏉� -> 鎸変綇闈㈡澘宸︿笂瑙掓寜閿紝鎵�鏈夋寜閿寚绀虹伅{0}浜捣锛屽垯閰嶇綉鎴愬姛
+ /// </summary>
+ public const int uAddFangyueTwoButtonPanelMsg = 21018;
+ /// <summary>
+ /// 鏂规偊4鎸夐敭杞昏Е寮忛潰鏉� -> 鎸変綇闈㈡澘宸︿笂瑙掓寜閿紝鎵�鏈夋寜閿寚绀虹伅{0}浜捣锛屽垯閰嶇綉鎴愬姛
+ /// </summary>
+ public const int uAddFangyueFourButtonPanelMsg = 21019;
+ /// <summary>
+ /// 鏂规偊8鎸夐敭杞昏Е寮忛潰鏉� -> 鎸変綇闈㈡澘宸︿笂瑙掓寜閿紝鎵�鏈夋寜閿寚绀虹伅{0}浜捣锛屽垯閰嶇綉鎴愬姛
+ /// </summary>
+ public const int uAddFangyueEightButtonPanelMsg = 21020;
+ /// <summary>
+ /// 鏂规偊鐜闈㈡澘 -> 鎸変綇闈㈡澘鍔熻兘(function)鎸夐敭锛屾墍鏈夋寜閿畕0}鎸囩ず鐏寒璧凤紝鍒欓厤缃戞垚鍔�
+ /// </summary>
+ public const int uAddFangyueEnvironmentPanelMsg = 21021;
//鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄ā鍧桰D鐨勭炕璇戝悕瀛�,浠�30000寮�濮嬧槄鈽呪槄鈽�
@@ -5621,6 +5674,26 @@
/// 闀滃儚ID涓�222鐨勮澶囩殑榛樿鍚嶅瓧锛氱畝绾�2鎸夐敭闈㈡澘
/// </summary>
public const int uDeviceModelId222 = 30028;
+ /// <summary>
+ /// 闀滃儚ID涓�240鐨勮澶囩殑榛樿鍚嶅瓧锛氭柟鎮�2鎸夐敭杞昏Е寮忛潰鏉�
+ /// </summary>
+ public const int uDeviceModelId240 = 30029;
+ /// <summary>
+ /// 闀滃儚ID涓�241鐨勮澶囩殑榛樿鍚嶅瓧锛氭柟鎮�4鎸夐敭杞昏Е寮忛潰鏉�
+ /// </summary>
+ public const int uDeviceModelId241 = 30030;
+ /// <summary>
+ /// 闀滃儚ID涓�242鐨勮澶囩殑榛樿鍚嶅瓧锛氭柟鎮�8鎸夐敭杞昏Е寮忛潰鏉�
+ /// </summary>
+ public const int uDeviceModelId242 = 30031;
+ /// <summary>
+ /// 闀滃儚ID涓�250鐨勮澶囩殑榛樿鍚嶅瓧锛氭柟鎮︽柊椋庨潰鏉�
+ /// </summary>
+ public const int uDeviceModelId250 = 30032;
+ /// <summary>
+ /// 闀滃儚ID涓�253鐨勮澶囩殑榛樿鍚嶅瓧锛氭柟鎮︾幆澧冮潰鏉�
+ /// </summary>
+ public const int uDeviceModelId253 = 30033;
//鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄澶囨墍灞炵绫荤殑缈昏瘧鍚嶅瓧,浠�40000寮�濮嬧槄鈽呪槄鈽�
/// <summary>
--
Gitblit v1.8.0