赵明涛 5 days ago
parent
commit
df89589b25
  1. 6
      app/src/main/java/com/ouxuan/oxface/OXFaceOnlineActivity.java
  2. 8
      app/src/main/java/com/ouxuan/oxface/network/OrderVerificationManager.java
  3. 36
      app/src/main/java/com/ouxuan/oxface/network/OrderVerificationResultHandler.java

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

@ -250,6 +250,12 @@ public class OXFaceOnlineActivity extends BaseActivity implements View.OnClickLi
} }
@Override @Override
public void onVerificationSuccessWithFullResponse(com.ouxuan.oxface.network.api.PadApiService.CheckOrderResult data, int verificationType, String fullResponseJson) {
// 当前不使用这个方法保持兼容性
orderVerificationResultHandler.handleVerificationSuccess(data, verificationType);
}
@Override
public void onVerificationError(int errorCode, String errorMessage, int verificationType) { public void onVerificationError(int errorCode, String errorMessage, int verificationType) {
orderVerificationResultHandler.handleVerificationError(errorCode, errorMessage, verificationType); orderVerificationResultHandler.handleVerificationError(errorCode, errorMessage, verificationType);
} }

8
app/src/main/java/com/ouxuan/oxface/network/OrderVerificationManager.java

@ -56,6 +56,14 @@ public class OrderVerificationManager {
void onVerificationSuccess(PadApiService.CheckOrderResult data, int verificationType); void onVerificationSuccess(PadApiService.CheckOrderResult data, int verificationType);
/** /**
* 验证成功回调包含完整响应数据
* @param data 返回的数据
* @param verificationType 验证类型
* @param fullResponseJson 完整的响应JSON字符串
*/
void onVerificationSuccessWithFullResponse(PadApiService.CheckOrderResult data, int verificationType, String fullResponseJson);
/**
* 验证失败回调 * 验证失败回调
* @param errorCode 错误码 * @param errorCode 错误码
* @param errorMessage 错误信息 * @param errorMessage 错误信息

36
app/src/main/java/com/ouxuan/oxface/network/OrderVerificationResultHandler.java

@ -188,11 +188,24 @@ public class OrderVerificationResultHandler {
* 处理人脸验证结果 * 处理人脸验证结果
*/ */
private void handleFaceVerificationResult(PadApiService.CheckOrderResult data) { private void handleFaceVerificationResult(PadApiService.CheckOrderResult data) {
// 将订单数据转为JSON字符串
// 重新构造完整的响应数据结构包含所有必要字段
Gson gson = new Gson(); Gson gson = new Gson();
String orderDataJson = gson.toJson(data);
LogManager.logInfo(TAG, "准备跳转到订单选择页面:"+orderDataJson);
// 创建完整的响应结构匹配原始API响应格式
java.util.Map<String, Object> fullResponse = new java.util.HashMap<>();
fullResponse.put("code", 0);
fullResponse.put("message", "");
fullResponse.put("extension", "extension_fixed");
// 创建data部分
java.util.Map<String, Object> dataMap = new java.util.HashMap<>();
dataMap.put("result", data.getResult());
dataMap.put("skip", 0);
fullResponse.put("data", dataMap);
String orderDataJson = gson.toJson(fullResponse);
LogManager.logInfo(TAG, "准备跳转到订单选择页面(完整数据):" + orderDataJson);
if (listener != null) { if (listener != null) {
listener.showToast("人脸验证成功,准备跳转到订单选择页面"); listener.showToast("人脸验证成功,准备跳转到订单选择页面");
listener.navigateToOrderSelectionPage(orderDataJson, OrderVerificationManager.TYPE_FACE_VERIFICATION, null); listener.navigateToOrderSelectionPage(orderDataJson, OrderVerificationManager.TYPE_FACE_VERIFICATION, null);
@ -207,11 +220,22 @@ public class OrderVerificationResultHandler {
listener.showToast("操作成功,正在跳转..."); listener.showToast("操作成功,正在跳转...");
} }
// 将订单数据转为JSON字符串
// 重新构造完整的响应数据结构
Gson gson = new Gson(); Gson gson = new Gson();
String orderDataJson = gson.toJson(data);
LogManager.logInfo(TAG, "准备跳转到订单选择页面");
java.util.Map<String, Object> fullResponse = new java.util.HashMap<>();
fullResponse.put("code", 0);
fullResponse.put("message", "");
fullResponse.put("extension", "extension_fixed");
java.util.Map<String, Object> dataMap = new java.util.HashMap<>();
dataMap.put("result", data.getResult());
dataMap.put("skip", 0);
fullResponse.put("data", dataMap);
String orderDataJson = gson.toJson(fullResponse);
LogManager.logInfo(TAG, "准备跳转到订单选择页面(扫码验证)");
if (listener != null) { if (listener != null) {
listener.navigateToOrderSelectionPage(orderDataJson, OrderVerificationManager.TYPE_SCAN_VERIFICATION, null); listener.navigateToOrderSelectionPage(orderDataJson, OrderVerificationManager.TYPE_SCAN_VERIFICATION, null);
} }

Loading…
Cancel
Save