productDev/dmvisit.git

			@@ -167,9 +167,10 @@
			//开启柜门
			getVM().openGridDriver(selectBean);
			downTime = 60;
			getDB().tvTitle.setVisibility(View.GONE);
			break;
			case 2:
			getDB().clTip1.setVisibility(View.GONE);
			//getDB().clTip1.setVisibility(View.GONE);
			if(status==0) {
			//重新开门
			openTime = StringUtil.DateToStr(new Date());
			@@ -281,6 +282,12 @@

			private SpannableString getErrPhoneText(){
			String phone = MApplication.getConfigBean().getLinkPhone();
			if(phone==null){
			String text = "如有问题请联系管理员";
			SpannableString styledText = new SpannableString(text);
			styledText.setSpan(new TextAppearanceSpan(this, R.style.style_tip3), 0, text.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
			return styledText;
			}
			String text = "如有问题请联系管理员"+phone;
			SpannableString styledText = new SpannableString(text);
			styledText.setSpan(new TextAppearanceSpan(this, R.style.style_tip2), 0, text.length()-phone.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
			@@ -321,8 +328,7 @@
			return;
			}
			isOpened = true;
			Toast.makeText(mContext, "操作4", Toast.LENGTH_LONG).show();
			doRegister(4, null);
			getVM().doAction(4);
			} else {
			//失败
			//如果是钥匙不对继续开门
			@@ -335,12 +341,12 @@
			}
			if (!gridDo.getCurKeyCode().equals(selectBean.getKeyCode())) {
			//钥匙不匹配
			doRegister(10,null);
			getVM().doAction(10,null);
			EventBus.getDefault().post(new OpenGridEvent(selectBean.getChannelCode(), selectBean.getBoardCode()));
			return;
			}
			}
			doRegister(3, null);
			getVM().doAction(3);
			}
			}
			}
			@@ -385,18 +391,17 @@
			if (gridDo.getCurKeyCode().equals(selectBean.getKeyCode())) {
			//领取失败
			isOpened = false;
			doRegister(6, null);
			getVM().doAction(6);
			getVM().closeGrid(gridDo);
			}else {
			//钥匙不匹配
			//Toast.makeText(mContext, "操作10", Toast.LENGTH_LONG).show();
			doRegister(10,null);
			getVM().doAction(10,null);
			EventBus.getDefault().post(new OpenGridEvent(selectBean.getChannelCode(), selectBean.getBoardCode()));
			}
			} else {
			//钥匙拿走了
			isOpened = false;
			doRegister(5, null);
			getVM().doAction(5);
			getVM().closeGrid(gridDo);
			}
			}else {
			@@ -422,17 +427,17 @@
			if (gridDo.getCurKeyCode().equals(selectBean.getKeyCode())) {
			//相同归还成功
			isOpened = false;
			doRegister(8, null);
			getVM().doAction(8);
			getVM().closeGrid(gridDo);
			}else {
			//钥匙不匹配
			doRegister(10,null);
			getVM().doAction(10,null);
			EventBus.getDefault().post(new OpenGridEvent(selectBean.getChannelCode(), selectBean.getBoardCode()));
			}
			} else {
			//钥匙未归还
			isOpened = false;
			doRegister(9, null);
			getVM().doAction(9);
			getVM().closeGrid(gridDo);
			}
			}else {
			@@ -488,25 +493,24 @@
			if (gridDo.getCurKeyCode().equals(selectBean.getKeyCode())) {
			//领取失败
			isOpened = false;
			doRegister(6, null);
			getVM().doAction(6);
			getVM().closeGrid(gridDo);
			}else {
			//钥匙不匹配
			//Toast.makeText(mContext, "操作10", Toast.LENGTH_LONG).show();
			doRegister(10,null);
			getVM().doAction(10);
			EventBus.getDefault().post(new OpenGridEvent(selectBean.getChannelCode(), selectBean.getBoardCode()));
			}
			} else {
			//钥匙拿走了
			isOpened = false;
			doRegister(5, null);
			getVM().doAction(5);
			getVM().closeGrid(gridDo);
			}
			}else {
			//没关门
			if(TextUtils.isEmpty(gridDo.getCurKeyCode())){
			//空了
			doRegister(7,null);
			getVM().doAction(7);
			}
			}
			}else {
			@@ -522,24 +526,24 @@
			if (gridDo.getCurKeyCode().equals(selectBean.getKeyCode())) {
			//相同归还成功
			isOpened = false;
			doRegister(8, null);
			getVM().doAction(8);
			getVM().closeGrid(gridDo);
			}else {
			//钥匙不匹配
			doRegister(10,null);
			getVM().doAction(10);
			EventBus.getDefault().post(new OpenGridEvent(selectBean.getChannelCode(), selectBean.getBoardCode()));
			}
			} else {
			//钥匙未归还
			isOpened = false;
			doRegister(9, null);
			getVM().doAction(9);
			getVM().closeGrid(gridDo);
			}
			}else {
			//没关门
			if(!TextUtils.isEmpty(gridDo.getCurKeyCode())){
			//有钥匙了
			doRegister(7,null);
			getVM().doAction(7);
			}
			}
			} else {