钥匙柜关门修改前

weimingfei

2026-05-21 025f806542921dcaa6719453f208e8a9dda8d450

钥匙柜关门修改前

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

@@ -113,14 +113,17 @@
                getDB().accreditOffBtn.setBackgroundResource(R.mipmap.btn_less_normal);
            }
        }else {
            //删除激活文件
            FileUtils.deleteFile(filePath);
            getDB().btnDown.setText("待后台上传激活文件");
            getDB().btnDown.setClickable(false);
            getDB().btnDown.setBackgroundResource(R.mipmap.btn_less_normal);

            getDB().accreditOffBtn.setClickable(false);
            getDB().accreditOffBtn.setBackgroundResource(R.mipmap.btn_less_normal);
            if(FileUtil.FileIsExist(filePath)) {
                getDB().accreditOffBtn.setClickable(true);
                getDB().accreditOffBtn.setBackgroundResource(R.mipmap.btn_main_normal);
            }else {
                getDB().accreditOffBtn.setClickable(false);
                getDB().accreditOffBtn.setBackgroundResource(R.mipmap.btn_less_normal);
            }
        }
    }

@@ -133,6 +136,8 @@
                    ToastView.show(MApplication.mContext,"下载中...");
                    return;
                }
                //删除激活文件
                FileUtils.deleteFile(filePath);
                if(!TextUtils.isEmpty(MApplication.getConfigBean().getActivateFileUrl())){
                    isDownLoad = true;
                    startDownload(MApplication.getConfigBean().getActivateFileUrl());

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

@@ -367,7 +367,7 @@
            }
            //获取卡号
            EventBus.getDefault().post(new GetKeyStatusEvent());
            keyTime = new Date().getTime()+300;
            keyTime = new Date().getTime()+500;
            if(handler.hasMessages(0)){
                handler.removeMessages(0);
            }

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

@@ -570,7 +570,7 @@
            }
            //发送查询钥匙号
            EventBus.getDefault().post(new GetKeyStatusEvent());
            keyTime = new Date().getTime()+300;
            keyTime = new Date().getTime()+500;
            if(handler.hasMessages(0)){
                handler.removeMessages(0);
            }

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

@@ -339,6 +339,9 @@
                    if(devConfigBean.getBannerList()!=null) {
                        setBanner(devConfigBean.getBannerList());
                    }
                    if(!isFaceOk) {
                        initLicense();
                    }
                    setJiuConfig();
                    initPort();
                }
@@ -398,6 +401,10 @@
        switch (type){
            case 2:
            case 3: {
                if(!isFaceOk) {
                    initLicense();
                    return;
                }
                //校验是否登录
                if(MApplication.getConfigBean().getId()==null){
                    Toast.makeText(mContext, "设备未添加，无法操作", Toast.LENGTH_SHORT).show();
@@ -482,9 +489,6 @@
        mAPI.setNavigationBarVisibility(YNHAPI.NavigationBarVisibility.ALWAYS_INVISIBLE);
        mAPI.setBootLaunchApk("com.doumee.keyCabinet", true);
        showTime = System.currentTimeMillis();
        if(!isFaceOk) {
            initLicense();
        }
        if(isHavePermission) {
            checkUpdate();
        }
@@ -1294,9 +1298,6 @@
            if(bytes.length==0){
                return;
            }
            runOnUiThread(() -> {
                getVM().addInfo("获取到门数据:"+StringUtil.DateToStrSS(new Date())+"==>"+ SportUtils.bytesToHexSimple(bytes));
            });
            EventBus.getDefault().post(new CLGridEvent(SportUtils.bytesToHexSimple(bytes)));
        }
    };
@@ -1314,6 +1315,7 @@
            String data = e.getData();
            data = data.toUpperCase();
            data = data.replaceAll("\\s+", "");
            String finalData = data;
            if(data.startsWith("8A")){
                //开锁反馈
                String bh = data.substring(2,4);
@@ -1374,6 +1376,9 @@
                    }
                }
            }else if(data.startsWith("81")){
                runOnUiThread(() -> {
                    getVM().addInfo(">>>>>>>>>>>>>>>获取到关门数据:"+StringUtil.DateToStrSS(new Date())+"==>"+ finalData);
                });
                //主动关门 81 01 01 11 90
                String bh = data.substring(2,4);
                String tdh = data.substring(4,6);
@@ -1394,6 +1399,9 @@
                }
            }else if(data.startsWith("80")){
                //查询所有门状态
                runOnUiThread(() -> {
                    getVM().addInfo("<<<<<<<<<<<<<<<<<<<<获取到所有门状态数据:"+StringUtil.DateToStrSS(new Date())+"==>"+ finalData);
                });
                //80 01 00 00 FF FF 33 B2
                //80 02 00 00 00 F7 33 46
                if(data.length()>=14){
@@ -1767,9 +1775,9 @@
    private boolean isInitPort;
    //初始化串口
    private void initPort(){
        //SpUtil.setString("port_grid","/dev/ttyS7");
        //SpUtil.setString("port_key","/dev/ttyS1");
        //SpUtil.setString("port_jiu","/dev/ttyS2");
        SpUtil.setString("port_grid","/dev/ttyS7");
        SpUtil.setString("port_key","/dev/ttyS1");
        SpUtil.setString("port_jiu","/dev/ttyS2");
        gridPath = SpUtil.getString("port_grid");
        getVM().addInfo("门串口链接："+gridPath);
        keyPath = SpUtil.getString("port_key");