From 737c036a39176fd2085ce82b7c60391da8cb508c Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期二, 31 十二月 2019 19:17:47 +0800
Subject: [PATCH] 合并了代码
---
ZigbeeApp/Shared/R.cs | 64 ++++++++++++++++++++++++++-----
1 files changed, 53 insertions(+), 11 deletions(-)
diff --git a/ZigbeeApp/Shared/R.cs b/ZigbeeApp/Shared/R.cs
index 9496171..b71297d 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;
@@ -379,7 +379,7 @@
public readonly static int Sunrisesunset = 5134;
public readonly static int cycle = 5135;
public readonly static int completeNext = 5136;
- public readonly static int Selectedtimetype= 5137;
+ public readonly static int Selectedtimetype = 5137;
public readonly static int Timecondition = 5138;
public readonly static int condition = 5139;
public readonly static int pushset = 5140;
@@ -590,6 +590,7 @@
public readonly static int addlighting = 5375;
public readonly static int application = 5376;
public readonly static int automationaddtext = 5377;
+ public readonly static int tiptextnull = 5378;
#region 鐧诲綍娉ㄥ唽
/// <summary>
@@ -3400,10 +3401,6 @@
/// 纭畾绉婚櫎閫変腑鐨勮澶囷紵
/// </summary>
public const int uConfirmRemoveSelectDeviceMsg = 15578;
- /// <summary>
- /// 鍑虹幇鏈煡閿欒,鏁版嵁涓㈠け
- /// </summary>
- public const int uUnknownErrorAndDataLost = 15579;
/// <summary>
/// 鍏变韩鏁版嵁鍚屾涓�
/// </summary>
@@ -4321,9 +4318,9 @@
/// </summary>
public const int uCommitCurtainDownLimitMsg = 15819;
/// <summary>
- /// 濡傛灉婊¤冻
+ /// 濡傛灉婊¤冻浣庝寒搴︾幆澧�
/// </summary>
- public const int uIfSatisfied = 15820;
+ public const int uIfTheLowBrightnessEnvironmentIsSatisfied = 15820;
/// <summary>
/// 灏变細
/// </summary>
@@ -4345,9 +4342,9 @@
/// </summary>
public const int uSecond = 15825;
/// <summary>
- /// 鐓ф槑绛夌骇
+ /// 鐓у害鍊�
/// </summary>
- public const int uLightLevel = 15826;
+ public const int uIlluminationValue = 15826;
/// <summary>
/// 浣�
/// </summary>
@@ -5232,6 +5229,51 @@
/// 浜害
/// </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;
+
//鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄帴鍙ｇ殑杩斿洖淇℃伅缈昏瘧,浠�18000寮�濮嬧槄鈽呪槄鈽�
/// <summary>
--
Gitblit v1.8.0