Browse Source

fix test bug 3

devab
MTing 4 weeks ago
parent
commit
8586485f87
  1. 6
      app/src/main/java/com/ouxuan/oxface/OXFaceOnlineActivity.java
  2. 10
      app/src/main/java/com/ouxuan/oxface/device/OxUDP.java
  3. 32
      app/src/main/java/com/ouxuan/oxface/orderOX/OrderSelectionActivity.java

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

@ -425,8 +425,8 @@ public class OXFaceOnlineActivity extends BaseActivity implements View.OnClickLi
public void onVerificationSuccess(com.ouxuan.oxface.network.api.PadApiService.CheckOrderResult data, int verificationType) { public void onVerificationSuccess(com.ouxuan.oxface.network.api.PadApiService.CheckOrderResult data, int verificationType) {
// 订单核销成功后开启B门 // 订单核销成功后开启B门
if (gateABController != null) { if (gateABController != null) {
LogManager.logInfo(TAG, "订单核销成功,开启B门");
gateABController.handleFaceRecognitionSuccess(true); // 参数保留兼容性实际都开B门
LogManager.logInfo(TAG, "订单验证成功,准备执行核销操作");
// gateABController.handleFaceRecognitionSuccess(true); // 参数保留兼容性实际都开B门
} }
// 然后处理原有的页面跳转逻辑 // 然后处理原有的页面跳转逻辑
@ -1846,7 +1846,7 @@ public class OXFaceOnlineActivity extends BaseActivity implements View.OnClickLi
LogManager.logInfo(TAG, "准备调用ABPeopleCheck方法"); LogManager.logInfo(TAG, "准备调用ABPeopleCheck方法");
boolean peopleCheckPassed = abGateManager.ABPeopleCheck(); boolean peopleCheckPassed = abGateManager.ABPeopleCheck();
LogManager.logInfo(TAG, "ABPeopleCheck方法返回结果: " + peopleCheckPassed); LogManager.logInfo(TAG, "ABPeopleCheck方法返回结果: " + peopleCheckPassed);
peopleCheckPassed = true; //TODO 测试不进行人脸检验
if (!peopleCheckPassed) { if (!peopleCheckPassed) {
LogManager.logWarning(TAG, "人数检测未通过,准备显示弹窗"); LogManager.logWarning(TAG, "人数检测未通过,准备显示弹窗");
// 人数检测未通过显示弹窗 // 人数检测未通过显示弹窗

10
app/src/main/java/com/ouxuan/oxface/device/OxUDP.java

@ -420,14 +420,14 @@ public class OxUDP {
if (responseArr.length > 28) { if (responseArr.length > 28) {
String aStateValue = responseArr[28]; String aStateValue = responseArr[28];
gateAState = "01".equals(aStateValue); // 01表示开启00表示关闭 gateAState = "01".equals(aStateValue); // 01表示开启00表示关闭
Log.d(TAG, "A门状态值parseGateState: " + aStateValue + " -> " + (gateAState ? "开启" : "关闭"));
// Log.d(TAG, "A门状态值parseGateState: " + aStateValue + " -> " + (gateAState ? "开启" : "关闭"));
} }
// 解析B门状态第29位数组索引29 // 解析B门状态第29位数组索引29
if (responseArr.length > 29) { if (responseArr.length > 29) {
String bStateValue = responseArr[29]; String bStateValue = responseArr[29];
gateBState = "01".equals(bStateValue); // 01表示开启00表示关闭 gateBState = "01".equals(bStateValue); // 01表示开启00表示关闭
Log.d(TAG, "B门状态值parseGateState: " + bStateValue + " -> " + (gateBState ? "开启" : "关闭"));
// Log.d(TAG, "B门状态值parseGateState: " + bStateValue + " -> " + (gateBState ? "开启" : "关闭"));
} }
// 记录完整的响应数据用于调试 // 记录完整的响应数据用于调试
@ -443,9 +443,9 @@ public class OxUDP {
// Log.d(TAG, "门禁状态 - A门: " + (gateAState ? "开启" : "关闭") + // Log.d(TAG, "门禁状态 - A门: " + (gateAState ? "开启" : "关闭") +
// ", B门: " + (gateBState ? "开启" : "关闭")); // ", B门: " + (gateBState ? "开启" : "关闭"));
Log.e(TAG, "parseGateState: isFirstStateUpdate:" + isFirstStateUpdate +
" |lastGateAState:" + lastGateAState + " |lastGateBState:" + lastGateBState +
" |currentGateAState:" + gateAState + " |currentGateBState:" + gateBState);
// Log.e(TAG, "parseGateState: isFirstStateUpdate:" + isFirstStateUpdate +
// " |lastGateAState:" + lastGateAState + " |lastGateBState:" + lastGateBState +
// " |currentGateAState:" + gateAState + " |currentGateBState:" + gateBState);
// 检查状态是否发生变化只有变化时才通知监听器 // 检查状态是否发生变化只有变化时才通知监听器
if (isFirstStateUpdate || gateAState != lastGateAState || gateBState != lastGateBState) { if (isFirstStateUpdate || gateAState != lastGateAState || gateBState != lastGateBState) {

32
app/src/main/java/com/ouxuan/oxface/orderOX/OrderSelectionActivity.java

@ -777,22 +777,22 @@ public class OrderSelectionActivity extends AppCompatActivity {
boolean isNetworkAvailable = isNetworkAvailable(); boolean isNetworkAvailable = isNetworkAvailable();
// 检查是否需要显示门禁不可用弹窗 // 检查是否需要显示门禁不可用弹窗
if (gateUnavailableDialog != null) {
boolean shouldShow = gateUnavailableDialog.checkShow(this, isNetworkAvailable);
if (shouldShow) {
LogManager.logWarning(TAG, "Fix 9 - 检测到需要弹出门禁不可用弹窗,立即关闭订单选择页面");
// 停止倒计时
stopCountdown();
// 设置结果为取消并关闭Activity
setResult(RESULT_CANCELED);
finish();
return true; // 表示已关闭Activity
}
}
// if (gateUnavailableDialog != null) {
// boolean shouldShow = gateUnavailableDialog.checkShow(this, isNetworkAvailable);
//
// if (shouldShow) {
// LogManager.logWarning(TAG, "Fix 9 - 检测到需要弹出门禁不可用弹窗,立即关闭订单选择页面");
//
// // 停止倒计时
// stopCountdown();
//
// // 设置结果为取消并关闭Activity
// setResult(RESULT_CANCELED);
// finish();
//
// return true; // 表示已关闭Activity
// }
// }
return false; // 门禁状态正常不需要关闭Activity return false; // 门禁状态正常不需要关闭Activity

Loading…
Cancel
Save