From bd46c57c77c276014db3192a4e2cc96e23c93202 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期五, 21 二月 2020 13:08:47 +0800
Subject: [PATCH] 先上传个版本吧
---
ZigbeeApp/Shared/R.cs | 169 ++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 151 insertions(+), 18 deletions(-)
diff --git a/ZigbeeApp/Shared/R.cs b/ZigbeeApp/Shared/R.cs
index 9496171..58c0e31 100755
--- a/ZigbeeApp/Shared/R.cs
+++ b/ZigbeeApp/Shared/R.cs
@@ -264,7 +264,7 @@
public readonly static int AfterFiftySeconds = 178;
//闂ㄩ攣楠岃瘉瀵嗙爜澶辫触
public readonly static int OperrateFailed = 179;
- public readonly static int RemoteUnlockBindSucessTip1 = 180;
+ public readonly static int RemoteUnlockBindSucessTip = 180;
public readonly static int RemoteUnlockBindSucessTip2 = 181;
public readonly static int CLose = 182;
public readonly static int Opening = 183;
@@ -310,7 +310,7 @@
public readonly static int SureClearKeyModeAndTargets = 223;
public readonly static int BindDeviceTargetIsEmpty = 224;
public readonly static int PanelBindTargets = 225;
- public readonly static int ClearAllTargeta1 = 226;
+ public readonly static int ClearAllTargets = 226;
public readonly static int ClearAllTargeta2 = 227;
public readonly static int DoorlockConfirm = 228;
public readonly static int DistributeSuccess = 229;
@@ -590,6 +590,8 @@
public readonly static int addlighting = 5375;
public readonly static int application = 5376;
public readonly static int automationaddtext = 5377;
+ public readonly static int tiptextnull = 5378;
+ public readonly static int tiplocktextnull = 5379;
#region 鐧诲綍娉ㄥ唽
/// <summary>
@@ -892,17 +894,17 @@
/// <summary>
- /// 娌℃湁鍔熻兘 璇峰湪涓汉涓績涓�--璁惧绠＄悊澶勬坊鍔�
+ /// 娌℃湁鍔熻兘 璇峰湪涓汉涓績--璁惧绠＄悊澶勬坊鍔�
/// </summary>
public const int NoFunction = 11010;
/// <summary>
/// 缂栬緫
/// </summary>
public const int Edit = 11011;
- /// <summary>
- /// 璁剧疆鍔熻兘
- /// </summary>
- public const int FunctionSetting = 11012;
+ /// <summary>
+ /// 鍔熻兘璁剧疆
+ /// </summary>
+ public const int FunctionSetting = 11012;
/// <summary>
/// 淇℃伅缂栬緫
/// </summary>
@@ -999,6 +1001,11 @@
/// 娣诲姞寤舵椂
/// </summary>
public const int AddDelayTime = 11036;
+ /// <summary>
+ /// 绌鸿皟妯″紡涓虹┖锛岃鍏堥厤缃�
+ /// </summary>
+ public const int AC_Model_None = 11037;
+
#region 璁惧绫诲瀷
/// <summary>
@@ -2161,9 +2168,9 @@
/// </summary>
public const int uBackup = 15225;
/// <summary>
- /// 璇疯緭鍏ュ娉ㄥ悕绉�
+ /// 璇疯緭鍏ュ浠藉悕绉�
/// </summary>
- public const int uPleaseInpuBackup = 15226;
+ public const int uPleaseInpuBackupName = 15226;
/// <summary>
/// 鎭㈠鏂囦欢鎴愬姛
/// </summary>
@@ -3400,10 +3407,6 @@
/// 纭畾绉婚櫎閫変腑鐨勮澶囷紵
/// </summary>
public const int uConfirmRemoveSelectDeviceMsg = 15578;
- /// <summary>
- /// 鍑虹幇鏈煡閿欒,鏁版嵁涓㈠け
- /// </summary>
- public const int uUnknownErrorAndDataLost = 15579;
/// <summary>
/// 鍏变韩鏁版嵁鍚屾涓�
/// </summary>
@@ -4321,9 +4324,9 @@
/// </summary>
public const int uCommitCurtainDownLimitMsg = 15819;
/// <summary>
- /// 濡傛灉婊¤冻
+ /// 濡傛灉婊¤冻浣庝寒搴︾幆澧�
/// </summary>
- public const int uIfSatisfied = 15820;
+ public const int uIfTheLowBrightnessEnvironmentIsSatisfied = 15820;
/// <summary>
/// 灏变細
/// </summary>
@@ -4345,9 +4348,9 @@
/// </summary>
public const int uSecond = 15825;
/// <summary>
- /// 鐓ф槑绛夌骇
+ /// 鐓у害鍊�
/// </summary>
- public const int uLightLevel = 15826;
+ public const int uIlluminationValue = 15826;
/// <summary>
/// 浣�
/// </summary>
@@ -4725,7 +4728,7 @@
/// </summary>
public const int uSubmit = 15922;
/// <summary>
- /// 鎻愪氦鎴愬姛,鎰熻阿鎮ㄧ殑鎰忚
+ /// 鎮ㄧ殑鍙嶉宸叉垚鍔熸彁浜�
/// </summary>
public const int uSubmitSuccessMsg = 15923;
/// <summary>
@@ -5232,6 +5235,100 @@
/// 浜害
/// </summary>
public const int uBrightness = 16049;
+ /// <summary>
+ /// 鑾峰彇浼犳劅鍣ㄤ寒搴﹀�煎け璐�
+ /// </summary>
+ public const int uGetPirSensorLuxFail = 16050;
+ /// <summary>
+ /// 褰撳墠浜害鍊�
+ /// </summary>
+ public const int uNowBrightnessValue = 16051;
+ /// <summary>
+ /// 鏆�
+ /// </summary>
+ public const int uDark = 16052;
+ /// <summary>
+ /// 浜�
+ /// </summary>
+ public const int uBright = 16053;
+ /// <summary>
+ /// 鍦ㄥ鍐呮潯浠朵笅锛岄粍鏄忕収搴﹀�肩害涓�10lux锛岄槾澶╃収搴﹀�肩害涓�5~50lux锛岃鏍规嵁瀹為檯闇�瑕佽繘琛岃皟鑺�
+ /// </summary>
+ public const int uPirBrightnessTipMsg = 16054;
+ /// <summary>
+ /// 闇囧姩鍙嶉
+ /// </summary>
+ public const int uVibrationFeedback = 16055;
+ /// <summary>
+ /// 鑾峰彇闇囧姩鍙嶉閰嶇疆淇℃伅澶辫触
+ /// </summary>
+ public const int uGetVibrationFeedbackSettionFail = 16056;
+ /// <summary>
+ /// 璁剧疆闇囧姩鍙嶉閰嶇疆淇℃伅澶辫触
+ /// </summary>
+ public const int uSetVibrationFeedbackSettionFail = 16057;
+ /// <summary>
+ /// 鎴戠殑瀹�
+ /// </summary>
+ public const int uMyHome = 16058;
+ /// <summary>
+ /// 闀挎寜鈥滄垜鐨勫鈥漿0}鍙垏鎹㈡垜鐨勪綇瀹�
+ /// </summary>
+ public const int uLongClickMyHomeCanChangedHome = 16059;
+ /// <summary>
+ /// 鍔炲叕瀹�
+ /// </summary>
+ public const int uWorkRoom = 16060;
+ /// <summary>
+ /// 鐢垫満鏁版嵁寮傚父,璇烽噸缃數鏈�
+ /// </summary>
+ public const int uCurtainDataIsErrorPleaseResetCurtain = 16061;
+ /// <summary>
+ /// 鑾峰彇绌鸿皟鎽嗛鐘舵�佸け璐�
+ /// </summary>
+ public const int uGetAirConditionerSwingFunctionFail = 16062;
+ /// <summary>
+ /// 璁剧疆绌鸿皟鎽嗛澶辫触
+ /// </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寮�濮嬧槄鈽呪槄鈽�
/// <summary>
@@ -5442,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寮�濮嬧槄鈽呪槄鈽�
@@ -5561,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