~wjc/HomeApp.git

old mode 100755 new mode 100644

			@@ -350,7 +350,7 @@
			/// </summary>
			public const int AddFreshAirModulPanelMsg = 239;
			/// <summary>
			/// 设置常开模式后，您的门锁将始终{0}处于打开状态，确认开启？
			/// 设置常开模式后，您的门锁将始终{0}处于打开状态，确认开启？
			/// </summary>
			public const int SetDoorLockNomallyOpen = 241;
			/// <summary>
			@@ -622,6 +622,46 @@
			/// 长按“开关”按键5秒
			/// </summary>
			public const int LongPressButtonSwitch = 327;
			/// <summary>
			/// 最多可添加{0}个
			/// </summary>
			public const int AddMoreTip = 328;
			/// <summary>
			/// 绑定
			/// </summary>
			public const int Bind = 329;
			/// <summary>
			/// 330=该设备是继电器，当前只支持带有调光的灯光绑定
			/// </summary>
			public readonly static int CanSelectDimmer = 330;
			/// <summary>
			/// 该设备是调光灯，当前只支持不带有调光的灯光绑定
			/// </summary>
			public readonly static int CanSelectRelay = 331;
			/// <summary>
			/// 空调目标
			/// </summary>
			public const int AcTargets = 332;
			/// <summary>
			/// 不绑定任何目标
			/// </summary>
			public const int BindEmptyTargets = 333;
			/// <summary>
			/// /睡眠时间
			/// </summary>
			public const int SleepTime = 334;
			/// <summary>
			/// 警告！数据出错，必须刷新列表，否则控制现象错乱
			/// </summary>
			public const int UpdateBindList = 335;
			/// <summary>
			/// 同步
			/// </summary>
			public const int Synchronization = 336;
			/// <summary>
			/// 同步失败
			/// </summary>
			public const int SynchronizationFailed = 337;

			public readonly static int cancel = 5097;
			public readonly static int confrim = 5098;
			@@ -663,7 +703,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;
			@@ -721,7 +761,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;
			@@ -857,10 +897,10 @@
			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 OnOffSwitch = 5361;
			public readonly static int addlinkageevent = 5362;
			public readonly static int editlinkageevent = 5363;
			public readonly static int selectunlockingmode=5364;
			public readonly static int selectunlockingmode = 5364;
			public readonly static int lockaddaction = 5365;
			public readonly static int linkageevent = 5366;
			public readonly static int current = 5367;
			@@ -885,7 +925,7 @@
			public readonly static int daySone = 5386;
			public readonly static int numberSone = 5387;
			public readonly static int openAutomationSone = 5388;
			public readonly static int timeSetSone= 5389;
			public readonly static int timeSetSone = 5389;
			public readonly static int invalidSetting = 5390;
			public readonly static int hour = 5391;
			public readonly static int lockOpen = 5392;
			@@ -902,10 +942,21 @@
			public readonly static int executeSone = 5403;
			public readonly static int hour1 = 5404;
			public readonly static int mi = 5405;
			public readonly static int nightLightSwitch = 5406;
			public readonly static int colorTemperature = 5407;
			public readonly static int buzzer = 5408;
			public readonly static int ambientLight = 5409;
			public readonly static int illuminanceValue = 5410;
			public readonly static int dark = 5411;
			public readonly static int bright = 5412;
			public readonly static int tipIlluminanceValue = 5413;
			public readonly static int videoIntercom = 5414;
			public readonly static int dong = 5415;
			public readonly static int unit = 5416;
			public readonly static int theOutdoorUnit = 5417;



			#region 登录注册
			/// <summary>
			/// HDL Home
			/// </summary>
			@@ -914,117 +965,114 @@
			/// 常用
			/// </summary>
			public const int Favorite = 10001;



			/// <summary>
			/// 手机号
			/// </summary>
			public const int PhoneNum = 10100;
			/// <summary>
			/// 邮箱
			/// </summary>
			public const int Email = 10101;
			/// <summary>
			/// 请输入手机号
			/// </summary>
			public const int PleaseInputPhoneNum = 10102;
			/// <summary>
			/// 请输入不少于6位的密码
			/// </summary>
			public const int PleaseInputPWD = 10103;
			/// <summary>
			/// 登录
			/// </summary>
			public const int Login = 10104;
			/// <summary>
			/// 验证码登录
			/// </summary>
			public const int LoginByCode = 10105;
			/// <summary>
			/// 注册用户
			/// </summary>
			public const int Register = 10106;
			/// <summary>
			/// 请输入邮箱
			/// </summary>
			public const int PleaseInputEmail = 10107;
			/// <summary>
			/// 搜索
			/// </summary>
			public const int Search = 10108;
			/// <summary>
			/// 完成
			/// </summary>
			public const int Complete = 10109;
			/// <summary>
			/// 账号登录
			/// </summary>
			public const int LoginByAccountPWD = 10110;
			/// <summary>
			/// 获取验证码
			/// </summary>
			public const int SendVerificationCode = 10111;
			/// <summary>
			/// 后重发
			/// </summary>
			public const int SendVerificationCodeAgain = 10112;
			/// <summary>
			/// 请再次输入密码
			/// </summary>
			public const int PleaseComfirePWD = 10113;
			/// <summary>
			/// 发送验证码成功，请注意查收
			/// </summary>
			public const int SendVerificationCodeSuccess = 10114;
			/// <summary>
			/// 确定
			/// </summary>
			public const int Confrim = 10115;
			/// <summary>
			/// 手机号
			/// </summary>
			public const int PhoneNum = 10100;
			/// <summary>
			/// 邮箱
			/// </summary>
			public const int Email = 10101;
			/// <summary>
			/// 请输入手机号
			/// </summary>
			public const int PleaseInputPhoneNum = 10102;
			/// <summary>
			/// 请输入不少于6位的密码
			/// </summary>
			public const int PleaseInputPWD = 10103;
			/// <summary>
			/// 登录
			/// </summary>
			public const int Login = 10104;
			/// <summary>
			/// 验证码登录
			/// </summary>
			public const int LoginByCode = 10105;
			/// <summary>
			/// 注册用户
			/// </summary>
			public const int Register = 10106;
			/// <summary>
			/// 请输入邮箱
			/// </summary>
			public const int PleaseInputEmail = 10107;
			/// <summary>
			/// 搜索
			/// </summary>
			public const int Search = 10108;
			/// <summary>
			/// 完成
			/// </summary>
			public const int Complete = 10109;
			/// <summary>
			/// 账号登录
			/// </summary>
			public const int LoginByAccountPWD = 10110;
			/// <summary>
			/// 获取验证码
			/// </summary>
			public const int SendVerificationCode = 10111;
			/// <summary>
			/// 后重发
			/// </summary>
			public const int SendVerificationCodeAgain = 10112;
			/// <summary>
			/// 请再次输入密码
			/// </summary>
			public const int PleaseComfirePWD = 10113;
			/// <summary>
			/// 发送验证码成功，请注意查收
			/// </summary>
			public const int SendVerificationCodeSuccess = 10114;
			/// <summary>
			/// 确定
			/// </summary>
			public const int Confrim = 10115;
			/// <summary>
			/// 该用户已存在，可直接登录
			/// </summary>
			public const int AccountHasBeenRegistered = 10116;
			/// <summary>
			/// 提供的参数错误
			/// </summary>
			public const int PARAMETEROREMPTY = 10117;
			/// <summary>
			/// 提供的参数错误
			/// </summary>
			public const int PARAMETEROREMPTY = 10117;
			/// <summary>
			/// 确认密码不一致，请重新输入
			/// </summary>
			public const int TwoPasswordInconsistency = 10118;
			/// <summary>
			/// 验证码错误，请重新输入
			/// </summary>
			public const int VALIDCODEANDPHONENOEQUAL = 10119;
			/// <summary>
			/// 请求服务器失败
			/// </summary>
			public const int RequestServerFailed = 10120;
			/// <summary>
			/// 恭喜注册成功！
			/// </summary>
			public const int RegisterSuccessTip = 10121;
			/// <summary>
			/// 即将自动登录
			/// </summary>
			public const int WillAutoLogin = 10122;
			/// <summary>
			/// 忘记密码
			/// </summary>
			public const int ForgotPWD = 10123;
			/// <summary>
			/// 确认重置
			/// </summary>
			public const int ComfirmReset = 10124;
			/// <summary>
			/// 修改成功
			/// </summary>
			public const int ResetSuccess = 10125;
			/// <summary>
			/// 你的密码修改成功，请重新登录
			/// </summary>
			public const int ResetScucessPleaseLogin = 10126;
			/// <summary>
			/// 验证码错误，请重新输入
			/// </summary>
			public const int VALIDCODEANDPHONENOEQUAL = 10119;
			/// <summary>
			/// 请求服务器失败
			/// </summary>
			public const int RequestServerFailed = 10120;
			/// <summary>
			/// 恭喜注册成功！
			/// </summary>
			public const int RegisterSuccessTip = 10121;
			/// <summary>
			/// 即将自动登录
			/// </summary>
			public const int WillAutoLogin = 10122;
			/// <summary>
			/// 忘记密码
			/// </summary>
			public const int ForgotPWD = 10123;
			/// <summary>
			/// 确认重置
			/// </summary>
			public const int ComfirmReset = 10124;
			/// <summary>
			/// 修改成功
			/// </summary>
			public const int ResetSuccess = 10125;
			/// <summary>
			/// 你的密码修改成功，请重新登录
			/// </summary>
			public const int ResetScucessPleaseLogin = 10126;
			/// <summary>
			/// 请选择区号
			/// </summary>
			@@ -1054,10 +1102,6 @@
			/// </summary>
			public const int PleaseInputVerificationCode = 10133;
			/// <summary>
			/// 即将通过微信授权登录
			/// </summary>
			public const int LoginByWechat = 10134;
			/// <summary>
			/// 登录中...
			/// </summary>
			public const int Logining = 10135;
			@@ -1065,10 +1109,6 @@
			/// 当前住宅为空，请先建立住宅
			/// </summary>
			public const int CurrentlyTheUserIshHouseIsEmptyPleaseBuildANewHouseFirst = 10136;
			/// <summary>
			/// 住宅名称为空
			/// </summary>
			public const int TheResidenceNameNull = 10137;
			/// <summary>
			/// 邮箱错误，请重新输入
			/// </summary>
			@@ -1081,10 +1121,6 @@
			/// 请输入长度为6-13个字符的密码
			/// </summary>
			public const int ThePWDLengthError = 10140;
			/// <summary>
			/// 你已被强制下线！
			/// </summary>
			public const int YouHaveBeenSignOut = 10141;
			/// <summary>
			/// 新密码和原密码一致
			/// </summary>
			@@ -1101,10 +1137,8 @@
			/// 已有账号？登录
			/// </summary>
			public const int LoginByAccountPWD_1 = 10145;


			/// <summary>
			/// 改房间名称已存在
			/// 该房间名称已存在
			/// </summary>
			public const int HadSameRoom = 10150;
			/// <summary>
			@@ -1116,14 +1150,6 @@
			/// </summary>
			public const int ControlSceneFail = 10152;
			/// <summary>
			/// 场景为空
			/// </summary>
			public const int TheSceneIsNull = 10153;
			/// <summary>
			/// 该场景中没有执行目标
			/// </summary>
			public const int ThisSceneHaveNoDevice = 10154;
			/// <summary>
			/// 操作失败
			/// </summary>
			public const int FAIL = 10155;
			@@ -1131,16 +1157,6 @@
			/// 发送验证码失败
			/// </summary>
			public const int SENDFAIL = 10156;
			/// <summary>
			/// 网关不在线
			/// </summary>
			public const int TheMainGatewayIsNotOnLine = 10157;
			/// <summary>
			/// 下一步
			/// </summary>
			public const int Next = 10158;


			/// <summary>
			/// 已是最新版本
			/// </summary>
			@@ -1150,10 +1166,6 @@
			/// </summary>
			public const int Update = 10161;
			/// <summary>
			/// 更新内容
			/// </summary>
			public const int UpdateContent = 10162;
			/// <summary>
			/// 更新失败
			/// </summary>
			public const int UpdateAppFail = 10163;
			@@ -1161,10 +1173,6 @@
			/// 正在更新中...
			/// </summary>
			public const int Updating = 10164;
			/// <summary>
			/// 取消更新
			/// </summary>
			public const int CancelUpdating = 10165;
			/// <summary>
			/// 版本号
			/// </summary>
			@@ -1178,129 +1186,113 @@
			/// </summary>
			public const int UpdateVersion = 10168;
			/// <summary>
			/// 协议文本信息内容
			/// </summary>
			public const int SLA_Title = 10169;
			/// <summary>
			/// 协议详细
			/// </summary>
			public const int SLA_Detail = 10170;


			#endregion

			#region 分类

			/// <summary>
			/// 功能
			/// </summary>
			public const int Function = 11000;
			/// <summary>
			/// 场景
			/// </summary>
			public const int Scence = 11001;
			/// <summary>
			/// 自动化
			/// </summary>
			public const int Automation = 11002;


			/// <summary>
			/// 没有功能请在个人中心--设备管理处添加
			/// </summary>
			public const int NoFunction = 11010;
			/// <summary>
			/// 编辑
			/// </summary>
			public const int Edit = 11011;
			/// <summary>
			/// 场景
			/// </summary>
			public const int Scence = 11001;
			/// <summary>
			/// 自动化
			/// </summary>
			public const int Automation = 11002;
			/// <summary>
			/// 没有功能请在个人中心--设备管理处添加
			/// </summary>
			public const int NoFunction = 11010;
			/// <summary>
			/// 编辑
			/// </summary>
			public const int Edit = 11011;
			/// <summary>
			/// 功能设置
			/// </summary>
			public const int FunctionSetting = 11012;
			/// <summary>
			/// 信息编辑
			/// </summary>
			public const int EditInfo = 11013;
			/// <summary>
			/// 功能名称
			/// </summary>
			public const int FunctionName = 11014;
			/// <summary>
			/// 所属区域
			/// </summary>
			public const int BelongZone = 11015;
			/// <summary>
			/// 所属设备
			/// </summary>
			public const int BelongDevice = 11016;
			/// <summary>
			/// 未知
			/// </summary>
			public const int UNKnown = 11017;
			/// <summary>
			/// 分享
			/// </summary>
			public const int Share = 11018;
			/// <summary>
			/// 分享的
			/// </summary>
			public const int Shared = 11019;
			/// <summary>
			/// 选择图标
			/// </summary>
			public const int SelectIcon = 11020;
			/// <summary>
			/// 保存
			/// </summary>
			public const int Save = 11021;
			/// <summary>
			/// 提醒
			/// </summary>
			public const int TIP = 11022;
			/// <summary>
			/// 取消
			/// </summary>
			public const int Cancel = 11023;
			/// <summary>
			/// 没有场景{0}请点击右上角添加
			/// </summary>
			public const int NoScene = 11024;
			/// <summary>
			/// 设置
			/// </summary>
			public const int Setting = 11025;
			/// <summary>
			/// 延时
			/// </summary>
			public const int Delay = 11026;
			/// <summary>
			/// 确定删除吗？
			/// </summary>
			public const int ConfirmDelete = 11027;
			/// <summary>
			/// 添加场景
			/// </summary>
			public const int AddScence = 11028;
			/// <summary>
			/// 场景名称
			/// </summary>
			public const int SceneName = 11029;
			/// <summary>
			/// 请输入场景名称
			/// </summary>
			public const int PleaseInputSceneName = 11030;
			/// <summary>
			/// 添加执行目标
			/// </summary>
			public const int AddScentTargetAction = 11031;
			/// <summary>
			/// 选择区域
			/// </summary>
			public const int SelectZone = 11032;
			/// <summary>
			/// 选择场景图片
			/// </summary>
			public const int SelectScenePic = 11033;
			/// <summary>
			/// 信息编辑
			/// </summary>
			public const int EditInfo = 11013;
			/// <summary>
			/// 功能名称
			/// </summary>
			public const int FunctionName = 11014;
			/// <summary>
			/// 所属区域
			/// </summary>
			public const int BelongZone = 11015;
			/// <summary>
			/// 所属设备
			/// </summary>
			public const int BelongDevice = 11016;
			/// <summary>
			/// 未知
			/// </summary>
			public const int UNKnown = 11017;
			/// <summary>
			/// 分享
			/// </summary>
			public const int Share = 11018;
			/// <summary>
			/// 分享的
			/// </summary>
			public const int Shared = 11019;
			/// <summary>
			/// 选择图标
			/// </summary>
			public const int SelectIcon = 11020;
			/// <summary>
			/// 保存
			/// </summary>
			public const int Save = 11021;
			/// <summary>
			/// 提醒
			/// </summary>
			public const int TIP = 11022;
			/// <summary>
			/// 取消
			/// </summary>
			public const int Cancel = 11023;
			/// <summary>
			/// 没有场景{0}请点击右上角添加
			/// </summary>
			public const int NoScene = 11024;
			/// <summary>
			/// 设置
			/// </summary>
			public const int Setting = 11025;
			/// <summary>
			/// 延时
			/// </summary>
			public const int Delay = 11026;
			/// <summary>
			/// 确定删除吗？
			/// </summary>
			public const int ConfirmDelete = 11027;
			/// <summary>
			/// 添加场景
			/// </summary>
			public const int AddScence = 11028;
			/// <summary>
			/// 场景名称
			/// </summary>
			public const int SceneName = 11029;
			/// <summary>
			/// 请输入场景名称
			/// </summary>
			public const int PleaseInputSceneName = 11030;
			/// <summary>
			/// 添加执行目标
			/// </summary>
			public const int AddScentTargetAction = 11031;
			/// <summary>
			/// 选择区域
			/// </summary>
			public const int SelectZone = 11032;
			/// <summary>
			/// 选择场景图片
			/// </summary>
			public const int SelectScenePic = 11033;
			/// <summary>
			/// 确定要移除该功能？
			/// </summary>
			@@ -1317,45 +1309,10 @@
			/// 空调模式为空，请先配置
			/// </summary>
			public const int AC_Model_None = 11037;


			#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;
			/// <summary>
			/// 温度传感器
			/// </summary>
			@@ -1364,12 +1321,6 @@
			/// 湿度传感器
			/// </summary>
			public const int HumiditySensor = 12111;
			/// <summary>
			/// 温湿度传感器
			/// </summary>
			public const int TemperatureAndHumiditySensor = 12112;


			/// <summary>
			/// 有人
			/// </summary>
			@@ -1402,96 +1353,86 @@
			/// 安全
			/// </summary>
			public const int IASZone_Statu_Safe = 12507;


			#endregion


			#endregion

			#region 主页

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

			/// <summary>
			/// 选择楼层
			/// </summary>
			public const int SelectFloor = 13101;
			/// <summary>
			/// 选择住宅
			/// </summary>
			public const int ChangeHome = 13102;
			/// <summary>
			/// 新用户登录，请先绑定网关
			/// </summary>
			public const int NewAccountNeedBingGW = 13103;
			/// <summary>
			/// 添加智能网关
			/// </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;
			/// <summary>
			/// 选择楼层
			/// </summary>
			public const int SelectFloor = 13101;
			/// <summary>
			/// 选择住宅
			/// </summary>
			public const int ChangeHome = 13102;
			/// <summary>
			/// 新用户登录，请先绑定网关
			/// </summary>
			public const int NewAccountNeedBingGW = 13103;
			/// <summary>
			/// 添加智能网关
			/// </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;
			/// <summary>
			/// 该房间是分享过来的，不允许进行该操作
			/// </summary>
			@@ -1612,13 +1553,10 @@
			/// 该场景正在延时，请稍后
			/// </summary>
			public const int TheSceneIsDelaying = 13149;



			/// <summary>
			/// 选择摆风
			/// </summary>
			public const int SelectSwing=13500;
			public const int SelectSwing = 13500;
			/// <summary>
			/// 自动
			/// </summary>
			@@ -1671,18 +1609,11 @@



			#endregion







			/// <summary>
			/// 密码长度为{0}个字符
			/// </summary>
			public const int PswLengthMsg = 15000;
			/// <summary>
			/// 密码长度为{0}个字符
			/// </summary>
			public const int PswLengthMsg = 15000;
			/// <summary>
			/// 1个小写字母
			/// </summary>
			@@ -3060,7 +2991,7 @@
			/// </summary>
			public const int uCarbonMonoxideRevealed = 15393;
			/// <summary>
			/// 有不明物体经过
			/// 有人经过
			/// </summary>
			public const int uHadUnKnowObjectPassed = 15394;
			/// <summary>
			@@ -3486,7 +3417,7 @@
			/// <summary>
			/// 协调器
			/// </summary>
			public const int uCoordinator= 15514;
			public const int uCoordinator = 15514;
			/// <summary>
			/// 虚拟驱动
			/// </summary>
			@@ -4978,7 +4909,7 @@
			/// <summary>
			/// 跳转到移动设备
			/// </summary>
			public const int uJumpToMobileDevice= 15905;
			public const int uJumpToMobileDevice = 15905;
			/// <summary>
			/// WLAN设置连接家庭WiFi
			/// </summary>
			@@ -5852,14 +5783,6 @@
			/// </summary>
			public const int uAddMiniGatewayMsg1 = 16125;
			/// <summary>
			/// 请选择widora-xxxx网络
			/// </summary>
			public const int uPleaseSelectWidoraXXNet = 16126;
			/// <summary>
			/// 手机去设置连接网关热点{0}选择widora-xxxx网络
			/// </summary>
			public const int uAddMiniGatewayMsg2 = 16127;
			/// <summary>
			/// 色温
			/// </summary>
			public const int uColorTemperature = 16128;
			@@ -5867,6 +5790,39 @@
			/// Mini夜灯
			/// </summary>
			public const int uMiniNightLight = 16129;
			/// <summary>
			/// 燃气泄露
			/// </summary>
			public const int uGasLeakage = 16130;
			/// <summary>
			/// 忽略
			/// </summary>
			public const int uNeglect = 16131;
			/// <summary>
			/// 蜂鸣器开关
			/// </summary>
			public const int uBuzzerSwitch = 16132;
			/// <summary>
			/// 小夜灯开关
			/// </summary>
			public const int uMiniLightSwitch = 16133;
			/// <summary>
			/// 设置设备功能类型失败
			/// </summary>
			public const int uSetDeviceFunctionTypeFail = 16134;
			/// <summary>
			/// 获取场景列表失败,网关回复超时
			/// </summary>
			public const int uGetSceneListFailAndTimeOut = 16135;
			/// <summary>
			/// 需重新绑定
			/// </summary>
			public const int uNeedToRebind = 16136;
			/// <summary>
			/// 出现意外情况,数据丢失
			/// </summary>
			public const int uUnKnownErrorAndLostData = 16137;



			//★★★★下面这些是接口的返回信息翻译,从18000开始★★★★
			@@ -6102,7 +6058,10 @@
			/// 吸顶燃气传感器 -> 长按图示按键5秒以上，绿色快闪{0}进入配网状态，绿灯常亮则入网成功
			/// </summary>
			public const int uAddSensorCeilingGasMsg = 21023;

			/// <summary>
			/// 球型移动传感器 -> 长按图示按键5秒以上，指示灯变绿、闪烁{0}进入配网状态，绿灯熄灭则配网成功
			/// </summary>
			public const int uAddSensorSphericalMotionMsg = 21024;

			//★★★★下面这些是模块ID的官方名字,从30000开始★★★★
			/// <summary>
			@@ -6280,8 +6239,16 @@
			/// <summary>
			/// 镜像ID为11的设备的官方名字：Mini网关
			/// </summary>
			public const int uDeviceModelId11 = 30043;

			public const int uDeviceModelId11 = 30043;
			/// <summary>
			/// 镜像ID为20000的设备的官方名字：色温灯
			/// </summary>
			public const int uDeviceModelId20000 = 30044;
			/// <summary>
			/// 镜像ID为1205的设备的官方名字：球型移动传感器
			/// </summary>
			public const int uDeviceModelId1205 = 30045;

			//★★★★下面这些是设备所属种类的翻译名字,从40000开始★★★★
			/// <summary>
			/// 自定义设备所属ID为100的翻译名字：遮阳
			@@ -6483,7 +6450,11 @@
			/// <summary>
			/// 简约环境面板
			/// </summary>
			public const int uDeviceDirectionName29 = 70028;
			public const int uDeviceDirectionName29 = 70028;
			/// <summary>
			/// 球型移动传感器
			/// </summary>
			public const int uDeviceDirectionName30 = 70029;

			}
			}