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 | 153 ++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 134 insertions(+), 19 deletions(-)
diff --git a/ZigbeeApp/Shared/R.cs b/ZigbeeApp/Shared/R.cs
index 23619fa..1997e16 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;
@@ -488,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;
@@ -684,7 +723,7 @@
/// </summary>
public const int Cancel = 11023;
/// <summary>
- /// 娌℃湁鍦烘櫙 \n 璇风偣鍑诲彸涓婅娣诲姞
+ /// 娌℃湁鍦烘櫙 {\r\n} 璇风偣鍑诲彸涓婅娣诲姞
/// </summary>
public const int NoScene = 11024;
/// <summary>
@@ -727,8 +766,6 @@
#endregion
-
-
#region 涓婚〉
/// <summary>
@@ -752,9 +789,71 @@
/// 娣诲姞鏅鸿兘缃戝叧
/// </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 const int Second = 13114;
+ /// <summary>
+ /// 鍒嗛挓
+ /// </summary>
+ public const int Minute = 13115;
+ /// <summary>
+ /// 灏忔椂
+ /// </summary>
+ 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
+
+
+
/// <summary>
@@ -826,7 +925,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 +937,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 +955,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 +970,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 +1022,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>
@@ -1895,7 +1987,7 @@
/// </summary>
public const int uGarrison = 15191;
/// <summary>
- /// 纭畾瑕佹巿鏉冭璐﹀彿涓轰富璐﹀彿?
+ /// 纭畾鎺堟潈銆寋0}銆嶆垚涓虹鐞嗗憳?
/// </summary>
public const int uUpSubAccountLevel = 15192;
/// <summary>
@@ -3954,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