~wxr/HDL_APP_Project.git

old mode 100755 new mode 100644

			@@ -4,6 +4,40 @@
			{
			public static class StringId
			{
			public const int GenerateScene = 442;
			public const int ChooseCatchZone = 441;
			public const int NextStep = 440;
			public const int RealTimePowerConsumption = 439;
			public const int EnvirSensorValueTip = 438;
			public const int DeviceList = 437;
			public const int AddedDevice = 436;
			public const int RemoteControl = 435;
			public const int TimeSwitch = 434;
			public const int WaterValve = 433;
			public const int Use3tyBrandListTip = 432;
			public const int Not3tyBrandListTip = 431;
			public const int MinuteUint = 430;
			public const int HourUint = 429;
			public const int AnionTime = 428;
			public const int DisinfectTime = 427;
			public const int WindDryTime = 426;
			public const int HotDryTime = 425;
			public const int Time = 424;
			public const int Lightint = 423;
			public const int Disinfect = 422;
			public const int WindDry = 421;
			public const int HotDry = 420;
			public const int SensorNormalState = 419;
			public const int InAlarm = 418;
			public const int WaterLeakage = 417;
			public const int Log = 416;
			public const int Someone = 415;
			public const int ControllerOn = 414;
			public const int ControllerNotOn = 413;
			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;
			@@ -506,7 +540,7 @@
			/// </summary>
			public const int SuctionAdjustment = 1025;
			/// <summary>
			///吸力1档
			/// 吸力1档
			/// </summary>
			public const int SuctionOneGear = 1026;
			/// <summary>
			@@ -541,7 +575,231 @@
			/// 历史记录
			/// </summary>
			public const int HistoryLog = 1034;
			/// <summary>
			/// 自动清扫
			/// </summary>
			public const int AutoClean = 1035;
			/// <summary>
			/// 随机清扫
			/// </summary>
			public const int RandomClean = 1036;
			/// <summary>
			/// 沿墙清扫
			/// </summary>
			public const int WallClean = 1037;
			/// <summary>
			/// 螺旋清扫
			/// </summary>
			public const int SpiralClean = 1038;
			/// <summary>
			/// 总清洁面积
			/// </summary>
			public const int TotalCleanArea = 1039;
			/// <summary>
			/// 总清洁时间
			/// </summary>
			public const int TotalCleaningTime = 1040;
			/// <summary>
			/// 边刷剩余寿命
			/// </summary>
			public const int RemainingLifeOfSideBrush = 1041;
			/// <summary>
			/// 滚刷剩余寿命
			/// </summary>
			public const int RemainingLifeOfRollerBrush = 1042;
			/// <summary>
			/// 滤网剩余寿命
			/// </summary>
			public const int RemainingLifeOfFilterScreen = 1043;
			/// <summary>
			/// 重置边刷
			/// </summary>
			public const int ResetSideBrush = 1044;
			/// <summary>
			/// 重置滚刷
			/// </summary>
			public const int ResetRollerBrush = 1045;
			/// <summary>
			/// 重置滤网
			/// </summary>
			public const int ResetFilterScreen = 1046;
			/// <summary>
			/// 是否重置边刷
			/// </summary>
			public const int ResetSideBrushMsg = 1047;
			/// <summary>
			/// 是否重置滚刷
			/// </summary>
			public const int ResetRollerBrushMsg = 1048;
			/// <summary>
			/// 是否重置滤网
			/// </summary>
			public const int ResetFilterScreenMsg = 1049;
			/// <summary>
			/// 添加设备
			/// </summary>
			public const int AddDevice = 1050;
			/// <summary>
			/// mini智能遥控器
			/// </summary>
			public const int MiniIntelligentRemoteControl = 1051;
			/// <summary>
			/// 添加红外遥控
			/// </summary>
			public const int AddInfraredRemoteControl = 1052;
			/// <summary>
			/// 长按红外遥控器按钮10秒，指示灯蓝色快闪
			/// </summary>
			public const int AddInfraredRemoteControlMsg1 = 1053;
			/// <summary>
			/// 请确保您的蓝牙已开启并处于可以被搜索状态
			/// </summary>
			public const int AddInfraredRemoteControlMsg2 = 1054;
			/// <summary>
			/// 下一步
			/// </summary>
			public const int Next = 1055;
			/// <summary>
			/// 设备搜索中...
			/// </summary>
			public const int SearchingDevice = 1056;
			/// <summary>
			/// 没有发现红外遥控器
			/// </summary>
			public const int NoInfraredRemoteControlFound = 1057;
			/// <summary>
			/// 1、请检查设备是否正常通电{0}2、请检查蓝牙功能是否正常开启{0}3、请检查指示灯是否蓝色快闪状态
			/// </summary>
			public const int AddInfraredRemoteControlMsg3 = 1058;
			/// <summary>
			/// 重新搜索
			/// </summary>
			public const int ReSearch = 1059;
			/// <summary>
			/// 连接WiFi
			/// </summary>
			public const int ConnectWiFi = 1060;
			/// <summary>
			/// 目前只支持2.4G WiFi网络{0}暂不支持带有中文字符的WiFi名称
			/// </summary>
			public const int AddInfraredRemoteControlMsg4 = 1061;
			/// <summary>
			/// 密码
			/// </summary>
			public const int Password = 1062;
			/// <summary>
			/// 正在连接中...
			/// </summary>
			public const int NowConnectting = 1063;
			/// <summary>
			/// 请让红外遥控尽量接近WIFI路由器
			/// </summary>
			public const int AddInfraredRemoteControlMsg5 = 1064;
			/// <summary>
			/// 网络链接中
			/// </summary>
			public const int InTheNetworkLink = 1065;
			/// <summary>
			/// 上传到云
			/// </summary>
			public const int UploadToCloud = 1066;
			/// <summary>
			/// 连接成功
			/// </summary>
			public const int ConnectSuccess = 1067;
			/// <summary>
			/// 1、请检查设备是否正常通电{0}2、请开启蓝牙功能{0}3、并长按按钮10s，指示灯常亮
			/// </summary>
			public const int AddInfraredRemoteControlMsg6 = 1068;
			/// <summary>
			/// 添加失败
			/// </summary>
			public const int AddFail = 1069;
			/// <summary>
			/// 添加成功
			/// </summary>
			public const int AddSuccess = 1070;
			/// <summary>
			/// 可以开始使用红外遥控功能！
			/// </summary>
			public const int AddInfraredRemoteControlMsg7 = 1071;
			/// <summary>
			/// 开始使用
			/// </summary>
			public const int StartUse = 1072;
			/// <summary>
			/// 请打开蓝牙
			/// </summary>
			public const int PleaseTurnOnBluetooth = 1073;
			/// <summary>
			/// 位置信息(GBS)不可用
			/// </summary>
			public const int GbsIsNotAvailable = 1074;
			/// <summary>
			/// 网络不可用
			/// </summary>
			public const int NetworkIsNotAvailable = 1075;
			/// <summary>
			/// 选择红外遥控器
			/// </summary>
			public const int ChooseInfraredRemoteControl = 1076;
			/// <summary>
			/// 新风
			/// </summary>
			public const int AirFresh = 1077;
			/// <summary>
			/// 当前滤网剩余
			/// </summary>
			public const int ResidualFilterScreen = 1078;
			/// <summary>
			/// 节能
			/// </summary>
			public const int Energy = 1079;
			/// <summary>
			/// 通风
			/// </summary>
			public const int Ventilated = 1080;
			/// <summary>
			/// 1档
			/// </summary>
			public const int OneGear = 1081;
			/// <summary>
			/// 2档
			/// </summary>
			public const int TwoGear = 1082;
			/// <summary>
			/// 3档
			/// </summary>
			public const int ThreeGear = 1083;
			/// <summary>
			/// 风速1档
			/// </summary>
			public const int FanOneGear = 1084;
			/// <summary>
			/// 风速2档
			/// </summary>
			public const int FanTwoGear = 1085;
			/// <summary>
			/// 风速3档
			/// </summary>
			public const int FanThreeGear = 1086;


			public const int keshiduijiang = 4000;
			public const int tonghuajilu = 4001;
			public const int baolu30 = 4002;
			public const int menkoujihujiao = 4003;
			public const int yijieting = 4004;
			public const int yikaisuo = 4005;
			public const int nian = 4006;
			public const int laizi = 4007;
			public const int hujiao = 4008;
			public const int weikaisuo = 4009;
			public const int weijieting = 4010;
			public const int yijujue = 4011;
			public const int peizhicanshuyouyichang = 4012;
			public const int menjinerweima = 4013;
			public const int linshimima = 4014;

			public const int a31Music = 5000;
			public const int merge = 5001;
			@@ -591,6 +849,90 @@
			public const int totalVolume = 5045;
			public const int volumeAdjustment = 5046;
			public const int qqMsuicTip = 5047;


			public const int zhengchang = 6000;
			public const int shebeizhuangtai = 6001;
			public const int ge = 6002;
			public const int dangqianhongwaishebei = 6003;
			public const int yitianjiayaokongqi = 6004;
			public const int kongtiao = 6005;
			public const int dianshi = 6006;
			public const int fengshan = 6007;
			public const int jidinghe = 6008;
			public const int dvd = 6009;
			public const int touyingyi = 6010;
			public const int zidingyi = 6011;
			public const int hongwaiyaokong = 6012;
			public const int shebeigaunli = 6013;
			public const int tianjiayaokongqi = 6014;
			public const int zaixianhwb= 6015;
			public const int lixian = 6016;
			public const int banbenhao = 6017;
			public const int shuruyaokongqimingcheng = 6018;
			public const int fengleichazhao = 6019;
			public const int tuijiananjian = 6020;
			public const int anjianmingcheng = 6021;
			public const int xiayibu= 6022;
			public const int dianyuan = 6023;
			public const int yinliangjia = 6024;
			public const int yinliangjian = 6025;
			public const int pindaojia = 6026;
			public const int pindaojian = 6027;
			public const int shang = 6028;
			public const int xia = 6029;
			public const int zuo = 6030;
			public const int you = 6031;
			public const int jingyin = 6032;
			public const int queren = 6034;
			public const int bofang = 6035;
			public const int tuichu = 6037;
			public const int caidan = 6038;
			public const int zanting = 6039;
			public const int fanhui = 6040;
			public const int tingzhi = 6041;
			public const int zhuye = 6042;
			public const int kuaijin = 6043;
			public const int kuaitui = 6044;
			public const int dingshi = 6045;
			public const int fuzhiyaokonggongnneg = 6046;
			public const int duizhunanxiaanniu = 6047;
			public const int zhinengyaokongqi = 6048;
			public const int tianjiaanniu = 6049;
			public const int paixu = 6050;
			public const int wancheng = 6051;
			public const int tianjiachenggong = 6052;
			public const int kedaofenlei = 6053;
			public const int suoshufenlei = 6054;
			public const int yaokongqimingcheng = 6055;
			public const int suoshuquyu = 6056;
			public const int jixutianjia = 6057;
			public const int dianqi = 6058;
			public const int tianjiashibai = 6059;
			public const int chongshii = 6060;
			public const int pipeiyaokongqi = 6061;
			public const int dianjianniu = 6062;
			public const int shifouyouxiangying = 6063;
			public const int kongzhishibai = 6064;
			public const int kongzhichenggong = 6065;
			public const int kaiguankai = 6066;
			public const int moshizhileng = 6067;
			public const int fengsuzhongfeng = 6068;
			public const int wendu26 = 6069;
			public const int shanchushebei = 6070;
			public const int xiugaimingzi = 6071;
			public const int querenshanchu = 6072;
			public const int quxiao = 6073;
			public const int bunengchaoguo10 = 6074;
			public const int yaokongqiquyu = 6075;
			public const int bianjixinxi = 6076;
			public const int banbenshengji = 6077;
			public const int xitongweihuzhong = 6078;
			public const int huoqushujushibao = 6079;
			public const int zanshibuzhichigaigongneng = 6080;





			public const int newAutomation = 7000;
			@@ -701,8 +1043,21 @@
			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>