~wxr/HDL_APP_Project.git

			@@ -4,6 +4,15 @@
			{
			public static class StringId
			{
			//public const int EnergyMonitoring = 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;
			@@ -622,9 +631,130 @@
			/// <summary>
			/// 是否重置滤网
			/// </summary>
			public const int ResetFilterScreenMsg = 1049;
			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;


			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 a31Music = 5000;
			public const int merge = 5001;
			@@ -748,7 +878,13 @@
			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;