From c6b35c3138b944830b5336bf610f918154dd47c7 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期六, 12 十月 2019 15:45:10 +0800
Subject: [PATCH] 合并门锁，完成住宅管理
---
ZigbeeApp/Shared/R.cs | 96 +++++++++++++++++++++++++++++++++++++++--------
1 files changed, 79 insertions(+), 17 deletions(-)
diff --git a/ZigbeeApp/Shared/R.cs b/ZigbeeApp/Shared/R.cs
index 23619fa..d39f734 100755
--- a/ZigbeeApp/Shared/R.cs
+++ b/ZigbeeApp/Shared/R.cs
@@ -161,7 +161,6 @@
public readonly static int ProximithCardUnlock = 86;
public readonly static int AllDate = 87;
public readonly static int SmartDoorLock = 88;
- public readonly static int Current = 89;
public readonly static int ClearTempPassword = 90;
//闈㈡澘缁戝畾寮�濮�
@@ -256,6 +255,20 @@
public readonly static int DelLocalBindListThenAddAgain2 = 170;
public readonly static int DelLocalBindListThenAddAgain3 = 171;
//闈㈡澘缁戝畾浠ヤ笂
+ public readonly static int IcCard = 172;
+ public readonly static int Password = 173;
+ public readonly static int Fingerprint = 174;
+ public readonly static int ModigfyFailed = 175;
+ public readonly static int OnlyBeDeletedOnTheDevice = 176;
+ public readonly static int Undistributed = 177;
+ public readonly static int AfterThirtySeconds = 178;
+ //闂ㄩ攣楠岃瘉瀵嗙爜澶辫触
+ public readonly static int OperrateFailed = 179;
+ public readonly static int RemoteUnlockBindSucessTip1 = 180;
+ public readonly static int RemoteUnlockBindSucessTip2 = 181;
+ public readonly static int CLose = 182;
+ public readonly static int Opening = 183;
+ public readonly static int DoorLockOpen = 184;
public readonly static int RemindSetting = 548;
public readonly static int AddNewUser = 650;
@@ -684,7 +697,7 @@
/// </summary>
public const int Cancel = 11023;
/// <summary>
- /// 娌℃湁鍦烘櫙 \n 璇风偣鍑诲彸涓婅娣诲姞
+ /// 娌℃湁鍦烘櫙 {\r\n} 璇风偣鍑诲彸涓婅娣诲姞
/// </summary>
public const int NoScene = 11024;
/// <summary>
@@ -727,8 +740,6 @@
#endregion
-
-
#region 涓婚〉
/// <summary>
@@ -752,9 +763,60 @@
/// 娣诲姞鏅鸿兘缃戝叧
/// </summary>
public const int AddSmartGW = 13104;
+ /// <summary>
+ /// 缂栬緫鎴块棿
+ /// </summary>
+ public const int EditRoom = 13105;
+ /// <summary>
+ /// 鎴块棿鍚嶇О
+ /// </summary>
+ public const int RoomName = 13106;
+ /// <summary>
+ /// 鎵�灞炴ゼ灞�
+ /// </summary>
+ public const int BelongFloor = 13107;
+ /// <summary>
+ /// 娓╁害
+ /// </summary>
+ public const int Temperature = 13108;
+ /// <summary>
+ /// 婀垮害
+ /// </summary>
+ public const int Humidity = 13109;
+ /// <summary>
+ /// 褰撳墠
+ /// </summary>
+ public const int Current = 13110;
+ /// <summary>
+ /// 寮�
+ /// </summary>
+ public const int Open = 13111;
+ /// <summary>
+ /// 鍏�
+ /// </summary>
+ public const int Close = 13112;
+ /// <summary>
+ /// 涓嶅紑鍚�
+ /// </summary>
+ public const int NotOpen = 13113;
+ /// <summary>
+ /// 绉�
+ /// </summary>
+ public static readonly int Second = 13114;
+ /// <summary>
+ /// 鍒嗛挓
+ /// </summary>
+ public static readonly int Minute = 13115;
+ /// <summary>
+ /// 灏忔椂
+ /// </summary>
+ public static readonly int Hour = 13116;
#endregion
+
+
+
/// <summary>
@@ -826,7 +888,7 @@
public static readonly int Logining = 11024;
public static readonly int AddRoom = 11026;
- public static readonly int RoomName = 11027;
+
public static readonly int SettingContent = 11031;
@@ -838,7 +900,7 @@
public static readonly int HadSameRoom = 11037;
//*****public static readonly int Function = 11038;
- public static readonly int EditRoom = 11040;
+
public static readonly int Delete = 11041;
public static readonly int AddFunction = 11042;
@@ -856,7 +918,7 @@
public static readonly int DeviceSetting = 11055;
public static readonly int AddDeviceSuccess = 11058;
- public static readonly int Close = 11059;
+
public static readonly int Device = 11060;
public static readonly int ConfirmDeleteThisRoom = 11062;
@@ -871,7 +933,7 @@
public static readonly int NextStep = 11071;
public static readonly int SelectRoom = 11072;
public static readonly int SelectDevice = 11073;
- public static readonly int Open = 11074;
+
/// <summary>
/// 璋冨厜
/// </summary>
@@ -923,14 +985,7 @@
public static readonly int TimeSpan = 11093;
public static readonly int TheSceneHadExist = 11094;
public static readonly int AddSceneFail = 11095;
- /// <summary>
- /// 绉�
- /// </summary>
- public static readonly int Second = 11096;
- /// <summary>
- /// 鍒嗛挓
- /// </summary>
- public static readonly int Minute = 11097;
+
/// <summary>
/// 鑷畾涔�
/// </summary>
@@ -3954,7 +4009,14 @@
/// 缂栬緫鎴块棿
/// </summary>
public const int uEditorRoom = 15771;
-
+ /// <summary>
+ /// 鑾峰彇涓�...
+ /// </summary>
+ public const int uGetting = 15772;
+ /// <summary>
+ /// 瀛樺湪闈炴硶瀛楃銆寋0}銆�
+ /// </summary>
+ public const int uErrorFieldIsEsixt = 15773;
//鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄帴鍙ｇ殑杩斿洖淇℃伅缈昏瘧,浠�18000寮�濮嬧槄鈽呪槄鈽�
/// <summary>
--
Gitblit v1.8.0