From 02141e4003b026f7de83c6ddeec56ba1be305981 Mon Sep 17 00:00:00 2001 From: MTing Date: Wed, 17 Sep 2025 17:16:08 +0800 Subject: [PATCH] fix 2 --- .../main/java/com/ouxuan/oxface/OXFaceOnlineActivity.java | 3 ++- .../java/com/ouxuan/oxface/network/utils/NetworkUtils.java | 12 ++++++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/ouxuan/oxface/OXFaceOnlineActivity.java b/app/src/main/java/com/ouxuan/oxface/OXFaceOnlineActivity.java index 796de71..1df32f8 100644 --- a/app/src/main/java/com/ouxuan/oxface/OXFaceOnlineActivity.java +++ b/app/src/main/java/com/ouxuan/oxface/OXFaceOnlineActivity.java @@ -354,7 +354,8 @@ public class OXFaceOnlineActivity extends BaseActivity implements View.OnClickLi // 设置结果状态 if (isSuccess) { intent.putExtra("status", "离场成功"); - intent.putExtra("message", errorMessage != null ? errorMessage : "离场成功"); + // 修复：使用result.getMessage()而不是errorMessage来显示服务端返回的完整消息 + intent.putExtra("message", result != null && result.getMessage() != null ? result.getMessage() : "离场成功"); } else { intent.putExtra("status", "离场失败"); intent.putExtra("message", errorMessage != null ? errorMessage : "离场失败"); diff --git a/app/src/main/java/com/ouxuan/oxface/network/utils/NetworkUtils.java b/app/src/main/java/com/ouxuan/oxface/network/utils/NetworkUtils.java index 0ce93be..6e0756e 100644 --- a/app/src/main/java/com/ouxuan/oxface/network/utils/NetworkUtils.java +++ b/app/src/main/java/com/ouxuan/oxface/network/utils/NetworkUtils.java @@ -698,7 +698,11 @@ public class NetworkUtils { ApiResponse apiResponse = response.body(); if (apiResponse.isSuccess()) { - callback.onSuccess(apiResponse.getData()); + // 修复：创建一个新的CheckLeaveResult对象，确保message字段被正确设置 + PadApiService.CheckLeaveResult result = new PadApiService.CheckLeaveResult(); + result.setMessage(apiResponse.getMessage()); + result.setData(apiResponse.getData()); + callback.onSuccess(result); } else { // 当服务器有正确的返回时，如果code不为0，应该显示服务器返回的message，而不是使用自定义的错误信息 callback.onError(apiResponse.getCode(), apiResponse.getMessage()); @@ -712,7 +716,11 @@ public class NetworkUtils { if (apiResponse != null) { // 如果能成功解析API响应，根据code值处理 if (apiResponse.isSuccess()) { - callback.onSuccess(apiResponse.getData()); + // 修复：创建一个新的CheckLeaveResult对象，确保message字段被正确设置 + PadApiService.CheckLeaveResult result = new PadApiService.CheckLeaveResult(); + result.setMessage(apiResponse.getMessage()); + result.setData(apiResponse.getData()); + callback.onSuccess(result); } else { // 当服务器有正确的返回时，如果code不为0，应该显示服务器返回的message callback.onError(apiResponse.getCode(), apiResponse.getMessage());