指纹钥匙柜bug修改

weimingfei

13 小时以前 a3644d716dedc5a6d164d5eeef4ffcf6f988e509

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

@@ -147,10 +147,12 @@
    }

    private boolean isOpening = false;
    private int doAction;
    @Override
    protected void doRegister(int type, ActionEventData data) {
        stopCountTimer();
        downTime = 30;
        doAction = type;
        switch (type){
            case 1:
                if(selectBean==null){
@@ -366,7 +368,7 @@
            //获取卡号
            EventBus.getDefault().post(new HttpEvent("xxxxxxxxxx==>关门，获取钥匙信息"));
            EventBus.getDefault().post(new GetKeyStatusEvent());
            keyTime = new Date().getTime()+500;
            keyTime = new Date().getTime()+100;
            if(handler.hasMessages(0)){
                handler.removeMessages(0);
            }
@@ -391,6 +393,9 @@
    public void KeyResultEvent(KeyResultEvent e){
        if(!isFinishing()){
            if(selectBean!=null){
                if(doAction==5||doAction==6||doAction==8||doAction==9){
                    return;
                }
                //校验时间
                if(keyTime==null){
                    EventBus.getDefault().post(new HttpEvent("xxxxxxxxxx==>钥匙信息1"));
@@ -404,6 +409,8 @@
                if(handler.hasMessages(0)){
                    handler.removeMessages(0);
                }
                EventBus.getDefault().post(new HttpEvent("xxxxxxxxxx==>钥匙信息,版号："+
                        e.getType())+",bar:"+selectBean.getBoardCode()+",flag="+flag);
                if("1".equals(e.getType())){
                    //1号板
                    if(!"1".equals(selectBean.getBoardCode())){
@@ -422,14 +429,17 @@
                if(flag==0) {
                    //领取
                    //查询钥匙号
                    EventBus.getDefault().post(new HttpEvent("xxxxxxxxxx==>钥匙信息返回"));
                    CabinetGridDo gridDo = DaoManager.getCabinetGridDao().getGridByKey(key);
                    if (gridDo != null) {
                        if (gridDo.getIsOpen() == 0) {
                            //ToastView.show(MApplication.mContext,"当前："+gridDo.getCurKeyCode()+"，绑定："+gridDo.getKeyCode());
                            //关门成功
                            if (!TextUtils.isEmpty(gridDo.getCurKeyCode())) {
                                if (gridDo.getCurKeyCode().equals(selectBean.getKeyCode())) {
                                    //领取失败
                                    isOpened = false;
                                    EventBus.getDefault().post(new HttpEvent("xxxxxxxxxx==>当前钥匙："+gridDo.getCurKeyCode()));
                                    getVM().doAction(6);
                                    getVM().closeGrid(gridDo);
                                }else {