weimingfei
2 天以前 ba92b976c7fb9f8bbe4a1bf9d06fa8468d26be58
指纹钥匙柜人脸报错
已添加1个文件
已修改3个文件
286 ■■■■■ 文件已修改
keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/event/FaceCheckResultEvent.java 19 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/face/FaceActivity.java 19 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/main/MainActivity.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
keyCabinet-android/datalibrary/src/main/java/com/example/datalibrary/manager/FaceSDKManager.java 244 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/event/FaceCheckResultEvent.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,19 @@
package com.doumee.keyCabinet.event;
import com.example.datalibrary.model.LivenessModel;
public class FaceCheckResultEvent {
    private LivenessModel livenessModel;
    public FaceCheckResultEvent(LivenessModel livenessModel) {
        this.livenessModel = livenessModel;
    }
    public LivenessModel getLivenessModel() {
        return livenessModel;
    }
    public void setLivenessModel(LivenessModel livenessModel) {
        this.livenessModel = livenessModel;
    }
}
keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/face/FaceActivity.java
@@ -31,6 +31,7 @@
import com.doumee.keyCabinet.dao.DaoManager;
import com.doumee.keyCabinet.dao.FingerPrintDo;
import com.doumee.keyCabinet.databinding.FaceActivityBinding;
import com.doumee.keyCabinet.event.FaceCheckResultEvent;
import com.doumee.keyCabinet.event.FaceStatusChangeEvent;
import com.doumee.keyCabinet.event.HttpEvent;
import com.doumee.keyCabinet.event.JiujinBeginEvent;
@@ -323,10 +324,12 @@
        switch (type){
            case 1:
                if(flag==0){
                    //切换到管理员刷卡
                    //Toast.makeText(mContext, "status:" + status, Toast.LENGTH_SHORT).show();
                    if(status==0||status==10){
                        //切换到管理员刷卡
                        statusFsm(1);
                    }else if(status==2||status==11){
                        //切换到司机刷卡
                        statusFsm(3);
                    }
                }else {
@@ -336,8 +339,12 @@
                break;
            case 9:
                //指纹验证
                if(flag==0){
                if(status==0) {
                    statusFsm(10);
                    }else {
                        statusFsm(11);
                    }
                }else {
                    statusFsm(12);
                }
@@ -370,6 +377,7 @@
            case 4:
                //切换到人脸
                if(flag==0){
                    //Toast.makeText(mContext, "status:" + status, Toast.LENGTH_SHORT).show();
                    if(status==1||status==10){
                        statusFsm(0);
                    }else if(status==3||status==11){
@@ -562,7 +570,7 @@
                        if(handler.hasMessages(1)){
                            handler.removeMessages(1);
                        }
                        checkOpenDebugResult(livenessModel);
                        EventBus.getDefault().post(new FaceCheckResultEvent(livenessModel));
                    }
                });
            }catch (RuntimeException e){
@@ -721,6 +729,13 @@
        }
    }
    @Subscribe(threadMode = ThreadMode.MAIN)
    public void FaceCheckResultEvent(FaceCheckResultEvent e){
        if(!isFinishing()){
            checkOpenDebugResult(e.getLivenessModel());
        }
    }
    private int resultCount = 0;
    // ***************开发模式结果输出*************
    private void checkOpenDebugResult(final LivenessModel livenessModel) {
keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/main/MainActivity.java
@@ -1352,7 +1352,7 @@
        @Override
        public void onResultBytes(byte[] bytes) {
            if(isFinishing()){
            if(isFinishing()||getVM()==null){
                return;
            }
            if(bytes.length==0){
@@ -1645,7 +1645,7 @@
        @Override
        public void onResultBytes(byte[] bytes) {
            if(isFinishing()){
            if(isFinishing()||getVM()==null){
                return;
            }
            if(bytes.length==0){
keyCabinet-android/datalibrary/src/main/java/com/example/datalibrary/manager/FaceSDKManager.java
@@ -55,6 +55,7 @@
    private int mLastFaceId;
    private float threholdScore;
    private String groupId;
    public static volatile int initStatus = SDK_UNACTIVATION;
    public static volatile boolean initModelSuccess = false;
@@ -87,6 +88,14 @@
        faceAuth.setCoreConfigure(BDFaceSDKCommon.BDFaceCoreRunMode.BDFACE_LITE_POWER_NO_BIND, 2);
    }
    public String getGroupId() {
        return groupId;
    }
    public void setGroupId(String groupId) {
        this.groupId = groupId;
    }
    public void setActiveLog(boolean isLog) {
        if (faceAuth != null) {
            if (isLog) {
@@ -96,7 +105,11 @@
            }
        }
    }
    public void destroy(){
        /*if(rgbInstance!=null){
            rgbInstance = null;
        }*/
    }
    public void setCheckMouthMask(boolean checkMouthMask) {
        this.checkMouthMask = checkMouthMask;
    }
@@ -144,12 +157,6 @@
        startInitModelTime = System.currentTimeMillis();
    }
    public void destroy(){
        if(rgbInstance!=null){
            rgbInstance = null;
        }
    }
    public FaceCrop getFaceCrop() {
        return faceModel.getFaceCrop();
    }
@@ -168,7 +175,7 @@
    public void initDataBases(Context context) {
        if (FaceApi.getInstance().getmUserNum() != 0) {
            //ToastUtils.toast(context, "人脸库加载中");
            ToastUtils.toast(context, "人脸库加载中");
        }
        emptyFrame();
        // åˆå§‹åŒ–数据库
@@ -199,7 +206,7 @@
                                faceModel.getFaceSearch().pushPersonById(user.getId(), user.getFeature());
                            }
                            if (FaceApi.getInstance().getmUserNum() != 0) {
                                //ToastUtils.toast(context, "人脸库加载成功");
                                        ToastUtils.toast(context, "人脸库加载成功");
                            }
                        }
                    }
@@ -265,7 +272,7 @@
        // åˆ¤æ–­æš—光恢复
        if (darkEnhance) {
            rgbInstanceOne = faceModel.getDark().faceDarkEnhance(rgbInstance);
            rgbInstance.destory();
        } else {
            rgbInstanceOne = rgbInstance;
        }
@@ -307,17 +314,6 @@
        return cropInstance;
    }
    private static BDFaceImageInstance rgbInstance =null;
    private LivenessModel livenessModel;
    private String groupId;
    /**
     * 0:管理员,1:用户
     * @param groupId
     */
    public void setGroupId(String groupId){
        this.groupId = groupId;
    }
    /**
     * æ£€æµ‹-活体-特征-人脸检索流程
     *
@@ -338,14 +334,10 @@
        }
        long startTime = System.currentTimeMillis();
        // åˆ›å»ºæ£€æµ‹ç»“果存储数据
        livenessModel = new LivenessModel();
        LivenessModel livenessModel = new LivenessModel();
        // åˆ›å»ºæ£€æµ‹å¯¹è±¡ï¼Œå¦‚果原始数据YUV,转为算法检测的图片BGR
        // TODO: ç”¨æˆ·è°ƒæ•´æ—‹è½¬è§’度和是否镜像,手机和开发版需要动态适配
        //System.out.println("==rgbInstance==>初始化");
        if(rgbInstance!=null){
            rgbInstance.destory();
        }
        rgbInstance = getBdImage(bdFaceImageConfig, bdFaceCheckConfig.darkEnhance);
        BDFaceImageInstance rgbInstance = getBdImage(bdFaceImageConfig, bdFaceCheckConfig.darkEnhance);
        livenessModel.setTestBDFaceImageInstanceDuration(System.currentTimeMillis() - startTime);
        onTrack(
            rgbInstance,
@@ -357,10 +349,10 @@
                    if (!frameSelect(faceInfos[0])) {
                        livenessModel.setBdFaceImageInstance(rgbInstance.getImage());
                        if (faceDetectCallBack != null && faceAdoptModel != null) {
                            //System.out.println("==isOk==>多帧判断");
                            faceDetectCallBack.onFaceDetectDarwCallback(livenessModel);
                            faceDetectCallBack.onFaceDetectCallback(faceAdoptModel);
                        }
                            rgbInstance.destory();
                        return;
                    }
@@ -408,11 +400,12 @@
                    if (faceDetectCallBack != null) {
                        faceDetectCallBack.onFaceDetectCallback(null);
                        livenessModel.setBdFaceImageInstance(rgbInstance.getImage());
                        //System.out.println("==isOk==>流程结束");
//                        SaveImageManager.getInstance().saveImage(livenessModel, bdFaceCheckConfig.bdLiveConfig);
                        faceDetectCallBack.onFaceDetectDarwCallback(livenessModel);
                        faceDetectCallBack.onTip(0, "未检测到人脸");
                    }
                        rgbInstance.destory();
                }
            });
    }
@@ -514,7 +507,7 @@
        livenessModel.setAccurateTime(System.currentTimeMillis() - accurateTime);
        if (faceInfos == null || faceInfos.length <= 0) {
            rgbInstance.destory();
            detectListener.onDetectFail();
            return;
        }
@@ -551,11 +544,10 @@
        final long startTime,
        final FaceDetectCallBack faceDetectCallBack,
        final FaceInfo[] fastFaceInfos) {
        if (future2 != null && !future2.isDone()) {
            // æµç¨‹ç»“束销毁图片,开始下一帧图片检测,否着内存泄露
            //future2.cancel(true);
            //System.out.println("==isOk==>之前没结束");
            rgbInstance.destory();
            return;
        }
@@ -565,9 +557,10 @@
                    @Override
                    public void run() {
                        try {
                            // èŽ·å–BDFaceCheckConfig配置信息
                            if (bdFaceCheckConfig == null) {
                                    rgbInstance.destory();
                                return;
                            }
@@ -581,8 +574,6 @@
                                        @Override
                                        public void onDetectSuccess(FaceInfo[] faceInfos, BDFaceImageInstance rgbInstance) {
                                            try {
                                                // äººè„¸id赋值
                                                if (mLastFaceId != fastFaceInfos[0].faceID) {
                                                    mLastFaceId = fastFaceInfos[0].faceID;
@@ -591,7 +582,7 @@
                                                }
                                                if (bdFaceCheckConfig == null) {
                                                    rgbInstance.destory();
                                                    livenessModel.clearIdentifyResults();
                                                    if (faceDetectCallBack != null) {
                                                        faceDetectCallBack.onFaceDetectCallback(livenessModel);
@@ -603,7 +594,7 @@
                                                if (!onBestImageCheck(livenessModel, bdFaceCheckConfig, faceDetectCallBack)) {
                                                    livenessModel.setQualityCheck(true);
                                                    livenessModel.clearIdentifyResults();
                                                    rgbInstance.destory();
                                                    if (faceDetectCallBack != null) {
                                                        faceDetectCallBack.onFaceDetectCallback(livenessModel);
                                                    }
@@ -616,10 +607,11 @@
                                                        faceInfos, bdFaceCheckConfig.bdQualityConfig, faceDetectCallBack)) {
                                                    livenessModel.setQualityCheck(true);
                                                    livenessModel.clearIdentifyResults();
                                                    rgbInstance.destory();
                                                    if (faceDetectCallBack != null) {
                                                        faceDetectCallBack.onFaceDetectCallback(livenessModel);
                                                    }
                                                    return;
                                                }
@@ -818,7 +810,8 @@
                                                                            bdFaceCheckConfig.activeModel,
                                                                            rgbScores,
                                                                            bdLiveConfig.rgbLiveScore);
                                                                } else {
                                                                }
                                                                else{
                                                                    onFeatureChecks(
                                                                            i,
                                                                            rgbInstance,
@@ -843,18 +836,13 @@
                                                livenessModel.setAllDetectDuration(System.currentTimeMillis() - startTime);
                                                //                LogUtils.e(TIME_TAG, "all process time = " + livenessModel.getAllDetectDuration());
                                                // æµç¨‹ç»“束销毁图片,开始下一帧图片检测,否着内存泄露
                                                rgbInstance.destory();
                                                if (nirInstance != null) {
                                                    nirInstance.destory();
                                                }
                                                // æ˜¾ç¤ºæœ€ç»ˆç»“果提示
                                                if (faceDetectCallBack != null) {
                                                    faceDetectCallBack.onFaceDetectCallback(livenessModel);
                                                }
                                            }catch (RuntimeException e){
                                                faceDetectCallBack.onTip(1,e.getMessage());
                                            }catch (Exception e){
                                                faceDetectCallBack.onTip(1,e.getMessage());
                                            }
                                        }
@@ -866,11 +854,6 @@
                                            }
                                        }
                                    });
                        }catch (RuntimeException e){
                            faceDetectCallBack.onTip(1,e.getMessage());
                        }catch (Exception e){
                            faceDetectCallBack.onTip(1,e.getMessage());
                        }
                    }
                });
    }
@@ -902,6 +885,82 @@
     * ç‰¹å¾æå–-人脸识别比对
     *
     * @param rgbInstance      å¯è§å…‰åº•层送检对象
     * @param landmark         æ£€æµ‹çœ¼ç›ï¼Œå˜´å·´ï¼Œé¼»å­ï¼Œ72个关键点
     * @param faceInfos        nir人脸数据
     * @param nirInstance      nir å›¾åƒå¥æŸ„
     * @param livenessModel    æ£€æµ‹ç»“果数据集合
     * @param featureCheckMode ç‰¹å¾æŠ½å–模式【不提取特征:1】;【提取特征:2】;【提取特征+1:N检索:3】;
     * @param featureType      ç‰¹å¾æŠ½å–模态执行 ã€ç”Ÿæ´»ç…§ï¼š1】;【证件照:2】;【混合模态:3】;
     */
    private void onFeatureCheck(
            BDFaceImageInstance rgbInstance,
            BDFaceCheckConfig bdFaceCheckConfig,
            float[] landmark,
            FaceInfo[] faceInfos,
            BDFaceImageInstance nirInstance,
            LivenessModel livenessModel,
            byte[] secondFeature,
            final int featureCheckMode,
            final int featureType) {
        // å¦‚果不抽取特征,直接返回
        if (featureCheckMode == 1) {
            return;
        }
        byte[] feature = new byte[512];
        if (featureType == 3) {
            // todo: æ··åˆæ¨¡æ€ä½¿ç”¨æ–¹å¼æ˜¯æ ¹æ®å›¾ç‰‡çš„æ›å…‰æ¥é€‰æ‹©éœ€è¦ä½¿ç”¨çš„type,光照的取值范围为:0~1之间
            AtomicInteger atomicInteger = new AtomicInteger();
            FaceSDKManager.getInstance().getImageIllum().imageIllum(rgbInstance, atomicInteger);
            int illumScore = atomicInteger.get();
            BDQualityConfig bdQualityConfig = bdFaceCheckConfig.bdQualityConfig;
            boolean isIllum = bdQualityConfig != null ? illumScore < bdQualityConfig.illum : false;
            BDFaceSDKCommon.FeatureType type =
                    isIllum
                            ? BDFaceSDKCommon.FeatureType.BDFACE_FEATURE_TYPE_NIR
                            : BDFaceSDKCommon.FeatureType.BDFACE_FEATURE_TYPE_LIVE_PHOTO;
            BDFaceImageInstance bdFaceImageInstance = isIllum ? nirInstance : rgbInstance;
            float[] landmarks = isIllum ? faceInfos[0].landmarks : landmark;
            long startFeatureTime = System.currentTimeMillis();
            float featureSize = faceModel.getFaceFeature().feature(type, bdFaceImageInstance, landmarks, feature);
            livenessModel.setFeatureDuration(System.currentTimeMillis() - startFeatureTime);
            livenessModel.setFeature(feature);
            // äººè„¸æ£€ç´¢
            featureSearch(
                    featureCheckMode,
                    livenessModel,
                    bdFaceCheckConfig,
                    feature,
                    secondFeature,
                    featureSize,
                    BDFaceSDKCommon.FeatureType.BDFACE_FEATURE_TYPE_LIVE_PHOTO);
        } else {
            // ç”Ÿæ´»ç…§æ£€ç´¢
            long startFeatureTime = System.currentTimeMillis();
            float featureSize =
                    faceModel
                            .getFaceFeature()
                            .feature(
                                    BDFaceSDKCommon.FeatureType.BDFACE_FEATURE_TYPE_LIVE_PHOTO, rgbInstance, landmark, feature);
            livenessModel.setFeatureDuration(System.currentTimeMillis() - startFeatureTime);
            livenessModel.setFeature(feature);
            livenessModel.setFeatureDuration(System.currentTimeMillis() - startFeatureTime);
            // äººè„¸æ£€ç´¢
            featureSearch(
                    featureCheckMode,
                    livenessModel,
                    bdFaceCheckConfig,
                    feature,
                    secondFeature,
                    featureSize,
                    BDFaceSDKCommon.FeatureType.BDFACE_FEATURE_TYPE_LIVE_PHOTO);
        }
    }
    /**
     * ç‰¹å¾æå–-人脸识别比对
     *
     * @param rgbInstance      å¯è§å…‰åº•层送检对象
     * @param rgbFaceInfos     rgb人脸数据
     * @param faceInfos        nir人脸数据
     * @param nirInstance      nir å›¾åƒå¥æŸ„
@@ -927,6 +986,7 @@
        // å¦‚果不抽取特征,直接返回
        if (featureCheckMode == 1) {
            return;
        }
        byte[] feature = new byte[512];
@@ -981,6 +1041,7 @@
            // ç”Ÿæ´»ç…§æ£€ç´¢
            long startFeatureTime = System.currentTimeMillis();
            if (rgbFaceInfos == null) {
                return;
            }
@@ -1010,6 +1071,7 @@
            livenessModel.setFeature(feature);
            livenessModel.setFeatureDuration(System.currentTimeMillis() - startFeatureTime);
            // äººè„¸æ£€ç´¢
            featureSearchs(
                index,
                featureCheckMode,
@@ -1135,40 +1197,46 @@
            livenessModel.setFeatureCode(featureSize);
            return;
        }
        // å¦‚果提取特征+检索,调用search æ–¹æ³•
        if (featureSize == FEATURE_SIZE / 4) {
            long startFeature = System.currentTimeMillis();
            // ç‰¹å¾æå–成功
            // TODO é˜ˆå€¼å¯ä»¥æ ¹æ®ä¸åŒæ¨¡åž‹è°ƒæ•´
            if (featureCheckMode == 3) {
                //System.out.println("==isOk==>44");
                List<? extends Feature> featureResult =
                    faceModel.getFaceSearch().search(type, bdFaceCheckConfig.scoreThreshold, 5, feature, false);
                //System.out.println("==isOk==>45");
                        faceModel.getFaceSearch().search(type, bdFaceCheckConfig.scoreThreshold, 2, feature, false);
                // TODO è¿”回top num = 1 ä¸ªæ•°æ®é›†åˆï¼Œæ­¤å¤„可以任意设置,会返回比对从大到小排序的num ä¸ªæ•°æ®é›†åˆ
                if (featureResult != null && featureResult.size() > 0) {
                    //System.out.println("==isOk==>匹配到数量"+featureResult.size());
                    User user = null;
                    Feature topFeature = null;
                    if(TextUtils.isEmpty(groupId)){
                        //为空,需要排序,优先取会员
                        for(Feature feat:featureResult) {
                        // èŽ·å–ç¬¬ä¸€ä¸ªæ•°æ®
                        Feature topFeature = featureResult.get(0);
                        // åˆ¤æ–­ç¬¬ä¸€ä¸ªé˜ˆå€¼æ˜¯å¦å¤§äºŽè®¾å®šé˜ˆå€¼ï¼Œå¦‚果大于,检索成功
                            threholdScore = bdFaceCheckConfig.scoreThreshold;
                            if (feat != null && feat.getScore() > threholdScore) {
                                User userOld = FaceApi.getInstance().getUserListById(feat.getId());
                                //System.out.println("==isOk==>匹配到类型:"+userOld.getUserName());
                                if("1".equals(userOld.getGroupId())){
                                    user = userOld;
                                    topFeature = feat;
                                    break;
                                }else if(user==null){
                                    user = userOld;
                                    topFeature = feat;
                        if (topFeature != null && topFeature.getScore() > threholdScore) {
                            // å½“前featureEntity åªæœ‰id+feature ç´¢å¼•,在数据库中查到完整信息
                            User user = FaceApi.getInstance().getUserListById(topFeature.getId());
                            if (user != null) {
                                IdentifyResult idResult = new IdentifyResult(user, index, topFeature.getScore());
                                // Log.d("Attend", "add user:" + user.getUserInfo() + " index:" + index);
                                livenessModel.addIdentifyResult(idResult);
                                livenessModel.setUser(user);
                                livenessModel.setFeatureScore(topFeature.getScore());
                                setFail(livenessModel);
                            } else {
                                setFail(livenessModel);
                                }
                            }
                        } else {
                            setFail(livenessModel);
                        }
                    }else {
                        //只取该类型用户
                        User user = null;
                        Feature topFeature = null;
                        for(Feature feat:featureResult) {
                            // èŽ·å–æ•°æ®
                            // åˆ¤æ–­é˜ˆå€¼æ˜¯å¦å¤§äºŽè®¾å®šé˜ˆå€¼ï¼Œå¦‚果大于,检索成功
@@ -1184,8 +1252,7 @@
                                }
                            }
                        }
                    }
                    if (user != null) {
                        if (user != null&&topFeature!=null) {
                        //System.out.println("==isOk==>匹配到");
                        IdentifyResult idResult = new IdentifyResult(user, index, topFeature.getScore());
                        livenessModel.addIdentifyResult(idResult);
@@ -1193,8 +1260,8 @@
                        livenessModel.setFeatureScore(topFeature.getScore());
                        setFail(livenessModel);
                    } else {
                        //IdentifyResult idResult = new IdentifyResult(user, index, topFeature.getScore());
                        setFail(livenessModel);
                        }
                    }
                } else {
                    setFail(livenessModel);
@@ -1283,7 +1350,7 @@
                        faceDetectCallBack.onFaceDetectDarwCallback(livenessModel);
                        faceDetectCallBack.onTip(0, "未检测到人脸");
                    }
                        rgbInstance.destory();
                }
            });
    }
@@ -1310,7 +1377,7 @@
        if (future2 != null && !future2.isDone()) {
            // æµç¨‹ç»“束销毁图片,开始下一帧图片检测,否着内存泄露
            rgbInstance.destory();
            return;
        }
@@ -1320,7 +1387,6 @@
                    @Override
                    public void run() {
                        try {
                            onDetect(
                                    bdFaceCheckConfig,
                                    rgbInstance,
@@ -1329,7 +1395,6 @@
                                    new DetectListener() {
                                        @Override
                                        public void onDetectSuccess(FaceInfo[] faceInfos, BDFaceImageInstance rgbInstance) {
                                            try {
                                                // äººè„¸id赋值
                                                if (mLastFaceId != fastFaceInfos[0].faceID) {
                                                    mLastFaceId = fastFaceInfos[0].faceID;
@@ -1337,7 +1402,7 @@
                                                    mNirLiveList.clear();
                                                }
                                                if (bdFaceCheckConfig == null) {
                                                    rgbInstance.destory();
                                                    if (faceDetectCallBack != null) {
                                                        faceDetectCallBack.onFaceDetectCallback(livenessModel);
                                                    }
@@ -1346,7 +1411,7 @@
                                                // æœ€ä¼˜äººè„¸æŽ§åˆ¶
                                                if (!onBestImageCheck(livenessModel, bdFaceCheckConfig, faceDetectCallBack)) {
                                                    livenessModel.setQualityCheck(true);
                                                    rgbInstance.destory();
                                                    if (faceDetectCallBack != null) {
                                                        faceDetectCallBack.onFaceDetectCallback(livenessModel);
                                                    }
@@ -1471,7 +1536,7 @@
                                                                        System.currentTimeMillis() - startTime);
                                                                //                LogUtils.e(TIME_TAG, "all process time = " + livenessModel.getAllDetectDuration());
                                                                // æµç¨‹ç»“束销毁图片,开始下一帧图片检测,否着内存泄露
                                                                rgbInstance.destory();
                                                                // æ˜¾ç¤ºæœ€ç»ˆç»“果提示
                                                                if (faceDetectCallBack != null) {
                                                                    faceDetectCallBack.onFaceDetectCallback(livenessModel);
@@ -1483,17 +1548,12 @@
                                                                livenessModel.setQualityOcclusion(occlusionFail);
                                                                livenessModel.setQualityDetect(detectFail);
                                                                livenessModel.setQualityCheck(true);
                                                                rgbInstance.destory();
                                                                if (faceDetectCallBack != null) {
                                                                    faceDetectCallBack.onFaceDetectCallback(livenessModel);
                                                                }
                                                            }
                                                        });
                                            }catch (RuntimeException e){
                                                faceDetectCallBack.onTip(1,e.getMessage());
                                            }catch (Exception e){
                                                faceDetectCallBack.onTip(1,e.getMessage());
                                            }
                                        }
                                        @Override
@@ -1504,11 +1564,6 @@
                                            }
                                        }
                                    });
                        }catch (RuntimeException e){
                            faceDetectCallBack.onTip(1,e.getMessage());
                        }catch (Exception e){
                            faceDetectCallBack.onTip(1,e.getMessage());
                        }
                    }
                });
    }
@@ -1899,9 +1954,6 @@
    // äººè¯æ ¸éªŒç‰¹å¾æå–
    public float personDetect(
        final Bitmap bitmap, final byte[] feature, final BDFaceCheckConfig bdFaceCheckConfig, Context context) {
        if(bitmap==null||bitmap.isRecycled()){
            return -1;
        }
        BDFaceImageInstance rgbInstance = new BDFaceImageInstance(bitmap);
        float ret = -1;
        FaceInfo[] faceInfos;
@@ -1933,10 +1985,10 @@
                            feature);
            }
        } else {
            rgbInstance.destory();
            return -1;
        }
        rgbInstance.destory();
        return ret;
    }
}