指纹钥匙柜

weimingfei

6 小时以前 338e7ed513d21d1468c0908fdca2ea4097ee0621

 keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/main/MainActivity.java

@@ -351,6 +351,9 @@
                    if(devConfigBean.getBannerList()!=null) {
                        setBanner(devConfigBean.getBannerList());
                    }
                    if(!isFaceOk) {
                        initLicense();
                    }
                    setJiuConfig();
                    initPort();
                    EventBus.getDefault().post(new GetFacesEvent());
@@ -411,6 +414,10 @@
        switch (type){
            case 2:
            case 3: {
                if(!isFaceOk) {
                    initLicense();
                    return;
                }
                //校验是否登录
                if(MApplication.getConfigBean().getId()==null){
                    Toast.makeText(mContext, "设备未添加，无法操作", Toast.LENGTH_SHORT).show();
@@ -494,9 +501,6 @@
        MCUtils.hind(mcSystemUi);
        mcHome.setHomePackage("com.doumee.keyCabinet");
        showTime = System.currentTimeMillis();
        if(!isFaceOk) {
            initLicense();
        }
        if(isHavePermission) {
            checkUpdate();
        }
@@ -712,11 +716,14 @@
    }

    private void initModel(List<FaceUserBean> userBeans) {
        if(!isFaceOk){
            return;
        }
        if (com.example.datalibrary.manager.FaceSDKManager.initStatus == com.example.datalibrary.manager.FaceSDKManager.SDK_MODEL_LOAD_SUCCESS) {
            getVM().addInfo("更新人脸===》开始更新");
            //getVM().addInfo("更新人脸===》开始更新");
            waitUpdate(userBeans);
        }else {
            getVM().addInfo("更新人脸===》初始化");
            //getVM().addInfo("更新人脸===》初始化");
            initFaceSDKManager(userBeans);
        }
    }
@@ -1828,19 +1835,18 @@
            /*SpUtil.setString("port_grid","/dev/ttyS0");
            SpUtil.setString("port_key","/dev/ttyS4");
            SpUtil.setString("port_jiu","/dev/ttyS9");*/

            gridPath = SpUtil.getString("port_grid");
            getVM().addInfo("门串口链接："+gridPath);
            keyPath = SpUtil.getString("port_key");
            getVM().addInfo("钥匙串口链接："+keyPath);
            jiuPath = SpUtil.getString("port_jiu");
            getVM().addInfo("酒精串口链接："+jiuPath);
            if(!TextUtils.isEmpty(SpUtil.getString("port_grid"))&&
                    !TextUtils.isEmpty(SpUtil.getString("port_key"))&&
                    !TextUtils.isEmpty(SpUtil.getString("port_jiu"))){
                if(isInitPort){
                    return;
                }
                gridPath = SpUtil.getString("port_grid");
                getVM().addInfo("门串口链接："+gridPath);
                keyPath = SpUtil.getString("port_key");
                getVM().addInfo("钥匙串口链接："+keyPath);
                jiuPath = SpUtil.getString("port_jiu");
                getVM().addInfo("酒精串口链接："+jiuPath);
                xhCount=0;
                closePort(chosePort);
                if(!TextUtils.isEmpty(SpUtil.getString("port_grid"))){