productDev/dmvisit.git

			@@ -23,6 +23,7 @@
			import com.doumee.keyCabinet.dao.DaoManager;
			import com.doumee.keyCabinet.databinding.KeyCabinetActivityBinding;
			import com.doumee.keyCabinet.event.CloseGridOneResultEvent;
			import com.doumee.keyCabinet.event.HttpEvent;
			import com.doumee.keyCabinet.event.KeyResultEvent;
			import com.doumee.keyCabinet.event.GetKeyStatusEvent;
			import com.doumee.keyCabinet.event.OpenErrEvent;
			@@ -363,92 +364,13 @@
			handler.removeMessages(1);
			}
			//获取卡号
			EventBus.getDefault().post(new HttpEvent("xxxxxxxxxx==>关门，获取钥匙信息"));
			EventBus.getDefault().post(new GetKeyStatusEvent());
			keyTime = new Date().getTime()+500;
			if(handler.hasMessages(0)){
			handler.removeMessages(0);
			}
			handler.sendEmptyMessageDelayed(0,1200);
			/*if(selectBean!=null){
			String key = SportUtils.intToHex(Integer.parseInt(selectBean.getBoardCode()))
			+SportUtils.intToHex(Integer.parseInt(selectBean.getChannelCode()));
			if(key.equals(e.getKey())) {
			stopCountTimer();
			if(flag==0) {
			//领取
			if (e.getIsOpen() == 0) {
			//关门成功
			//查询钥匙号
			CabinetGridDo gridDo = DaoManager.getCabinetGridDao().getGridByKey(key);
			if (gridDo != null) {
			if(gridDo.getUpdateTime().compareTo(openTime)<0){
			//开门前数据，不能使用
			EventBus.getDefault().post(new GetKeyStatusEvent());
			return;
			}
			//Toast.makeText(mContext, "1:"+gridDo.getKeyCode()+"，2:"+selectBean.getKeyCode(), Toast.LENGTH_LONG).show();
			if (!TextUtils.isEmpty(gridDo.getCurKeyCode())) {
			if (gridDo.getCurKeyCode().equals(selectBean.getKeyCode())) {
			//领取失败
			isOpened = false;
			getVM().doAction(6);
			getVM().closeGrid(gridDo);
			}else {
			//钥匙不匹配
			getVM().doAction(10,null);
			EventBus.getDefault().post(new OpenGridEvent(selectBean.getChannelCode(), selectBean.getBoardCode()));
			}
			} else {
			//钥匙拿走了
			isOpened = false;
			getVM().doAction(5);
			getVM().closeGrid(gridDo);
			}
			}else {
			ToastView.show(MApplication.mContext, "未查询到规格信息");
			}
			} else {
			//关门失败
			}
			}else {
			//归还
			if (e.getIsOpen() == 0) {
			//关门成功
			//查询钥匙号
			CabinetGridDo gridDo = DaoManager.getCabinetGridDao().getGridByKey(key);
			if (gridDo != null) {
			if(gridDo.getUpdateTime().compareTo(openTime)<0){
			//开门前数据，不能使用
			EventBus.getDefault().post(new GetKeyStatusEvent());
			return;
			}
			//Toast.makeText(mContext, "1:"+gridDo.getKeyCode()+"，2:"+selectBean.getKeyCode(), Toast.LENGTH_LONG).show();
			if (!TextUtils.isEmpty(gridDo.getCurKeyCode())) {
			if (gridDo.getCurKeyCode().equals(selectBean.getKeyCode())) {
			//相同归还成功
			isOpened = false;
			getVM().doAction(8);
			getVM().closeGrid(gridDo);
			}else {
			//钥匙不匹配
			getVM().doAction(10,null);
			EventBus.getDefault().post(new OpenGridEvent(selectBean.getChannelCode(), selectBean.getBoardCode()));
			}
			} else {
			//钥匙未归还
			isOpened = false;
			getVM().doAction(9);
			getVM().closeGrid(gridDo);
			}
			}else {
			ToastView.show(MApplication.mContext, "未查询到规格信息");
			}
			} else {
			//关门失败
			}
			}
			}
			}*/
			}
			}

			@@ -471,10 +393,12 @@
			if(selectBean!=null){
			//校验时间
			if(keyTime==null){
			EventBus.getDefault().post(new HttpEvent("xxxxxxxxxx==>钥匙信息1"));
			return;
			}
			if(keyTime!=null&&keyTime>System.currentTimeMillis()){
			//校验返回时间<命令时间
			EventBus.getDefault().post(new HttpEvent("xxxxxxxxxx==>钥匙信息2"));
			return;
			}
			if(handler.hasMessages(0)){
			@@ -483,11 +407,13 @@
			if("1".equals(e.getType())){
			//1号板
			if(!"1".equals(selectBean.getBoardCode())){
			EventBus.getDefault().post(new HttpEvent("xxxxxxxxxx==>钥匙信息3"));
			return;
			}
			}else if("2".equals(e.getType())){
			//2号板
			if(!"2".equals(selectBean.getBoardCode())){
			EventBus.getDefault().post(new HttpEvent("xxxxxxxxxx==>钥匙信息4"));
			return;
			}
			}
			@@ -529,6 +455,7 @@
			}
			}else {
			//归还
			EventBus.getDefault().post(new HttpEvent("xxxxxxxxxx==>钥匙信息5"));
			CabinetGridDo gridDo = DaoManager.getCabinetGridDao().getGridByKey(key);
			if (gridDo != null) {
			if (gridDo.getIsOpen() == 0) {
			@@ -539,6 +466,7 @@
			isOpened = false;
			getVM().doAction(8);
			getVM().closeGrid(gridDo);
			EventBus.getDefault().post(new HttpEvent("xxxxxxxxxx==>钥匙信息-归还成功"));
			}else {
			//钥匙不匹配
			getVM().doAction(10);
			@@ -549,12 +477,15 @@
			isOpened = false;
			getVM().doAction(9);
			getVM().closeGrid(gridDo);
			EventBus.getDefault().post(new HttpEvent("xxxxxxxxxx==>钥匙信息-钥匙未归还"));
			}
			}else {
			EventBus.getDefault().post(new HttpEvent("xxxxxxxxxx==>钥匙信息-没关门"));
			//没关门
			if(!TextUtils.isEmpty(gridDo.getCurKeyCode())){
			//有钥匙了
			getVM().doAction(7);
			EventBus.getDefault().post(new HttpEvent("xxxxxxxxxx==>钥匙信息-没关门-有钥匙"));
			}
			}
			} else {