|
@@ -142,6 +142,7 @@ public class OrderCashierActivity extends BaseActivity implements CameraListener
|
|
|
|
|
|
private PopDialog payWayDialog;
|
|
|
private PopDialog payStatusDialog;
|
|
|
+ private PopDialog faceDialog;
|
|
|
private NfcAdapter nfcAdapter;
|
|
|
private PendingIntent pi;
|
|
|
public static final byte[] KEY =
|
|
@@ -546,16 +547,16 @@ public class OrderCashierActivity extends BaseActivity implements CameraListener
|
|
|
Logger.i("识别中");
|
|
|
// orderCshierViewModel.setFaceStatus(false);
|
|
|
List<FacePreviewInfo> facePreviewInfoList = orderCshierViewModel.onPreviewFrame(data, true);
|
|
|
-// if (facePreviewInfoList == null || facePreviewInfoList.size() == 0) {
|
|
|
-// Logger.i("没有人脸");
|
|
|
-// orderCshierViewModel.setFaceStatus(true);
|
|
|
-// } else {
|
|
|
-// Logger.i("有人脸");
|
|
|
-// }
|
|
|
+ if (facePreviewInfoList == null || facePreviewInfoList.size() == 0) {
|
|
|
+ Logger.i("没有人脸");
|
|
|
+ orderCshierViewModel.setFaceStatus(true);
|
|
|
+ } else {
|
|
|
+ Logger.i("有人脸");
|
|
|
+ if (rgbFaceRectTransformer != null) {
|
|
|
+ drawPreviewInfo(facePreviewInfoList);
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
-// if (facePreviewInfoList != null && rgbFaceRectTransformer != null) {
|
|
|
-//// drawPreviewInfo(facePreviewInfoList);
|
|
|
-//// }
|
|
|
}
|
|
|
|
|
|
@Override
|
|
@@ -969,7 +970,13 @@ public class OrderCashierActivity extends BaseActivity implements CameraListener
|
|
|
break;
|
|
|
case R.id.linear_face:
|
|
|
payWayDialog.dismissPop();
|
|
|
- showLoadingDialog(getResources().getString(R.string.order_paying));
|
|
|
+// showLoadingDialog(getResources().getString(R.string.order_paying));
|
|
|
+ try {
|
|
|
+ Thread.sleep(2000);
|
|
|
+ }catch (Exception e){
|
|
|
+ e.printStackTrace();
|
|
|
+ }
|
|
|
+ createFaceDialog();
|
|
|
orderCshierViewModel.setFaceStatus(true);
|
|
|
break;
|
|
|
case R.id.linear_card:
|
|
@@ -986,4 +993,25 @@ public class OrderCashierActivity extends BaseActivity implements CameraListener
|
|
|
super.disssLoading();
|
|
|
orderCshierViewModel.restoreDefault();
|
|
|
}
|
|
|
+
|
|
|
+ private void createFaceDialog() {
|
|
|
+ if (faceDialog == null) {
|
|
|
+ faceDialog = new PopDialog(DialogUtils.createFaceDialog(this));
|
|
|
+ faceDialog.setCancelEnable(true);
|
|
|
+ ViewGroup.LayoutParams layoutParams = faceDialog.getView(R.id.face_liner).getLayoutParams();
|
|
|
+ Logger.i(layoutParams.height + "=阿达" + layoutParams.width);
|
|
|
+ layoutParams.height = DisplayUtil.dip2px(this, DeviceHelper.getScreenHeight(this) / 2);
|
|
|
+ layoutParams.width = DisplayUtil.dip2px(this, DeviceHelper.getScreenWidth(this) / 2);
|
|
|
+ faceDialog.getView(R.id.face_liner).setLayoutParams(layoutParams);
|
|
|
+ }
|
|
|
+
|
|
|
+ faceDialog.setOnDismissListener(() -> {
|
|
|
+ orderCshierViewModel.restoreDefault();
|
|
|
+ if (faceDialog != null) {
|
|
|
+ faceDialog.dismissPop();
|
|
|
+ }
|
|
|
+ });
|
|
|
+ faceDialog.showPop();
|
|
|
+ }
|
|
|
+
|
|
|
}
|