Browse Source

test 35 fix

devab
MTing 3 weeks ago
parent
commit
e3f1adc948
  1. 15
      app/src/main/java/com/ouxuan/oxface/OXFaceOnlineActivity.java
  2. 19
      app/src/main/java/com/ouxuan/oxface/network/OrderVerificationResultHandler.java

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

@ -517,6 +517,16 @@ public class OXFaceOnlineActivity extends BaseActivity implements View.OnClickLi
} }
startActivityForResult(intent, 1002); // 使用新的requestCode startActivityForResult(intent, 1002); // 使用新的requestCode
} }
@Override
public void pauseCamera() {
OXFaceOnlineActivity.this.pauseCamera();
}
@Override
public void resumeCamera() {
OXFaceOnlineActivity.this.resumeCamera();
}
}); });
} }
@ -1793,6 +1803,11 @@ public class OXFaceOnlineActivity extends BaseActivity implements View.OnClickLi
private void checkResultOnline(LivenessModel livenessModel) { private void checkResultOnline(LivenessModel livenessModel) {
this.currentLivenessModel = livenessModel; this.currentLivenessModel = livenessModel;
if(!isNeedCamera){
LogManager.logInfo(TAG, "摄像头暂停,停止接收livenessModel");
return;
}
// 判断是进场还是离场场景 // 判断是进场还是离场场景
if (VenueSceneUtils.isLeaveScene(OXFaceOnlineActivity.this)) { if (VenueSceneUtils.isLeaveScene(OXFaceOnlineActivity.this)) {
// 离场场景检查gate_open_enable配置0922沟通后确认使用gate_open_enable字段 // 离场场景检查gate_open_enable配置0922沟通后确认使用gate_open_enable字段

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

@ -50,6 +50,16 @@ public class OrderVerificationResultHandler {
* @param faceBase64 人脸base64数据可选 * @param faceBase64 人脸base64数据可选
*/ */
void navigateToOrderSelectionPage(String orderData, int verificationType, String faceBase64); void navigateToOrderSelectionPage(String orderData, int verificationType, String faceBase64);
/**
* 暂停摄像头预览
*/
void pauseCamera();
/**
* 恢复摄像头预览
*/
void resumeCamera();
} }
/** /**
@ -375,6 +385,11 @@ public class OrderVerificationResultHandler {
listener.showToast("正在核销订单,请稍候..."); listener.showToast("正在核销订单,请稍候...");
} }
// 在开始核销时暂停摄像头
if (listener != null) {
listener.pauseCamera();
}
// 调用NetworkUtils.verifyOrder接口进行实际核销传递所有必要参数 // 调用NetworkUtils.verifyOrder接口进行实际核销传递所有必要参数
com.ouxuan.oxface.network.utils.NetworkUtils.verifyOrder( com.ouxuan.oxface.network.utils.NetworkUtils.verifyOrder(
token, token,
@ -508,6 +523,10 @@ public class OrderVerificationResultHandler {
@Override @Override
public void onComplete() { public void onComplete() {
LogManager.logInfo(TAG, "核销请求完成"); LogManager.logInfo(TAG, "核销请求完成");
// 在核销完成后恢复摄像头
if (listener != null) {
listener.resumeCamera();
}
} }
} }
); );

Loading…
Cancel
Save