From d6f612e55872c1b891b1cf5b4c5eaa0ed80188ce Mon Sep 17 00:00:00 2001 From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674> Date: 星期日, 23 七月 2017 17:16:39 +0800 Subject: [PATCH] --- VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/AttenderRegisterFragment.java | 50 ++++++++++++++++++++++++++------------------------ 1 files changed, 26 insertions(+), 24 deletions(-) diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/AttenderRegisterFragment.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/AttenderRegisterFragment.java index b4c5478..f57d577 100644 --- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/AttenderRegisterFragment.java +++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/AttenderRegisterFragment.java @@ -22,7 +22,10 @@ import com.bsk.zhangbo.demoforbsk.R; import cn.com.basic.face.adapter.SurveillanceFragment; +import cn.com.basic.face.base.BaseApplication; import cn.com.basic.face.base.BaseFragment; +import cn.com.basic.face.dialog.AttenderRegisterSelectPhotoDialog; +import cn.com.basic.face.dialog.AttenderRegisterUploadPhotoDialog; import cn.com.basic.face.dialog.SurveillancePhotoDialog; import cn.com.basic.face.discern.common.CommonVariables; import cn.com.basic.face.discern.entity.Register; @@ -158,6 +161,7 @@ params.addBodyParameter(Register.FieldNames.departmentId, DictionaryMng.getInstance().getId(fragment_attender_register_department.getValue())); params.addBodyParameter(Register.FieldNames.department, fragment_attender_register_department.getValue()); params.addBodyParameter(Register.FieldNames.remark, fragment_attender_register_remark.getValue()); + params.addBodyParameter("deviceCompanyId", BaseApplication.getInstance().getAndroidDevice().getCompanyId()); if (surveillanceQueryItem_selectPhoto != null) { params.addBodyParameter("width", surveillanceQueryItem_selectPhoto.getWidth()); @@ -324,18 +328,18 @@ idCardHeadPath = ""; - fragment_attender_register_name.setValue("寰愪慨婧�"+Math.random()); - fragment_attender_register_id_num.setValue("111"); - fragment_attender_register_department.setValue("123"); - fragment_attender_register_remark.setValue("澶囨敞"); + fragment_attender_register_name.setValue(""); + fragment_attender_register_post.setValue(""); + fragment_attender_register_gender.setValue(""); + fragment_attender_register_department.setValue(""); + fragment_attender_register_id_class.setValue(""); + fragment_attender_register_id_num.setValue(""); + fragment_attender_register_remark.setValue(""); fragment_attender_register_name.setValue(""); fragment_attender_register_id_num.setValue(""); fragment_attender_register_department.setValue(""); - fragment_attender_register_gender.setValue("鐢�"); - fragment_attender_register_id_class.setValue("韬唤璇�"); - fragment_attender_register_post.setValue("涓浗"); fragment_attender_register_surveillance_photo_img = null; fragment_attender_register_upload_custom_photo_img = null; fragment_attender_register_id_card_photo_img = null; @@ -354,11 +358,13 @@ //@OnClick(R.id.fragment_attender_register_country) public void fragment_attender_register_country_click(View view) { - new CountryDialog(fragment_attender_register_linear_layout, new OkClickedListener() { - public void onSelected(String value) { - fragment_attender_register_post.setValue(value); - } - },fragment_attender_register_post.getValue()); + if (CountryDialog.hasCountries()) { + new CountryDialog(fragment_attender_register_linear_layout, new OkClickedListener() { + public void onSelected(String value) { + fragment_attender_register_post.setValue(value); + } + }, fragment_attender_register_post.getValue()); + } } //@OnClick(R.id.fragment_attender_register_gender) @@ -391,20 +397,17 @@ @OnClick(R.id.fragment_attender_register_surveillance_photo) public void fragment_attender_register_surveillance_photo_click(View view) { - SurveillanceFragment.SurveillancePhotoSelectListViewAdapter.selectPhotoOrUploadPhoto = CommonVariables.SelectPhotoType.SELECT_PHOTO; - new SurveillancePhotoDialog(fragment_attender_register_linear_layout, Constant.DialogSelectType.ID_TYPE, new OkClickedListener() { - public void onSelected(String value) { - } - }, selectedSurveillancePhotoId); + AttenderRegisterSelectPhotoDialog.getInstance().show(); + } + + public FrameLayout get_fragment_attender_register_linear_layout() { + return fragment_attender_register_linear_layout; } @OnClick(R.id.fragment_attender_register_upload_custom_photo) public void fragment_attender_register_upload_custom_photo_click(View view) { SurveillanceFragment.SurveillancePhotoSelectListViewAdapter.selectPhotoOrUploadPhoto = CommonVariables.SelectPhotoType.UPLOAD_PHOTO; - new SurveillancePhotoDialog(fragment_attender_register_linear_layout, Constant.DialogSelectType.ID_TYPE, new OkClickedListener() { - public void onSelected(String value) { - } - }, selectedCustomPhotoId); + AttenderRegisterUploadPhotoDialog.getInstance().show(); } @OnClick(R.id.fragment_attender_register_id_card_photo) @@ -465,12 +468,12 @@ } } - private boolean registerFragmentVisible = false; + public boolean attenderRegisterFragmentVisible = false; @Override public void setMenuVisibility(boolean menuVisible) { super.setMenuVisibility(menuVisible); - registerFragmentVisible = menuVisible; + attenderRegisterFragmentVisible = menuVisible; } @OnClick(R.id.fragment_visitor_register_to_visitor_register) @@ -479,7 +482,6 @@ fragment.getChildFragmentManager().popBackStackImmediate(); CommonVariables.Register.VISITOR_REGISTER_SELECTED = true; } - public void fragment_attender_register_post_click(View view) { new SelectDialog(fragment_attender_register_linear_layout, Constant.DialogSelectType.POST, new OkClickedListener() { -- Gitblit v1.8.0