~xm/HomeApp.git

			@@ -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;

			//面板绑定开始
			@@ -684,7 +683,7 @@
			/// </summary>
			public const int Cancel = 11023;
			/// <summary>
			/// 没有场景 \n 请点击右上角添加
			/// 没有场景 {\r\n} 请点击右上角添加
			/// </summary>
			public const int NoScene = 11024;
			/// <summary>
			@@ -727,8 +726,6 @@

			#endregion



			#region 主页

			/// <summary>
			@@ -752,9 +749,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 +874,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 +886,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 +904,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 +919,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 +971,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>