~xm/HomeApp.git

			@@ -309,6 +309,12 @@
			public readonly static int OffLineScene = 222;
			public readonly static int SureClearKeyModeAndTargets = 223;
			public readonly static int BindDeviceTargetIsEmpty = 224;
			public readonly static int PanelBindTargets = 225;
			public readonly static int ClearAllTargeta1 = 226;
			public readonly static int ClearAllTargeta2 = 227;
			public readonly static int DoorlockConfirm = 228;
			public readonly static int DistributeSuccess = 229;
			public readonly static int SureToUnFreeze = 230;

			public readonly static int RemindSetting = 548;
			public readonly static int AddNewUser = 650;
			@@ -580,6 +586,10 @@
			public readonly static int scenetip = 5371;
			public readonly static int securitytip = 5372;
			public readonly static int defaulttext = 5373;
			public readonly static int addsensor = 5374;
			public readonly static int addlighting = 5375;
			public readonly static int application = 5376;
			public readonly static int automationaddtext = 5377;

			#region 登录注册
			/// <summary>
			@@ -638,7 +648,7 @@
			/// </summary>
			public const int LoginByAccountPWD = 10110;
			/// <summary>
			/// 发送验证码
			/// 获取验证码
			/// </summary>
			public const int SendVerificationCode = 10111;
			/// <summary>
			@@ -765,6 +775,18 @@
			/// 新密码和原密码一致
			/// </summary>
			public const int NEWPASSWORDANDOLDPASSWORDEQUAL = 10142;
			/// <summary>
			/// 请先获取验证码
			/// </summary>
			public const int NORECORD = 10143;
			/// <summary>
			/// 忘记密码？
			/// </summary>
			public const int ForgotPWD_1 = 10144;
			/// <summary>
			/// 已有账号？登录
			/// </summary>
			public const int LoginByAccountPWD_1 = 10145;


			/// <summary>
			@@ -799,6 +821,10 @@
			/// 网关不在线
			/// </summary>
			public const int TheMainGatewayIsNotOnLine = 10157;
			/// <summary>
			/// 下一步
			/// </summary>
			public const int Next = 10158;


			/// <summary>
			@@ -965,6 +991,14 @@
			/// 确定要移除该功能？
			/// </summary>
			public const int DeleteFunction = 11034;
			/// <summary>
			/// 添加功能
			/// </summary>
			public const int AddFunction = 11035;
			/// <summary>
			/// 添加延时
			/// </summary>
			public const int AddDelayTime = 11036;

			#region 设备类型
			/// <summary>
			@@ -1015,6 +1049,41 @@
			/// 温湿度传感器
			/// </summary>
			public const int TemperatureAndHumiditySensor = 12112;


			/// <summary>
			/// 有人
			/// </summary>
			public const int IASZone_Statu_HavePerson = 12500;
			/// <summary>
			/// 无人
			/// </summary>
			public const int IASZone_Statu_NoPerson = 12501;
			/// <summary>
			/// 漏水
			/// </summary>
			public const int IASZone_Statu_HaveWater = 12502;
			/// <summary>
			/// 正常
			/// </summary>
			public const int IASZone_Statu_Normal = 12503;
			/// <summary>
			/// 开启
			/// </summary>
			public const int IASZone_Statu_Open = 12504;
			/// <summary>
			/// 闭合
			/// </summary>
			public const int IASZone_Statu_Close = 12505;
			/// <summary>
			/// 报警
			/// </summary>
			public const int IASZone_Statu_Alarm = 12506;
			/// <summary>
			/// 安全
			/// </summary>
			public const int IASZone_Statu_Safe = 12507;


			#endregion

			@@ -1261,11 +1330,11 @@
			public const int NeedCleanAC = 13511;

			/// <summary>
			/// 没功能请先添加
			/// 还没有功能哦
			/// </summary>
			public const int NoFunction_Tip = 13600;
			/// <summary>
			/// 没场景请先添加
			/// 还没有场景哦
			/// </summary>
			public const int NoScene_Tip = 13601;
			/// <summary>
			@@ -1276,6 +1345,10 @@
			/// 获取中...
			/// </summary>
			public const int Getting = 13603;
			/// <summary>
			/// 当前亮度
			/// </summary>
			public const int CurrentLightLevel = 13604;



			@@ -1828,7 +1901,7 @@
			/// </summary>
			public const int uUserName = 15147;
			/// <summary>
			/// Email
			/// 邮箱
			/// </summary>
			public const int uEmail = 15148;
			/// <summary>
			@@ -2872,13 +2945,13 @@
			/// </summary>
			public const int uGetDeviceVersionFail = 15448;
			/// <summary>
			/// 获取传感器灯光设置信息失败
			/// 获取传感器设置信息失败
			/// </summary>
			public const int uGetPirSensorLightSettionFail = 15449;
			public const int uGetPirSensorSettionFail = 15449;
			/// <summary>
			/// 设置传感器灯光配置失败
			/// 设置传感器配置信息失败
			/// </summary>
			public const int uSetPirSensorLightSettionFail = 15450;
			public const int uSetPirSensorSettionFail = 15450;
			/// <summary>
			/// 白天
			/// </summary>
			@@ -5063,6 +5136,102 @@
			/// 好的
			/// </summary>
			public const int uWell = 16025;
			/// <summary>
			/// 已执行
			/// </summary>
			public const int uExecuted = 16026;
			/// <summary>
			/// 门锁触发警报
			/// </summary>
			public const int uDoorLocksAlarmHadTriggered = 16027;
			/// <summary>
			/// 我的住宅
			/// </summary>
			public const int uMyResidence = 16028;
			/// <summary>
			/// 客厅
			/// </summary>
			public const int uLivingRoom = 16029;
			/// <summary>
			/// 阳台
			/// </summary>
			public const int uBalcony = 16030;
			/// <summary>
			/// 卧室
			/// </summary>
			public const int uBedroom = 16031;
			/// <summary>
			/// 左右滑动,切换房间卡片
			/// </summary>
			public const int uSlideLeftAndRightToSwitchRoomCards = 16032;
			/// <summary>
			/// 右滑进入房间列表
			/// </summary>
			public const int uSlideRightToRoomList = 16033;
			/// <summary>
			/// 闪光灯
			/// </summary>
			public const int uFlashlamp = 16034;
			/// <summary>
			/// 房间的内容在此处显示
			/// </summary>
			public const int uTheContentsOfTheRoomAreShownHere = 16035;
			/// <summary>
			/// 我知道了
			/// </summary>
			public const int uIKnwon = 16036;
			/// <summary>
			/// 分享数据已经变更,请重新登陆
			/// </summary>
			public const int uShardDataIsChangedPleaseLoginAgain = 16037;
			/// <summary>
			/// 工作模式
			/// </summary>
			public const int uWorkMode = 16038;
			/// <summary>
			/// 控制模式
			/// </summary>
			public const int uControlMode = 16039;
			/// <summary>
			/// 触发模式
			/// </summary>
			public const int uTriggerMode = 16040;
			/// <summary>
			/// 上报间隔
			/// </summary>
			public const int uReportTimeSpace = 16041;
			/// <summary>
			/// 全自动模式
			/// </summary>
			public const int uFullAutoMode = 16042;
			/// <summary>
			/// 半自动模式
			/// </summary>
			public const int uHafeAutoMode = 16043;
			/// <summary>
			/// 调光模式
			/// </summary>
			public const int uDimmingMode = 16044;
			/// <summary>
			/// 开关模式
			/// </summary>
			public const int uSwitchMode = 16045;
			/// <summary>
			/// 开灯亮度
			/// </summary>
			public const int uTurnOnBrightness = 16046;
			/// <summary>
			/// 慢启动
			/// </summary>
			public const int uSlowStartup = 16047;
			/// <summary>
			/// 慢关闭
			/// </summary>
			public const int uSlowClose = 16048;
			/// <summary>
			/// 亮度
			/// </summary>
			public const int uBrightness = 16049;

			//★★★★下面这些是接口的返回信息翻译,从18000开始★★★★
			/// <summary>
			@@ -5395,7 +5564,7 @@

			//★★★★下面这些是设备所属种类的翻译名字,从40000开始★★★★
			/// <summary>
			/// 自定义设备所属ID为100的翻译名字：窗帘
			/// 自定义设备所属ID为100的翻译名字：遮阳
			/// </summary>
			public const int uDeviceBelongId100 = 40000;
			/// <summary>
			@@ -5415,7 +5584,7 @@
			/// </summary>
			public const int uDeviceBelongId2500 = 40004;
			/// <summary>
			/// 自定义设备所属ID为2800的翻译名字：智能门锁
			/// 自定义设备所属ID为2800的翻译名字：门锁
			/// </summary>
			public const int uDeviceBelongId2800 = 40005;
			/// <summary>