~wjc/HomeApp.git

			@@ -333,7 +333,7 @@
			public readonly static int Sunrisesunset = 5134;
			public readonly static int cycle = 5135;
			public readonly static int completeNext = 5136;
			public readonly static int Selectedtimetype= 5137;
			public readonly static int Selectedtimetype = 5137;
			public readonly static int Timecondition = 5138;
			public readonly static int condition = 5139;
			public readonly static int pushset = 5140;
			@@ -391,7 +391,7 @@
			public readonly static int addtime = 5192;
			public readonly static int selectcommontimetype = 5193;
			public readonly static int newautomation = 5194;
			public readonly static int editautomation= 5195;
			public readonly static int editautomation = 5195;
			public readonly static int open1 = 5196;
			public readonly static int disable = 5197;
			public readonly static int selectsavedautomationstate = 5198;
			@@ -501,15 +501,47 @@
			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;
			public readonly static int OnOffSwitch = 5361;
			public readonly static int addlinkageevent = 5362;
			public readonly static int editlinkageevent = 5363;
			public readonly static int selectunlockingmode = 5364;
			public readonly static int lockaddaction = 5365;
			public readonly static int linkageevent = 5366;




			#region 登录注册
			/// <summary>
			/// HDL Home
			/// </summary>
			public const int AppName = 10000;
			#region 登录注册
			/// <summary>
			/// HDL Home
			/// </summary>
			public const int AppName = 10000;


			/// <summary>
			@@ -549,7 +581,7 @@
			/// </summary>
			public const int Search = 10108;
			/// <summary>
			/// 确定
			/// 完成
			/// </summary>
			public const int Complete = 10109;
			/// <summary>
			@@ -705,7 +737,7 @@
			/// </summary>
			public const int Setting = 11025;
			/// <summary>
			/// 定时
			/// 延时
			/// </summary>
			public const int Delay = 11026;
			/// <summary>
			@@ -737,15 +769,55 @@
			/// </summary>
			public const int SelectScenePic = 11033;

			#region 设备类型
			/// <summary>
			/// 未知设备
			/// </summary>
			public const int UnknowDevice = 12100;
			/// <summary>
			/// 继电器
			/// </summary>
			public const int OnOffOutput = 12102;
			/// <summary>
			/// 调光灯
			/// </summary>
			public const int DimmableLight = 12103;
			/// <summary>
			/// 窗帘
			/// </summary>
			public const int WindowCoveringDevice = 12104;
			/// <summary>
			/// 空调
			/// </summary>
			public const int Thermostat = 12105;
			/// <summary>
			/// 传感器
			/// </summary>
			public const int IASZone = 12106;
			/// <summary>
			/// 空气开关
			/// </summary>
			public const int AirSwitch = 12107;
			/// <summary>
			/// 彩灯
			/// </summary>
			public const int ColorDimmableLight = 12108;
			/// <summary>
			/// 中继器
			/// </summary>
			public const int Repeater = 12109;

			#endregion
			#endregion

			#region 主页

			/// <summary>
			/// 房间列表
			/// </summary>
			public const int RoomList = 13100;
			#endregion

			#region 主页

			/// <summary>
			/// 房间列表
			/// </summary>
			public const int RoomList = 13100;

			/// <summary>
			/// 选择楼层
			@@ -792,7 +864,7 @@
			/// </summary>
			public const int Open = 13111;
			/// <summary>
			/// 关
			/// 关闭
			/// </summary>
			public const int Close = 13112;
			/// <summary>
			@@ -826,11 +898,113 @@
			/// <summary>
			/// 该房间是分享过来的，不允许进行该操作
			/// </summary>
			public static readonly int TheRoomIsSharedNotAllowedToOperate = 13120;

			public const int TheRoomIsSharedNotAllowedToOperate = 13120;
			/// <summary>
			/// 还没选择房间，请先选择
			/// </summary>
			public const int NotSelectZone = 13121;
			/// <summary>
			/// 为你的动作创建时间间隔
			/// </summary>
			public const int SelectTimeForAction = 13122;
			/// <summary>
			/// 后
			/// </summary>
			public const int Later = 13123;
			/// <summary>
			/// 删除
			/// </summary>
			public const int Delete = 13124;
			/// <summary>
			/// 关
			/// </summary>
			public const int Shut = 13125;
			/// <summary>
			/// 选择风速
			/// </summary>
			public const int SelectFanMode = 13126;
			/// <summary>
			/// 低风
			/// </summary>
			public const int Fan_Low = 13127;
			/// <summary>
			/// 中风
			/// </summary>
			public const int Fan_Middle = 13128;
			/// <summary>
			/// 高风
			/// </summary>
			public const int Fan_Height = 13129;
			/// <summary>
			/// 选择模式
			/// </summary>
			public const int SelectMode = 13130;
			/// <summary>
			/// 自动
			/// </summary>
			public const int Mode_Auto = 13131;
			/// <summary>
			/// 制冷
			/// </summary>
			public const int Mode_Cool = 13132;
			/// <summary>
			/// 制热
			/// </summary>
			public const int Mode_Heat = 13133;
			/// <summary>
			/// 除湿
			/// </summary>
			public const int Mode_Dry = 13134;
			/// <summary>
			/// 送风
			/// </summary>
			public const int Mode_FanOnly = 13135;
			/// <summary>
			/// 室温
			/// </summary>
			public const int IndoorTemperature = 13136;
			/// <summary>
			/// 空调已经关闭，请先打开
			/// </summary>
			public const int TheACIsClose = 13137;
			/// <summary>
			/// 添加场景失败
			/// </summary>
			public const int AddSceneFail = 13138;
			/// <summary>
			/// 该场景已存在
			/// </summary>
			public const int TheSceneHadExist = 13139;
			/// <summary>
			/// 编辑
			/// </summary>
			public const int Editor = 13140;
			/// <summary>
			/// 编辑场景
			/// </summary>
			public const int EditorScene = 13141;
			/// <summary>
			/// 未分配区域
			/// </summary>
			public const int UnallocatedArea = 13142;
			/// <summary>
			/// 功能类型
			/// </summary>
			public const int FunctionType = 13143;
			/// <summary>
			/// 失败，请重试
			/// </summary>
			public const int FailedPleaseTryAgain = 13144;
			/// <summary>
			/// 成功
			/// </summary>
			public const int Success = 13145;


			#endregion




			/// <summary>
			/// 喜爱
			@@ -914,7 +1088,7 @@
			//*****public static readonly int Function = 11038;


			public static readonly int Delete = 11041;

			public static readonly int AddFunction = 11042;

			public static readonly int Light = 11044;
			@@ -996,13 +1170,14 @@
			/// 时间间隔
			/// </summary>
			public static readonly int TimeSpan = 11093;
			public static readonly int TheSceneHadExist = 11094;
			public static readonly int AddSceneFail = 11095;

			/// <summary>
			/// 自定义
			/// </summary>
			public static readonly int Custom = 11098;



			/// <summary>
			/// 自定义
			/// </summary>
			public static readonly int Custom = 11098;

			/// <summary>
			/// 取消收藏
			@@ -1016,7 +1191,7 @@
			/// 百分比
			/// </summary>
			public static readonly int Percent = 11103;
			public static readonly int Success = 11104;


			/// <summary>
			/// The please confirm new password.
			@@ -1028,10 +1203,7 @@
			public readonly static int NORECORD = 11107;

			public static readonly int TheMainGatewayIsNotOnLine = 12000;
			/// <summary>
			/// 失败，请重试
			/// </summary>
			public static readonly int FailedPleaseTryAgain = 12001;

			public static readonly int TheSceneIsNull = 12002;
			/// <summary>
			/// 该场景中没有执行目标
			@@ -1131,99 +1303,10 @@
			///当前没有可以添加到该房间的设备
			/// </summary>
			public static readonly int NoDeviceCanAddToRoom = 12034;
			/// <summary>
			/// 选择风速
			/// </summary>
			public static readonly int SelectFanMode = 12035;
			/// <summary>
			/// 低风
			/// </summary>
			public static readonly int Fan_Low = 12036;
			/// <summary>
			/// 中风
			/// </summary>
			public static readonly int Fan_Middle = 12037;
			/// <summary>
			/// 高风
			/// </summary>
			public static readonly int Fan_Height = 12038;
			/// <summary>
			/// 选择模式
			/// </summary>
			public static readonly int SelectMode = 12039;
			/// <summary>
			/// 自动
			/// </summary>
			public static readonly int Mode_Auto = 12040;
			/// <summary>
			/// 制冷
			/// </summary>
			public static readonly int Mode_Cool = 12041;
			/// <summary>
			/// 制热
			/// </summary>
			public static readonly int Mode_Heat = 12042;
			/// <summary>
			/// 除湿
			/// </summary>
			public static readonly int Mode_Dry = 12043;
			/// <summary>
			/// 送风
			/// </summary>
			public static readonly int Mode_FanOnly = 12044;
			/// <summary>
			/// 室温
			/// </summary>
			public static readonly int IndoorTemperature = 12045;
			/// <summary>
			/// 空调已经关闭，请先打开
			/// </summary>
			public static readonly int TheACIsClose = 12046;


			#region 设备类型
			/// <summary>
			/// 未知设备
			/// </summary>
			public static readonly int UnknowDevice = 12100;
			/// <summary>
			/// 控制面板
			/// </summary>
			public static readonly int OnOffSwitch = 12101;
			/// <summary>
			/// 继电器
			/// </summary>
			public static readonly int OnOffOutput = 12102;
			/// <summary>
			/// 调光灯
			/// </summary>
			public static readonly int DimmableLight = 12103;
			/// <summary>
			/// 窗帘
			/// </summary>
			public static readonly int WindowCoveringDevice = 12104;
			/// <summary>
			/// 空调
			/// </summary>
			public static readonly int Thermostat = 12105;
			/// <summary>
			/// 传感器
			/// </summary>
			public static readonly int IASZone = 12106;
			/// <summary>
			/// 空气开关
			/// </summary>
			public static readonly int AirSwitch = 12107;
			/// <summary>
			/// 彩灯
			/// </summary>
			public static readonly int ColorDimmableLight = 12108;
			/// <summary>
			/// 中继器
			/// </summary>
			public static readonly int Repeater = 12109;

			#endregion



			/// <summary>
			/// 当前房间没有设备可以添加到场景