~wjc/HomeApp.git

			@@ -3822,239 +3822,9 @@
			/// <summary>
			/// 定位
			/// </summary>
			public const int uPleaseInputNewGesture = 15887;
			public const int uFixedPosition = 15681;
			/// <summary>
			/// 用户密码
			/// </summary>
			public const int uUserPassword = 15888;
			/// <summary>
			/// 当前使用密码
			/// </summary>
			public const int uNowUsePassword = 15889;
			/// <summary>
			/// 备注信息
			/// </summary>
			public const int uNoteInformation = 15890;
			/// <summary>
			/// 请输入备注内容
			/// </summary>
			public const int uPlesaeInputNoteInformation = 15891;
			/// <summary>
			/// 修改备注信息成功!
			/// </summary>
			public const int uEditorNoteInformationSuccess = 15892;
			/// <summary>
			/// 输入内容过长,最大{0}字节
			/// </summary>
			public const int uInputContentIsOverLengthMsg = 15893;
			/// <summary>
			/// 修改备注信息失败
			/// </summary>
			public const int uEditorNoteInformationFail = 15894;
			/// <summary>
			/// 请输入新胁迫密码
			/// </summary>
			public const int uPleaseInputNewCoercePassword = 15895;
			/// <summary>
			/// 请重复输入新胁迫密码
			/// </summary>
			public const int uPleaseRepeatInputNewCoercePassword = 15896;
			/// <summary>
			/// 胁迫密码设置成功
			/// </summary>
			public const int uSetCoercePasswordSuccess = 15897;
			/// <summary>
			/// 获取空调模式失败
			/// </summary>
			public const int uGetAcModeFail = 15898;
			/// <summary>
			/// 设置空调模式失败
			/// </summary>
			public const int uSetAcModeFail = 15899;
			/// <summary>
			/// 继续添加网关
			/// </summary>
			public const int uContinuteToAddGateway = 15900;
			/// <summary>
			/// 返回主页
			/// </summary>
			public const int uGobackToHomePage = 15901;
			/// <summary>
			/// 添加智能网关成功
			/// </summary>
			public const int uAddgatewaySuccess = 15902;
			/// <summary>
			/// UDP模式(推荐)
			/// </summary>
			public const int uUdpModeRecommend = 15903;
			/// <summary>
			/// AP模式
			/// </summary>
			public const int uApMode = 15904;
			/// <summary>
			/// 跳转到移动设备
			/// </summary>
			public const int uJumpToMobileDevice= 15905;
			/// <summary>
			/// WLAN设置连接家庭WiFi
			/// </summary>
			public const int uWlanConnectHomeWifi = 15906;
			/// <summary>
			/// 长按网关HID/WCFG按键20秒{0}系统灯快闪60秒则进入配网状态{0}系统灯每秒闪烁一次{0}则连接成功
			/// </summary>
			public const int uAddUdpWirelessGatewayMsg = 15907;
			/// <summary>
			/// 长按网关HID/WCFG按键5秒{0}系统灯常亮60秒后则进入配网状态
			/// </summary>
			public const int uAddApWirelessGatewayMsg1 = 15908;
			/// <summary>
			/// 跳转到移动设备WLAN设置{0}选择hdlZigbeeGW-xxxx网络
			/// </summary>
			public const int uAddApWirelessGatewayMsg2 = 15909;
			/// <summary>
			/// 请输入家庭WIFI账号
			/// </summary>
			public const int uPleaseInputHomeWifiAccount = 15910;
			/// <summary>
			/// 请前往移动设备WLAN设置{0}重新连接家庭wiFi
			/// </summary>
			public const int uAddApWirelessGatewayMsg3 = 15911;
			/// <summary>
			/// 系统灯每秒闪烁一次{0}则连接成功
			/// </summary>
			public const int uAddApWirelessGatewayMsg4 = 15912;
			/// <summary>
			/// 选择地点
			/// </summary>
			public const int uSelectAdrress = 15915;
			/// <summary>
			/// 您的反馈和意见会让我们变得更好
			/// </summary>
			public const int uYouSuggestionMsg = 15916;
			/// <summary>
			/// 反馈类型
			/// </summary>
			public const int uSuggestionType = 15917;
			/// <summary>
			/// 优化
			/// </summary>
			public const int uOptimization = 15918;
			/// <summary>
			/// 新需求
			/// </summary>
			public const int uNewDemand = 15919;
			/// <summary>
			/// 邮箱地址
			/// </summary>
			public const int uEmailAddress = 15920;
			/// <summary>
			/// 请输入您的邮箱地址
			/// </summary>
			public const int uPleaseInputYouEmailAddress = 15921;
			/// <summary>
			/// 提交
			/// </summary>
			public const int uSubmit = 15922;
			/// <summary>
			/// 提交成功,感谢您的意见
			/// </summary>
			public const int uSubmitSuccessMsg = 15923;
			/// <summary>
			/// 上传
			/// </summary>
			public const int uUpload = 15924;
			/// <summary>
			/// 自动备份
			/// </summary>
			public const int uAutoBackup = 15925;
			/// <summary>
			/// 今日提交次数已上限
			/// </summary>
			public const int uSubmitCountIsOverMsg = 15926;
			/// <summary>
			/// 获取网关信道失败
			/// </summary>
			public const int uGetGatewayChannelIdFail = 15927;
			/// <summary>
			/// 获取协调器Mac失败
			/// </summary>
			public const int uGetGatewayCoordinatorMacFail = 15928;
			/// <summary>
			/// 获取协调器PanID失败
			/// </summary>
			public const int uGetGatewayPanIDFail = 15929;
			/// <summary>
			/// 上传数据至云端
			/// </summary>
			public const int uUploadDataToDb = 15930;
			/// <summary>
			/// 从云端下载数据
			/// </summary>
			public const int uDwonloadDataFromDb = 15931;
			/// <summary>
			/// 上传数据
			/// </summary>
			public const int uUploadData = 15932;
			/// <summary>
			/// 上传数据成功
			/// </summary>
			public const int uUploadDataSuccess = 15933;
			/// <summary>
			/// 下载数据
			/// </summary>
			public const int uDwonloadData = 15934;
			/// <summary>
			/// 下载
			/// </summary>
			public const int uDownLoad = 15935;
			/// <summary>
			/// 设置网关经纬度失败
			/// </summary>
			public const int uSetGatewaySiteFail = 15936;
			/// <summary>
			/// 正在保存协调器的nv分区组网信息
			/// </summary>
			public const int uGatewayNVFileSaving = 15937;
			/// <summary>
			/// 保存协调器的nv分区组网信息失败
			/// </summary>
			public const int uSaveGatewayNVFileFail = 15938;
			/// <summary>
			/// 打开协调器串口发送功能失败
			/// </summary>
			public const int uOpenZbMsComSendFail = 15939;
			/// <summary>
			/// 网关数据备份失败
			/// </summary>
			public const int uBackupgatewayDataFail = 15940;
			/// <summary>
			/// 开始备份网关数据
			/// </summary>
			public const int uStartBackupgatewayData = 15941;
			/// <summary>
			/// 响应超时,网关数据备份失败
			/// </summary>
			public const int uResponseTimeoutsAndBackupgatewayDataFail = 15942;
			/// <summary>
			/// 创建备份文件
			/// </summary>
			public const int uCreatBackupFile = 15943;
			/// <summary>
			/// 正在打开协调器串口发送功能
			/// </summary>
			public const int uZbMsComSendOpening = 15944;

			//★★★★下面这些是接口的返回信息翻译,从18000开始★★★★
			/// <summary>
			/// 指定网关已经被绑定
			/// </summary>
			public const int BindGwToHome_BindGatewaysExists = 18004;
			/// <summary>
			/// 用户不存在于此住宅
			/// </summary>
			public const int BindSubAccount_NoExist = 18005;
			/// <summary>
			/// 账号已经存在于此住宅
			/// 按键设置
			/// </summary>
			public const int uPanelSettion = 15682;
			/// <summary>
			@@ -4953,6 +4723,150 @@
			/// WLAN设置连接家庭WiFi
			/// </summary>
			public const int uWlanConnectHomeWifi = 15906;
			/// <summary>
			/// 长按网关HID/WCFG按键20秒{0}系统灯快闪60秒则进入配网状态{0}系统灯每秒闪烁一次{0}则连接成功
			/// </summary>
			public const int uAddUdpWirelessGatewayMsg = 15907;
			/// <summary>
			/// 长按网关HID/WCFG按键5秒{0}系统灯常亮60秒后则进入配网状态
			/// </summary>
			public const int uAddApWirelessGatewayMsg1 = 15908;
			/// <summary>
			/// 跳转到移动设备WLAN设置{0}选择hdlZigbeeGW-xxxx网络
			/// </summary>
			public const int uAddApWirelessGatewayMsg2 = 15909;
			/// <summary>
			/// 请输入家庭WIFI账号
			/// </summary>
			public const int uPleaseInputHomeWifiAccount = 15910;
			/// <summary>
			/// 请前往移动设备WLAN设置{0}重新连接家庭wiFi
			/// </summary>
			public const int uAddApWirelessGatewayMsg3 = 15911;
			/// <summary>
			/// 系统灯每秒闪烁一次{0}则连接成功
			/// </summary>
			public const int uAddApWirelessGatewayMsg4 = 15912;
			/// <summary>
			/// 选择地点
			/// </summary>
			public const int uSelectAdrress = 15915;
			/// <summary>
			/// 您的反馈和意见会让我们变得更好
			/// </summary>
			public const int uYouSuggestionMsg = 15916;
			/// <summary>
			/// 反馈类型
			/// </summary>
			public const int uSuggestionType = 15917;
			/// <summary>
			/// 优化
			/// </summary>
			public const int uOptimization = 15918;
			/// <summary>
			/// 新需求
			/// </summary>
			public const int uNewDemand = 15919;
			/// <summary>
			/// 邮箱地址
			/// </summary>
			public const int uEmailAddress = 15920;
			/// <summary>
			/// 请输入您的邮箱地址
			/// </summary>
			public const int uPleaseInputYouEmailAddress = 15921;
			/// <summary>
			/// 提交
			/// </summary>
			public const int uSubmit = 15922;
			/// <summary>
			/// 提交成功,感谢您的意见
			/// </summary>
			public const int uSubmitSuccessMsg = 15923;
			/// <summary>
			/// 上传
			/// </summary>
			public const int uUpload = 15924;
			/// <summary>
			/// 自动备份
			/// </summary>
			public const int uAutoBackup = 15925;
			/// <summary>
			/// 今日提交次数已上限
			/// </summary>
			public const int uSubmitCountIsOverMsg = 15926;
			/// <summary>
			/// 获取网关信道失败
			/// </summary>
			public const int uGetGatewayChannelIdFail = 15927;
			/// <summary>
			/// 获取协调器Mac失败
			/// </summary>
			public const int uGetGatewayCoordinatorMacFail = 15928;
			/// <summary>
			/// 获取协调器PanID失败
			/// </summary>
			public const int uGetGatewayPanIDFail = 15929;
			/// <summary>
			/// 上传数据至云端
			/// </summary>
			public const int uUploadDataToDb = 15930;
			/// <summary>
			/// 从云端下载数据
			/// </summary>
			public const int uDwonloadDataFromDb = 15931;
			/// <summary>
			/// 上传数据
			/// </summary>
			public const int uUploadData = 15932;
			/// <summary>
			/// 上传数据成功
			/// </summary>
			public const int uUploadDataSuccess = 15933;
			/// <summary>
			/// 下载数据
			/// </summary>
			public const int uDwonloadData = 15934;
			/// <summary>
			/// 下载
			/// </summary>
			public const int uDownLoad = 15935;
			/// <summary>
			/// 设置网关经纬度失败
			/// </summary>
			public const int uSetGatewaySiteFail = 15936;
			/// <summary>
			/// 正在保存协调器的nv分区组网信息
			/// </summary>
			public const int uGatewayNVFileSaving = 15937;
			/// <summary>
			/// 保存协调器的nv分区组网信息失败
			/// </summary>
			public const int uSaveGatewayNVFileFail = 15938;
			/// <summary>
			/// 打开协调器串口发送功能失败
			/// </summary>
			public const int uOpenZbMsComSendFail = 15939;
			/// <summary>
			/// 网关数据备份失败
			/// </summary>
			public const int uBackupgatewayDataFail = 15940;
			/// <summary>
			/// 开始备份网关数据
			/// </summary>
			public const int uStartBackupgatewayData = 15941;
			/// <summary>
			/// 响应超时,网关数据备份失败
			/// </summary>
			public const int uResponseTimeoutsAndBackupgatewayDataFail = 15942;
			/// <summary>
			/// 创建备份文件
			/// </summary>
			public const int uCreatBackupFile = 15943;
			/// <summary>
			/// 正在打开协调器串口发送功能
			/// </summary>
			public const int uZbMsComSendOpening = 15944;

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