~wxr/HDL_APP_Project.git

old mode 100644 new mode 100755

			@@ -4,6 +4,25 @@
			{
			public static class StringId
			{
			public const int Add = 412;
			public const int TipAddThirdPartyDeviceMsg = 411;
			public const int TipNotThirdPartyDevice = 410;
			public const int FunctionBrand = 409;
			public const int ConfirmAdd = 408;
			public const int Reading = 407;
			public const int MeetingGuests = 406;
			public const int Cozy = 405;
			public const int QuickAdjustment = 404;
			public const int ColorTemperature = 403;
			public const int Retry = 402;
			public const int QRCodeIsInvalid = 401;
			public const int WellComBackHome = 400;
			public const int DoReloadAgain = 381;
			public const int FunctionNotOpen = 380;
			public const int FadeSpeed = 379;
			public const int FadeTime = 378;
			public const int WholeZone = 377;
			public const int CannotEnterSpecialCharacters = 376;
			public const int GatewayOfflineCannotCreateScene = 375;
			public const int ResidenceDeletedSwitchToAnotherResidence = 374;
			public const int AddFloorFail = 373;
			@@ -145,7 +164,7 @@
			public const int EditNickname = 237;
			public const int NicknameCannotBeEmpty = 236;
			public const int CreateScene = 235;
			public const int PermissionToUse = 234;
			public const int MemberPermissionManagement = 234;
			public const int Nickname = 233;
			public const int MemberManagement = 232;
			public const int OtherArea = 231;
			@@ -386,8 +405,146 @@
			public const int LoginByEmail = 4;




			/// <summary>
			/// 室内湿度
			/// </summary>
			public const int IndoorHumidity = 1000;
			/// <summary>
			/// 童锁
			/// </summary>
			public const int V_chip = 1001;
			/// <summary>
			/// 负离子
			/// </summary>
			public const int Anion = 1002;
			/// <summary>
			/// 杀菌
			/// </summary>
			public const int Sterilization = 1003;
			/// <summary>
			/// 加湿
			/// </summary>
			public const int Humidification = 1004;
			/// <summary>
			/// 滤芯复位
			/// </summary>
			public const int FilterElementReset = 1005;
			/// <summary>
			/// 灯光
			/// </summary>
			public const int Lighting = 1006;
			/// <summary>
			/// 自动模式
			/// </summary>
			public const int AutoMode = 1007;
			/// <summary>
			/// 手动模式
			/// </summary>
			public const int HandMode = 1008;
			/// <summary>
			/// 强劲模式
			/// </summary>
			public const int StrongMode = 1009;
			/// <summary>
			/// 睡眠模式
			/// </summary>
			public const int SleepMode = 1010;
			/// <summary>
			/// 定时
			/// </summary>
			public const int Timing = 1011;
			/// <summary>
			/// 选择风速
			/// </summary>
			public const int WindSpeedSelection = 1012;
			/// <summary>
			/// 档
			/// </summary>
			public const int Gear = 1013;
			/// <summary>
			/// 请确认是否已实际重置滤芯并按{0}照说明书要求操作设备进行滤芯{0}寿命重新计时
			/// </summary>
			public const int FilterElementResetMsg = 1014;
			/// <summary>
			/// 低档
			/// </summary>
			public const int LowGear = 1015;
			/// <summary>
			/// 中档
			/// </summary>
			public const int MidGear = 1016;
			/// <summary>
			/// 高档
			/// </summary>
			public const int HeightGear = 1017;
			/// <summary>
			/// 定时设置
			/// </summary>
			public const int TimingSetting = 1018;
			/// <summary>
			/// 小时
			/// </summary>
			public const int Hour1 = 1019;
			/// <summary>
			/// 滤芯使用：
			/// </summary>
			public const int UseOfFilterElement = 1020;
			/// <summary>
			/// 空气净化器
			/// </summary>
			public const int AirCleaner = 1021;
			/// <summary>
			/// 当前风速
			/// </summary>
			public const int CurrentWindSpeed = 1022;
			/// <summary>
			/// 取消定时
			/// </summary>
			public const int CancelTiming = 1023;
			/// <summary>
			/// 扫地机器人
			/// </summary>
			public const int WeepRobot = 1024;
			/// <summary>
			/// 吸力调节
			/// </summary>
			public const int SuctionAdjustment = 1025;
			/// <summary>
			///吸力1档
			/// </summary>
			public const int SuctionOneGear = 1026;
			/// <summary>
			/// 吸力2档
			/// </summary>
			public const int SuctionTwoGear = 1027;
			/// <summary>
			/// 吸力3档
			/// </summary>
			public const int SuctionThreeGear = 1028;
			/// <summary>
			/// 充电
			/// </summary>
			public const int Charge = 1029;
			/// <summary>
			/// 声音
			/// </summary>
			public const int Voice = 1030;
			/// <summary>
			/// 静音
			/// </summary>
			public const int Mute = 1031;
			/// <summary>
			/// 清扫模式
			/// </summary>
			public const int CleanMode = 1032;
			/// <summary>
			/// 耗材管理
			/// </summary>
			public const int ConsumablesManagement = 1033;
			/// <summary>
			/// 历史记录
			/// </summary>
			public const int HistoryLog = 1034;


			public const int a31Music = 5000;
			@@ -509,9 +666,60 @@
			public const int leaveMode = 7066;
			public const int ordinaryMode = 7067;
			public const int timeMode = 7068;



			public const int logicnull = 7069;
			public const int secnenull = 7070;
			public const int setStartTime = 7071;
			public const int setEndTime = 7072;
			public const int unlikeTime = 7073;
			public const int startTimeLessThanEndTime = 7074;
			public const int conditioncNull = 7075;
			public const int targetNull = 7076;
			public const int timeNoSet = 7077;
			public const int conditioncNullOrtargetNull = 7078;
			public const int gatewayNotOnline = 7079;
			public const int timespecia = 7080;
			public const int sunrise = 7081;
			public const int sunset = 7082;
			public const int at = 7083;
			public const int punctually = 7084;
			public const int advanced = 7085;
			public const int minute = 7086;
			public const int shiwaibainhua=7087;
			public const int xuanzeshiwaibianhuatiaojian = 7088;
			public const int shuwaigongneng = 7089;
			public const int tianqibianhua = 7090;
			public const int shiwaihuanjingbianhua = 7091;
			public const int wendugaoyu = 7092;
			public const int wendudiyu = 7093;
			public const int shidugaoyu = 7094;
			public const int shidudiyu = 7095;
			public const int pmgaoyu = 7096;
			public const int pmdiyu = 7097;
			public const int clearday =7098;
			public const int cloudy= 7099;
			public const int rain = 7100;
			public const int setvalue = 7101;
			public const int nullvalue = 7102;
			public const int pmyou = 7103;
			public const int pmliang = 7104;
			public const int pmqingdu= 7105;
			public const int pmzhongdu = 7106;
			public const int pmzhongduwuran= 7107;
			public const int xieluoandwuxieluo=7108;
			public const int xieluo = 7109;
			public const int wuxieluo = 7110;
			public const int luoshuiandwuluoshui = 7111;
			public const int luoshui = 7112;
			public const int wuluoshui = 7113;
			public const int yourenandwuren = 7114;
			public const int youren = 7115;
			public const int wuren = 7116;
			public const int kaiqiandbihe = 7117;
			public const int kaiqi = 7118;
			public const int bihe = 7119;
			public const int fangchaigongneng = 7120;
			public const int zaixian = 7121;
			public const int buzaixian = 7122;

			#region LE新增
			/// <summary>
			@@ -711,7 +919,7 @@
			/// </summary>
			public const int LogWithAccountAndPassword = 9048;
			/// <summary>
			/// 密码连续输错次数已达到10次,用户已被锁定,请次日0点后再登陆
			/// 密码错误次数过多，账号被锁定！
			/// </summary>
			public const int AccountLoginLock = 9049;
			/// <summary>
			@@ -738,8 +946,38 @@
			/// 绘制手势验证
			/// </summary>
			public const int GestureVerification = 9055;


			/// <summary>
			/// 年
			/// </summary>
			public const int Years = 9056;
			/// <summary>
			/// 无区域功能
			/// </summary>
			public const int NoAreaFunction = 9057;
			/// <summary>
			/// 是否需要保存
			/// </summary>
			public const int IfNeedToSave = 9058;
			/// <summary>
			/// 暂无分享
			/// </summary>
			public const int NoShare = 9059;
			/// <summary>
			/// 使用权限
			/// </summary>
			public const int PermissionToUse = 9060;
			/// <summary>
			/// 使用权限
			/// </summary>
			public const int PleaseTryToForgetPassword = 9061;
			/// <summary>
			/// 查看
			/// </summary>
			public const int LookOver = 9062;
			/// <summary>
			/// 还有{0}次机会。
			/// </summary>
			public const int AFewMoreChances = 9063;

			#region 网络请求响应错误提示信息
			/// <summary>