Browse Source

fix 2

devab
MTing 4 weeks ago
parent
commit
02141e4003
  1. 3
      app/src/main/java/com/ouxuan/oxface/OXFaceOnlineActivity.java
  2. 12
      app/src/main/java/com/ouxuan/oxface/network/utils/NetworkUtils.java

3
app/src/main/java/com/ouxuan/oxface/OXFaceOnlineActivity.java

@ -354,7 +354,8 @@ public class OXFaceOnlineActivity extends BaseActivity implements View.OnClickLi
// 设置结果状态 // 设置结果状态
if (isSuccess) { if (isSuccess) {
intent.putExtra("status", "离场成功"); intent.putExtra("status", "离场成功");
intent.putExtra("message", errorMessage != null ? errorMessage : "离场成功");
// 修复使用result.getMessage()而不是errorMessage来显示服务端返回的完整消息
intent.putExtra("message", result != null && result.getMessage() != null ? result.getMessage() : "离场成功");
} else { } else {
intent.putExtra("status", "离场失败"); intent.putExtra("status", "离场失败");
intent.putExtra("message", errorMessage != null ? errorMessage : "离场失败"); intent.putExtra("message", errorMessage != null ? errorMessage : "离场失败");

12
app/src/main/java/com/ouxuan/oxface/network/utils/NetworkUtils.java

@ -698,7 +698,11 @@ public class NetworkUtils {
ApiResponse<PadApiService.CheckLeaveResult> apiResponse = response.body(); ApiResponse<PadApiService.CheckLeaveResult> apiResponse = response.body();
if (apiResponse.isSuccess()) { 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 { } else {
// 当服务器有正确的返回时如果code不为0应该显示服务器返回的message而不是使用自定义的错误信息 // 当服务器有正确的返回时如果code不为0应该显示服务器返回的message而不是使用自定义的错误信息
callback.onError(apiResponse.getCode(), apiResponse.getMessage()); callback.onError(apiResponse.getCode(), apiResponse.getMessage());
@ -712,7 +716,11 @@ public class NetworkUtils {
if (apiResponse != null) { if (apiResponse != null) {
// 如果能成功解析API响应根据code值处理 // 如果能成功解析API响应根据code值处理
if (apiResponse.isSuccess()) { 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 { } else {
// 当服务器有正确的返回时如果code不为0应该显示服务器返回的message // 当服务器有正确的返回时如果code不为0应该显示服务器返回的message
callback.onError(apiResponse.getCode(), apiResponse.getMessage()); callback.onError(apiResponse.getCode(), apiResponse.getMessage());

Loading…
Cancel
Save