APP
/
oxFaceAndroid
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

fix 41.1

dev
MTing 3 weeks ago
parent
ed43939861
commit
0bd538d004
2 changed files with 22 additions and 17 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      app/src/main/java/com/ouxuan/oxface/OXFaceOnlineActivity.java
  2. 31
      app/src/main/java/com/ouxuan/oxface/network/LeaveVerificationManager.java

8
app/src/main/java/com/ouxuan/oxface/OXFaceOnlineActivity.java
View File

@ -391,14 +391,14 @@ public class OXFaceOnlineActivity extends BaseActivity implements View.OnClickLi
} }
@Override @Override
public void showLeaveVerificationResultPage(int errorCode, String errorMessage, boolean isSuccess, PadApiService.CheckLeaveResult result) {
public void showLeaveVerificationResultPage(int errorCode, String errorMessage, boolean isSuccess, PadApiService.CheckLeaveResult result, int verificationType) {
// 跳转到离场校验结果页面 // 跳转到离场校验结果页面
runOnUiThread(() -> { runOnUiThread(() -> {
try { try {
Intent intent = new Intent(OXFaceOnlineActivity.this, OrderVerificationResultActivity.class); Intent intent = new Intent(OXFaceOnlineActivity.this, OrderVerificationResultActivity.class);
// 设置验证类型为离场验证（使用特殊值5表示离场验证）
intent.putExtra("verification_type", 5); // 5表示离场验证
// 设置验证类型
intent.putExtra("verification_type", verificationType);
// 设置结果状态 // 设置结果状态
if (isSuccess) { if (isSuccess) {
@ -429,7 +429,7 @@ public class OXFaceOnlineActivity extends BaseActivity implements View.OnClickLi
intent.putExtra("verification_code", ""); intent.putExtra("verification_code", "");
intent.putExtra("card_no", ""); intent.putExtra("card_no", "");
LogManager.logInfo(TAG, "跳转到离场校验结果页面，状态: " + (isSuccess ? "成功" : "失败") + ", 错误代码: " + errorCode);
LogManager.logInfo(TAG, "跳转到离场校验结果页面，状态: " + (isSuccess ? "成功" : "失败") + ", 错误代码: " + errorCode + ", 验证类型: " + verificationType);
startActivity(intent); startActivity(intent);
} catch (Exception e) { } catch (Exception e) {

31
app/src/main/java/com/ouxuan/oxface/network/LeaveVerificationManager.java
View File

@ -27,6 +27,7 @@ public class LeaveVerificationManager {
private Context context; private Context context;
private LeaveVerificationListener listener; private LeaveVerificationListener listener;
private int currentVerificationType = TYPE_VERIFICATION_CODE; // 当前验证类型
/** /**
* 离场校验监听器接口 * 离场校验监听器接口
@ -67,8 +68,9 @@ public class LeaveVerificationManager {
* @param errorMessage 错误消息 * @param errorMessage 错误消息
* @param isSuccess 是否成功 * @param isSuccess 是否成功
* @param result 校验结果（成功时传入） * @param result 校验结果（成功时传入）
* @param verificationType 验证类型（1=验证码，2=人脸，3=扫码，4=扫码器）
*/ */
void showLeaveVerificationResultPage(int errorCode, String errorMessage, boolean isSuccess, PadApiService.CheckLeaveResult result);
void showLeaveVerificationResultPage(int errorCode, String errorMessage, boolean isSuccess, PadApiService.CheckLeaveResult result, int verificationType);
} }
public LeaveVerificationManager(Context context, LeaveVerificationListener listener) { public LeaveVerificationManager(Context context, LeaveVerificationListener listener) {
@ -85,6 +87,9 @@ public class LeaveVerificationManager {
public void performVerification(int verificationType, String verifyCode, String decryptText) { public void performVerification(int verificationType, String verifyCode, String decryptText) {
LogManager.logInfo(TAG, "开始执行离场验证，类型: " + verificationType); LogManager.logInfo(TAG, "开始执行离场验证，类型: " + verificationType);
// 保存当前验证类型
this.currentVerificationType = verificationType;
// 根据验证类型执行相应的验证 // 根据验证类型执行相应的验证
switch (verificationType) { switch (verificationType) {
case TYPE_VERIFICATION_CODE: case TYPE_VERIFICATION_CODE:
@ -173,7 +178,7 @@ public class LeaveVerificationManager {
if (listener != null) { if (listener != null) {
listener.onLeaveVerificationSuccess(result); listener.onLeaveVerificationSuccess(result);
// 跳转到离场校验结果页面显示成功结果 // 跳转到离场校验结果页面显示成功结果
listener.showLeaveVerificationResultPage(0, result != null ? result.getMessage() : "离场成功", true, result);
listener.showLeaveVerificationResultPage(0, result != null ? result.getMessage() : "离场成功", true, result, currentVerificationType);
} }
} }
@ -188,7 +193,7 @@ public class LeaveVerificationManager {
if (listener != null) { if (listener != null) {
listener.onLeaveVerificationError(errorCode, errorMessage); listener.onLeaveVerificationError(errorCode, errorMessage);
// 跳转到离场校验结果页面显示错误结果 // 跳转到离场校验结果页面显示错误结果
listener.showLeaveVerificationResultPage(errorCode, errorMessage, false, null);
listener.showLeaveVerificationResultPage(errorCode, errorMessage, false, null, currentVerificationType);
} }
} }
@ -201,7 +206,7 @@ public class LeaveVerificationManager {
String errorMessage = "网络请求异常: " + throwable.getMessage(); String errorMessage = "网络请求异常: " + throwable.getMessage();
listener.onLeaveVerificationError(-1, errorMessage); listener.onLeaveVerificationError(-1, errorMessage);
// 跳转到离场校验结果页面显示异常结果 // 跳转到离场校验结果页面显示异常结果
listener.showLeaveVerificationResultPage(-1, errorMessage, false, null);
listener.showLeaveVerificationResultPage(-1, errorMessage, false, null, currentVerificationType);
} }
} }
@ -225,7 +230,7 @@ public class LeaveVerificationManager {
listener.onLeaveVerificationError(-1, errorMessage); listener.onLeaveVerificationError(-1, errorMessage);
listener.onLeaveVerificationComplete(); listener.onLeaveVerificationComplete();
// 跳转到离场校验结果页面显示异常结果 // 跳转到离场校验结果页面显示异常结果
listener.showLeaveVerificationResultPage(-1, errorMessage, false, null);
listener.showLeaveVerificationResultPage(-1, errorMessage, false, null, currentVerificationType);
} }
} }
} }
@ -291,7 +296,7 @@ public class LeaveVerificationManager {
if (listener != null) { if (listener != null) {
listener.onLeaveVerificationSuccess(result); listener.onLeaveVerificationSuccess(result);
// 跳转到离场校验结果页面显示成功结果 // 跳转到离场校验结果页面显示成功结果
listener.showLeaveVerificationResultPage(0, result != null ? result.getMessage() : "离场成功", true, result);
listener.showLeaveVerificationResultPage(0, result != null ? result.getMessage() : "离场成功", true, result, currentVerificationType);
} }
} }
@ -306,7 +311,7 @@ public class LeaveVerificationManager {
if (listener != null) { if (listener != null) {
listener.onLeaveVerificationError(errorCode, errorMessage); listener.onLeaveVerificationError(errorCode, errorMessage);
// 跳转到离场校验结果页面显示错误结果 // 跳转到离场校验结果页面显示错误结果
listener.showLeaveVerificationResultPage(errorCode, errorMessage, false, null);
listener.showLeaveVerificationResultPage(errorCode, errorMessage, false, null, currentVerificationType);
} }
} }
@ -319,7 +324,7 @@ public class LeaveVerificationManager {
String errorMessage = "网络请求异常: " + throwable.getMessage(); String errorMessage = "网络请求异常: " + throwable.getMessage();
listener.onLeaveVerificationError(-1, errorMessage); listener.onLeaveVerificationError(-1, errorMessage);
// 跳转到离场校验结果页面显示异常结果 // 跳转到离场校验结果页面显示异常结果
listener.showLeaveVerificationResultPage(-1, errorMessage, false, null);
listener.showLeaveVerificationResultPage(-1, errorMessage, false, null, currentVerificationType);
} }
} }
@ -343,7 +348,7 @@ public class LeaveVerificationManager {
listener.onLeaveVerificationError(-1, errorMessage); listener.onLeaveVerificationError(-1, errorMessage);
listener.onLeaveVerificationComplete(); listener.onLeaveVerificationComplete();
// 跳转到离场校验结果页面显示异常结果 // 跳转到离场校验结果页面显示异常结果
listener.showLeaveVerificationResultPage(-1, errorMessage, false, null);
listener.showLeaveVerificationResultPage(-1, errorMessage, false, null, currentVerificationType);
} }
} }
} }
@ -410,7 +415,7 @@ public class LeaveVerificationManager {
if (listener != null) { if (listener != null) {
listener.onLeaveVerificationSuccess(result); listener.onLeaveVerificationSuccess(result);
// 跳转到离场校验结果页面显示成功结果 // 跳转到离场校验结果页面显示成功结果
listener.showLeaveVerificationResultPage(0, result != null ? result.getMessage() : "离场成功", true, result);
listener.showLeaveVerificationResultPage(0, result != null ? result.getMessage() : "离场成功", true, result, currentVerificationType);
} }
} }
@ -425,7 +430,7 @@ public class LeaveVerificationManager {
if (listener != null) { if (listener != null) {
listener.onLeaveVerificationError(errorCode, errorMessage); listener.onLeaveVerificationError(errorCode, errorMessage);
// 跳转到离场校验结果页面显示错误结果 // 跳转到离场校验结果页面显示错误结果
listener.showLeaveVerificationResultPage(errorCode, errorMessage, false, null);
listener.showLeaveVerificationResultPage(errorCode, errorMessage, false, null, currentVerificationType);
} }
} }
@ -438,7 +443,7 @@ public class LeaveVerificationManager {
String errorMessage = "网络请求异常: " + throwable.getMessage(); String errorMessage = "网络请求异常: " + throwable.getMessage();
listener.onLeaveVerificationError(-1, errorMessage); listener.onLeaveVerificationError(-1, errorMessage);
// 跳转到离场校验结果页面显示异常结果 // 跳转到离场校验结果页面显示异常结果
listener.showLeaveVerificationResultPage(-1, errorMessage, false, null);
listener.showLeaveVerificationResultPage(-1, errorMessage, false, null, currentVerificationType);
} }
} }
@ -462,7 +467,7 @@ public class LeaveVerificationManager {
listener.onLeaveVerificationError(-1, errorMessage); listener.onLeaveVerificationError(-1, errorMessage);
listener.onLeaveVerificationComplete(); listener.onLeaveVerificationComplete();
// 跳转到离场校验结果页面显示异常结果 // 跳转到离场校验结果页面显示异常结果
listener.showLeaveVerificationResultPage(-1, errorMessage, false, null);
listener.showLeaveVerificationResultPage(-1, errorMessage, false, null, currentVerificationType);
} }
} }
} }

Write Preview
Loading…
Cancel
Save