From 2bf5ec775cb57d8015bee58c745a1e48081ff1b1 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期二, 15 十月 2019 11:06:05 +0800
Subject: [PATCH] 首次合并了全部的代码
---
ZigbeeApp/Shared/R.cs | 86 ++++++++++++++++++++++++++++++++++++++++---
1 files changed, 80 insertions(+), 6 deletions(-)
diff --git a/ZigbeeApp/Shared/R.cs b/ZigbeeApp/Shared/R.cs
index 99875dd..1997e16 100755
--- a/ZigbeeApp/Shared/R.cs
+++ b/ZigbeeApp/Shared/R.cs
@@ -255,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;
@@ -487,6 +501,32 @@
public readonly static int button3 = 5302;
public readonly static int button4 = 5303;
public readonly static int doyouwanttodelete = 5304;
+ public readonly static int onoff = 5305;
+ public readonly static int unattendedtime = 5306;
+ public readonly static int unattendedtime1 = 5307;
+ public readonly static int closetimeout = 5308;
+ public readonly static int closetime = 5309;
+ public readonly static int weekly = 5340;
+ public readonly static int selectweek = 5341;
+ public readonly static int doorLock = 5342;
+ public readonly static int userlist = 5343;
+ public readonly static int lockpassword = 5344;
+ public readonly static int fingerprint = 5345;
+ public readonly static int ic = 5346;
+ public readonly static int Airswitch = 5347;
+ public readonly static int createtimetext = 5348;
+ public readonly static int adddelay = 5349;
+ public readonly static int logiccool = 5350;
+ public readonly static int logicheat = 5351;
+ public readonly static int logicauto = 5352;
+ public readonly static int logicdry = 5353;
+ public readonly static int logicfanonly = 5354;
+ public readonly static int logiclow = 5355;
+ public readonly static int logicmedium = 5356;
+ public readonly static int logichigh = 5357;
+ public readonly static int logictemplate = 5358;
+ public readonly static int onlight = 5359;
+ public readonly static int offlight = 5360;
@@ -788,16 +828,27 @@
/// <summary>
/// 绉�
/// </summary>
- public static readonly int Second = 13114;
+ public const int Second = 13114;
/// <summary>
/// 鍒嗛挓
/// </summary>
- public static readonly int Minute = 13115;
+ public const int Minute = 13115;
/// <summary>
/// 灏忔椂
/// </summary>
- public static readonly int Hour = 13116;
-
+ public const int Hour = 13116;
+ /// <summary>
+ /// 鏈垎閰�
+ /// </summary>
+ public const int Unallocated = 13117;
+ /// <summary>
+ /// 鍏ㄩ��
+ /// </summary>
+ public const int AllSelect = 13118;
+ /// <summary>
+ /// 娣诲姞鍒�
+ /// </summary>
+ public const int AddTo = 13119;
#endregion
@@ -1936,7 +1987,7 @@
/// </summary>
public const int uGarrison = 15191;
/// <summary>
- /// 纭畾瑕佹巿鏉冭璐﹀彿涓轰富璐﹀彿?
+ /// 纭畾鎺堟潈銆寋0}銆嶆垚涓虹鐞嗗憳?
/// </summary>
public const int uUpSubAccountLevel = 15192;
/// <summary>
@@ -3995,7 +4046,30 @@
/// 缂栬緫鎴块棿
/// </summary>
public const int uEditorRoom = 15771;
-
+ /// <summary>
+ /// 鑾峰彇涓�...
+ /// </summary>
+ public const int uGetting = 15772;
+ /// <summary>
+ /// 瀛樺湪闈炴硶瀛楃銆寋0}銆�
+ /// </summary>
+ public const int uErrorFieldIsEsixt = 15773;
+ /// <summary>
+ /// 涓嶅瓨鍦ㄨ璐︽埛锛岃閲嶆柊杈撳叆
+ /// </summary>
+ public const int uMemberIsNotEsixtAndInputAgain = 15774;
+ /// <summary>
+ /// 杩斿洖
+ /// </summary>
+ public const int uGoBack = 15775;
+ /// <summary>
+ /// 杩樻病鏈夊叡浜尯鍩熺粰鎴愬憳{0}鍙偣鍑诲彸涓婅鈥�+鈥濇坊鍔�
+ /// </summary>
+ public const int uNotShardComtentMsg = 15776;
+ /// <summary>
+ /// 纭鍒犻櫎鍏变韩鎴块棿锛�
+ /// </summary>
+ public const int uDeleteShardRoomMsg = 15777;
//鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄帴鍙ｇ殑杩斿洖淇℃伅缈昏瘧,浠�18000寮�濮嬧槄鈽呪槄鈽�
/// <summary>
--
Gitblit v1.8.0