productDev/dmvisit.git

			@@ -27,6 +27,7 @@
			import com.doumee.keyCabinet.base.MyBaseActivity;
			import com.doumee.keyCabinet.databinding.FaceActivityBinding;
			import com.doumee.keyCabinet.event.FaceStatusChangeEvent;
			import com.doumee.keyCabinet.event.HttpEvent;
			import com.doumee.keyCabinet.event.JiujinBeginEvent;
			import com.doumee.keyCabinet.event.JiujinResultEvent;
			import com.doumee.keyCabinet.event.TimeClockEvent;
			@@ -120,6 +121,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_tip3), 0, text.length()-phone.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
			@@ -130,6 +137,7 @@
			private void statusFsm(int toStatus){
			status = toStatus;
			isToChose = false;
			getDB().etEwm.requestFocus();
			switch (toStatus){
			case 0:
			//取-管理员人脸验证
			@@ -141,7 +149,6 @@
			case 1:
			//取-管理员刷卡验证
			getDB().etEwm.setText("");
			getDB().etEwm.requestFocus();
			getDB().tvTitle.setText("管理员身份验证");
			getDB().clFace.setVisibility(View.GONE);
			getDB().clCard.setVisibility(View.VISIBLE);
			@@ -198,7 +205,7 @@
			//取-司机酒精检测失败
			//Toast.makeText(mContext, "司机酒精检测失败", Toast.LENGTH_SHORT).show();
			getDB().clJiu.setVisibility(View.GONE);
			getDB().tvJg1.setText("酒精检测异常，请重新检测");
			getDB().tvJg1.setText("酒精检测操作不当，请重新检测");
			getDB().clTip1.setVisibility(View.VISIBLE);
			break;
			case 7:
			@@ -290,12 +297,27 @@
			//司机ic卡成功
			if(flag==0) {
			//取
			statusFsm(4);
			if(MApplication.getConfigBean()!=null&&MApplication.getConfigBean().getAlcoholStatus()==1) {
			//非酒精检测
			startActivity(KeyCabinetActivity.class);
			finish();
			}else {
			//酒精检测
			statusFsm(4);
			}
			}else {
			//还
			startActivity(KeyCabinetActivity.class);
			finish();
			}
			break;
			case 8:
			getDB().message.setText(data.getData().get("obj").toString());
			getDB().message.setVisibility(View.VISIBLE);
			handler.sendEmptyMessageDelayed(6,2000);
			getDB().message.invalidate();
			getDB().message.requestLayout();
			EventBus.getDefault().post(new HttpEvent("ic卡+++++++"+data.getData().get("type").toString()));
			break;
			default:
			break;
			@@ -328,7 +350,7 @@
			//ic卡读取
			getDB().etEwm.requestFocus();
			getDB().etEwm.setFocusable(true);
			getDB().etEwm.setShowSoftInputOnFocus(true);
			getDB().etEwm.setShowSoftInputOnFocus(false);
			hideSoftKeyboard(getDB().etEwm);
			getDB().etEwm.getViewTreeObserver().addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {
			@Override
			@@ -336,6 +358,7 @@
			hideSoftKeyboard(getDB().etEwm);
			}
			});

			getDB().etEwm.addTextChangedListener(new TextWatcher() {
			@Override
			public void beforeTextChanged(CharSequence s, int start, int count, int after) {
			@@ -354,6 +377,8 @@
			return;
			}
			if(status!=1&&status!=3&&status!=8){
			getDB().etEwm.setText("");
			getDB().etEwm.requestFocus();
			return;
			}
			if(handler.hasMessages(5)){
			@@ -498,6 +523,8 @@
			getVM().alcoholTestAlarm(resultEvent.getConcentration().toString());
			//Toast.makeText(mContext, "酒精检测超标", Toast.LENGTH_SHORT).show();
			statusFsm(9);
			//再检测，将声音关闭
			EventBus.getDefault().post(new JiujinBeginEvent());
			}
			break;
			case 4:
			@@ -515,6 +542,9 @@
			}
			getDB().etEwm.setText("");
			getDB().etEwm.requestFocus();
			break;
			case 6:
			getDB().message.setVisibility(View.GONE);
			break;
			default:
			break;
			@@ -593,6 +623,7 @@
			User user = livenessModel.getUser();
			if (user == null) {
			mUser = null;
			//EventBus.getDefault().post(new HttpEvent("人脸用户检测失败------->"+(status==0?"管理员人脸检测：":"司机人脸检测：")));
			if (isCompareCheck) {
			/*getDB().clFail.setVisibility(View.VISIBLE);
			getDB().tv4.setText(getString(R.string.face_tip2));
			@@ -601,6 +632,8 @@

			} else {
			mUser = user;
			/*EventBus.getDefault().post(new HttpEvent("人脸用户------->"+(status==0?"管理员人脸检测：":"司机人脸检测：")
			+(user.getGroupId().equals("0")?"管理员":"司机")));*/
			if (isCompareCheck) {
			getDB().clFail.setVisibility(View.GONE);
			if(handler.hasMessages(0)) {
			@@ -625,7 +658,14 @@
			MApplication.getLoginBean().setMemberId(Integer.parseInt(user.getUserId()));
			MApplication.getLoginBean().setAuthType(0);
			//handler.sendEmptyMessageDelayed(8,0);
			EventBus.getDefault().post(new FaceStatusChangeEvent(4));
			if(MApplication.getConfigBean()!=null&&MApplication.getConfigBean().getAlcoholStatus()==1) {
			//非酒精检测
			startActivity(KeyCabinetActivity.class);
			finish();
			}else {
			//酒精检测
			EventBus.getDefault().post(new FaceStatusChangeEvent(4));
			}
			}else if(status==7){
			//还-司机
			MApplication.getLoginBean().setMemberId(Integer.parseInt(user.getUserId()));
			@@ -665,6 +705,9 @@
			@Subscribe(threadMode = ThreadMode.MAIN)
			public void JiujinResultEvent(JiujinResultEvent e){
			if(!isFinishing()){
			if(status!=4&&status!=6){
			return;
			}
			//Toast.makeText(mContext, "酒精检测返回："+e.isOk(), Toast.LENGTH_SHORT).show();
			if(!e.isOk()){
			getDB().clJiujinProgress.setVisibility(View.GONE);