From 5986f63b75bd81c6cef262c670e9251c038cbf5d Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期二, 17 十二月 2019 17:21:07 +0800
Subject: [PATCH] 合并一个版本
---
ZigbeeApp/Shared/R.cs | 75 ++++++++++++++++++++++++++++++++++---
1 files changed, 69 insertions(+), 6 deletions(-)
diff --git a/ZigbeeApp/Shared/R.cs b/ZigbeeApp/Shared/R.cs
index 140ad23..23ea4c2 100755
--- a/ZigbeeApp/Shared/R.cs
+++ b/ZigbeeApp/Shared/R.cs
@@ -801,7 +801,7 @@
/// </summary>
public const int TheAppVersionIsNewest = 10160;
/// <summary>
- /// 鏇存柊
+ /// 鏇存柊鏈�鏂扮増
/// </summary>
public const int Update = 10161;
/// <summary>
@@ -813,13 +813,33 @@
/// </summary>
public const int UpdateAppFail = 10163;
/// <summary>
- /// 鏇存柊涓�...
+ /// 姝ｅ湪鏇存柊涓�...
/// </summary>
public const int Updating = 10164;
/// <summary>
/// 鍙栨秷鏇存柊
/// </summary>
public const int CancelUpdating = 10165;
+ /// <summary>
+ /// 鐗堟湰鍙�
+ /// </summary>
+ public const int VersionCode = 10166;
+ /// <summary>
+ /// 鏈嶅姟鍗忚
+ /// </summary>
+ public const int SLA = 10167;
+ /// <summary>
+ /// 鐗堟湰鏇存柊
+ /// </summary>
+ public const int UpdateVersion = 10168;
+ /// <summary>
+ /// 鍗忚鏂囨湰淇℃伅鍐呭
+ /// </summary>
+ public const int SLA_Title = 10169;
+ /// <summary>
+ /// 鍗忚璇︾粏
+ /// </summary>
+ public const int SLA_Detail = 10170;
#endregion
@@ -889,7 +909,7 @@
/// </summary>
public const int Save = 11021;
/// <summary>
- /// 鎻愮ず
+ /// 鎻愰啋
/// </summary>
public const int TIP = 11022;
/// <summary>
@@ -936,6 +956,10 @@
/// 閫夋嫨鍦烘櫙鍥剧墖
/// </summary>
public const int SelectScenePic = 11033;
+ /// <summary>
+ /// 纭畾瑕佺Щ闄よ鍔熻兘锛�
+ /// </summary>
+ public const int DeleteFunction = 11034;
#region 璁惧绫诲瀷
/// <summary>
@@ -4184,11 +4208,11 @@
/// </summary>
public const int uCommitCurtainLimitFail = 15812;
/// <summary>
- /// 纭褰撳墠浣嶇疆{0}涓哄紑闄愪綅?
+ /// 纭褰撳墠浣嶇疆涓哄紑闄愪綅?
/// </summary>
public const int uCommitCurtainOpenLimitMsg = 15813;
/// <summary>
- /// 纭褰撳墠浣嶇疆{0}涓哄悎闄愪綅?
+ /// 纭褰撳墠浣嶇疆涓哄悎闄愪綅?
/// </summary>
public const int uCommitCurtainCloseLimitMsg = 15814;
/// <summary>
@@ -4923,7 +4947,34 @@
/// 鏈煡妤煎眰
/// </summary>
public const int uUnKnownFloor = 15999;
-
+ /// <summary>
+ /// 濡傛灉涓嶈缃綇瀹呯殑鍦扮悊浣嶇疆,鍒欎細褰卞搷鑷姩鍖栧湴鐞嗗洿鏍忓姛鑳界殑璁剧疆
+ /// </summary>
+ public const int uNotSetLocationWillAffectTheAutomaticGeofencingFunction = 16000;
+ /// <summary>
+ /// 绌鸿皟妯″潡鐗堟湰
+ /// </summary>
+ public const int uAirConditionerModelVersion = 16001;
+ /// <summary>
+ /// 閫氫俊鑺墖
+ /// </summary>
+ public const int uCommunicationChip = 16002;
+ /// <summary>
+ /// 绌鸿皟妯″潡
+ /// </summary>
+ public const int uAirConditioningModule = 16003;
+ /// <summary>
+ /// 鑾峰彇澶辫触
+ /// </summary>
+ public const int uGettingFail = 16004;
+ /// <summary>
+ /// 鏃犳硶璇嗗埆
+ /// </summary>
+ public const int uUnDistinguish = 16005;
+ /// <summary>
+ /// 姝ｅ湪閲嶇疆鐢垫満
+ /// </summary>
+ public const int uElectricalMachineryResetting = 16006;
//鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄帴鍙ｇ殑杩斿洖淇℃伅缈昏瘧,浠�18000寮�濮嬧槄鈽呪槄鈽�
/// <summary>
@@ -5232,6 +5283,18 @@
/// 闀滃儚ID涓�2800鐨勮澶囩殑榛樿鍚嶅瓧锛欻06C
/// </summary>
public const int uDeviceModelId2800 = 30025;
+ /// <summary>
+ /// 闀滃儚ID涓�220鐨勮澶囩殑榛樿鍚嶅瓧锛氱畝绾�4鎸夐敭闈㈡澘
+ /// </summary>
+ public const int uDeviceModelId220 = 30026;
+ /// <summary>
+ /// 闀滃儚ID涓�221鐨勮澶囩殑榛樿鍚嶅瓧锛氱畝绾�3鎸夐敭闈㈡澘
+ /// </summary>
+ public const int uDeviceModelId221 = 30027;
+ /// <summary>
+ /// 闀滃儚ID涓�222鐨勮澶囩殑榛樿鍚嶅瓧锛氱畝绾�2鎸夐敭闈㈡澘
+ /// </summary>
+ public const int uDeviceModelId222 = 30028;
//鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄澶囨墍灞炵绫荤殑缈昏瘧鍚嶅瓧,浠�40000寮�濮嬧槄鈽呪槄鈽�
/// <summary>
--
Gitblit v1.8.0