From bcefcf7249692e61574438d3857e737c2fd29ca7 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期五, 14 七月 2017 16:50:36 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/BaseMng.java | 19 ++
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/dialog/SelectDialog.java | 18 ++
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/SurveillanceFragment.java | 3
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/RegisterMng.java | 55 +++++++
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/common/CommonVariables.java | 2
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/AttenderRegisterFragment.java | 115 +++++++++-------
/dev/null | 50 -------
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/AppApi.java | 8 +
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/SurveillanceQueryItemUtil.java | 4
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/register/RegisterRightFieldLabelView.java | 20 ++
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/dialog/SurveillancePhotoDialog.java | 27 ---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/SurveillanceFragment.java | 6
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/VisitorRegisterFragment.java | 18 +
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Register.java | 20 ++
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/DictionaryMng.java | 19 --
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/Constant.java | 2
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/CheckInMng.java | 34 ++--
17 files changed, 254 insertions(+), 166 deletions(-)
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/SurveillanceFragment.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/SurveillanceFragment.java
index facef40..173e572 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/SurveillanceFragment.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/SurveillanceFragment.java
@@ -305,7 +305,8 @@
VisitorRegisterFragment.getInstance().set_fragment_visitor_register_surveillance_photo(item);
VisitorRegisterFragment.selectedSurveillancePhotoId = item.getIdForSelect();
} else {
- //鑰冨嫟
+ AttenderRegisterFragment.getInstance().set_fragment_attender_register_surveillance_photo(item);
+ AttenderRegisterFragment.getInstance().selectedSurveillancePhotoId = item.getIdForSelect();
}
}
if (selectPhotoOrUploadPhoto == CommonVariables.SelectPhotoType.UPLOAD_PHOTO) {
@@ -313,7 +314,8 @@
VisitorRegisterFragment.getInstance().set_fragment_visitor_register_upload_custom_photo(item);
VisitorRegisterFragment.selectedCustomPhotoId = item.getIdForSelect();
} else {
- //鑰冨嫟
+ AttenderRegisterFragment.getInstance().set_fragment_attender_register_upload_custom_photo(item);
+ AttenderRegisterFragment.selectedCustomPhotoId = item.getIdForSelect();
}
}
for (SurveillanceQueryItem queryItem : (List<SurveillanceQueryItem>)getList()) {
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/dialog/SelectDialog.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/dialog/SelectDialog.java
index 1d29b86..ab753dc 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/dialog/SelectDialog.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/dialog/SelectDialog.java
@@ -53,6 +53,8 @@
private static List<String> resolutionList = new ArrayList();
private static List<String> protocolList = new ArrayList();
private static List<String> cameraBrandList = new ArrayList();
+ private static List<String> departmentDictionaryList = new ArrayList();
+ private static List<String> postDictionaryList = new ArrayList();
private int type;
public static void setVisitorTypeList(List visitorTypeList) {
@@ -206,6 +208,14 @@
tile = "璇烽�夋嫨鎽勫儚鏈哄搧鐗�";
list = cameraBrandList;
break;
+ case Constant.DialogSelectType.DEPARTMENT:
+ tile = "璇烽�夋嫨閮ㄩ棬/鐝骇";
+ list = departmentDictionaryList;
+ break;
+ case Constant.DialogSelectType.POST:
+ tile = "璇烽�夋嫨鑱屽姟";
+ list = postDictionaryList;
+ break;
}
dialog_select_title.setText(tile);
}
@@ -251,6 +261,14 @@
SelectDialog.cameraBrandList = cameraBrandList;
}
+ public static void setDepartmentDictionaryList(List<String> departmentDictionaryList) {
+ SelectDialog.departmentDictionaryList = departmentDictionaryList;
+ }
+
+ public static void setPostDictionaryList(List<String> postDictionaryList) {
+ SelectDialog.postDictionaryList = postDictionaryList;
+ }
+
public static class WheelAdapter extends BaseWheelAdapter<String> {
private Context mContext;
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/dialog/SurveillancePhotoDialog.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/dialog/SurveillancePhotoDialog.java
index 57fc305..7849684 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/dialog/SurveillancePhotoDialog.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/dialog/SurveillancePhotoDialog.java
@@ -22,6 +22,7 @@
import cn.com.basic.face.base.MainActivity;
import cn.com.basic.face.dialog.wheelview.adapter.BaseWheelAdapter;
import cn.com.basic.face.dialog.wheelview.widget.WheelView;
+import cn.com.basic.face.discern.common.CommonVariables;
import cn.com.basic.face.util.Constant;
import cn.com.basic.face.util.OkClickedListener;
import cn.com.basic.face.util.SurveillanceQueryItemUtil;
@@ -33,32 +34,16 @@
@ViewInject(R.id.dialog_surveillance_photo_select_list_view)
private SurveillancePhotoSelectListView dialog_surveillance_photo_select_list_view;
- private List list = new ArrayList();
-
- public static List visitorTypeList = new ArrayList();
- public static List genderList = new ArrayList();
- public static List idTypeList = new ArrayList();
- public static List visitReasonList = new ArrayList();
-
- public static void setVisitorTypeList(List visitorTypeList) {
- AddDialog.visitorTypeList = visitorTypeList;
- }
-
- public static void setGenderList(List genderList) {
- AddDialog.genderList = genderList;
- }
-
- public static void setIdTypeList(List idTypeList) {
- AddDialog.idTypeList = idTypeList;
- }
-
public SurveillancePhotoDialog(View parentView, int type, OkClickedListener okButtonClickedListener, long selectedId) {
this.parentView = parentView;
View view = LayoutInflater.from(MainActivity.getInstance()).inflate(R.layout.dialog_surveillance_photo_select,null);
ViewUtils.inject(this, view);
- dialog_surveillance_photo_select_list_view.show(SurveillanceQueryItemUtil.getInstance().getAllUnregisterVisitorTwoRowsForSelect(selectedId));
-
+ if (CommonVariables.Register.VISITOR_REGISTER_SELECTED) {
+ dialog_surveillance_photo_select_list_view.show(SurveillanceQueryItemUtil.getInstance().getAllUnregisterVisitorTwoRowsForSelect(selectedId));
+ } else {
+ dialog_surveillance_photo_select_list_view.show(SurveillanceQueryItemUtil.getInstance().getAllUnregisterAttenderTwoRowsForSelect(selectedId));
+ }
setTitleAndList(type);
WheelView.WheelViewStyle style = new WheelView.WheelViewStyle();
style.selectedTextColor = Color.parseColor("#11c3e3");
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/common/CommonVariables.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/common/CommonVariables.java
index aab5ea0..c56c30c 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/common/CommonVariables.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/common/CommonVariables.java
@@ -112,7 +112,7 @@
public static boolean FACE_SERVER = true;
public static boolean ID_CARD = false;
- public static boolean EMULATOR = true;
+ public static boolean EMULATOR = false;
public static class Register {
public static boolean VISITOR_REGISTER_SELECTED = true;
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Register.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Register.java
index be97ea1..98cea89 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Register.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Register.java
@@ -101,6 +101,8 @@
public static final String surveillancePhotoId = "surveillancePhotoId";
public static final String visitorTypeId = "visitorTypeId";
+ public static final String department = "department";
+ public static final String post = "post";
}
// 浜哄憳涓婚敭
@@ -149,6 +151,8 @@
private String visitorTypeId;
private String authentication;
private String idCardHeadPhoto;
+ private String department;
+ private String post;
/**
* Get 浜哄憳涓婚敭
@@ -468,6 +472,22 @@
this.idCardHeadPhoto = idCardHeadPhoto;
}
+ public String getDepartment() {
+ return department;
+ }
+
+ public void setDepartment(String department) {
+ this.department = department;
+ }
+
+ public String getPost() {
+ return post;
+ }
+
+ public void setPost(String post) {
+ this.post = post;
+ }
+
public String toString() {
return
",浜哄憳涓婚敭 =" + registerId + ",浜哄憳鍚嶅瓧 =" + username + ",浜哄憳鍚嶉瀛楁瘝 ="+ nameEn +
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 21130f6..b4c5478 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
@@ -8,8 +8,12 @@
import android.net.Uri;
import android.os.Environment;
import android.provider.MediaStore;
+import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentManager;
+import android.support.v4.app.FragmentTransaction;
import android.view.View;
import android.view.WindowManager;
+import android.widget.FrameLayout;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.TextView;
@@ -58,28 +62,43 @@
public class AttenderRegisterFragment extends BaseFragment implements View.OnClickListener{
+ private static AttenderRegisterFragment instance = new AttenderRegisterFragment();
+
+ public static AttenderRegisterFragment getInstance() {
+ return instance;
+ }
+ @Override
+ protected int getLayoutId() {
+ return R.layout.fragment_attender_register;
+ }
+
+ @Override
+ public void onClick(View v) {}
+
@ViewInject(R.id.fragment_attender_register_name)
private RegisterRightFieldTextView fragment_attender_register_name;
@ViewInject(R.id.fragment_attender_register_gender)
private RegisterRightFieldLabelView fragment_attender_register_gender;
+ @ViewInject(R.id.fragment_attender_register_id_class)
+ private RegisterRightFieldLabelView fragment_attender_register_id_class;
+ @ViewInject(R.id.fragment_attender_register_remark)
+ private RegisterRightFieldTextView fragment_attender_register_remark;
+
@ViewInject(R.id.fragment_attender_register_post)
private RegisterRightFieldLabelView fragment_attender_register_post;
@ViewInject(R.id.fragment_attender_register_department)
private RegisterRightFieldLabelView fragment_attender_register_department;
- @ViewInject(R.id.fragment_attender_register_id_class)
- private RegisterRightFieldLabelView fragment_attender_register_id_class;
@ViewInject(R.id.fragment_attender_register_id_num)
private RegisterRightFieldTextView fragment_attender_register_id_num;
- @ViewInject(R.id.fragment_attender_register_remark)
- private RegisterRightFieldTextView fragment_attender_register_remark;
+
@ViewInject(R.id.fragment_attender_register_surveillance_photo)
private ImageView fragment_attender_register_surveillance_photo;
@ViewInject(R.id.fragment_attender_register_upload_custom_photo)
private ImageView fragment_attender_register_upload_custom_photo;
@ViewInject(R.id.fragment_attender_register_id_card_photo)
private ImageView fragment_attender_register_id_card_photo;
- @ViewInject(R.id.fragment_attender_register_linear_layout)
- private LinearLayout fragment_attender_register_linear_layout;
+ @ViewInject(R.id.fragment_register_frame_layout)
+ private FrameLayout fragment_attender_register_linear_layout;
@ViewInject(R.id.fragment_attender_register_surveillance_photo_placeholder_image)
private ImageView fragment_attender_register_surveillance_photo_placeholder_image;
@ViewInject(R.id.fragment_attender_register_upload_custom_photo_placeholder_image)
@@ -113,15 +132,6 @@
private String idCardHeadPath = "";
- private static AttenderRegisterFragment instance = new AttenderRegisterFragment();
-
- public static AttenderRegisterFragment getInstance() {
- return instance;
- }
- @Override
- protected int getLayoutId() {
- return R.layout.fragment_attender_register;
- }
@OnClick(R.id.fragment_attender_register_add)
public void fragment_attender_register_add_click(View view) {
@@ -142,9 +152,11 @@
params.addBodyParameter(Register.FieldNames.username, name);
params.addBodyParameter(Register.FieldNames.genderId, DictionaryMng.getInstance().getId(fragment_attender_register_gender.getValue()));
params.addBodyParameter(Register.FieldNames.identityTypeId, DictionaryMng.getInstance().getId(fragment_attender_register_id_class.getValue()));
- params.addBodyParameter(Register.FieldNames.countryId, DictionaryMng.getInstance().getId(fragment_attender_register_post.getValue()));
+ params.addBodyParameter(Register.FieldNames.postId, DictionaryMng.getInstance().getId(fragment_attender_register_post.getValue()));
+ params.addBodyParameter(Register.FieldNames.post, fragment_attender_register_post.getValue());
params.addBodyParameter(Register.FieldNames.identifyNum, fragment_attender_register_id_num.getValue());
- params.addBodyParameter(Register.FieldNames.birthday, fragment_attender_register_department.getValue());
+ 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());
if (surveillanceQueryItem_selectPhoto != null) {
@@ -157,9 +169,9 @@
for (int i = 0; i < nativeImg.size; i++) {
imageBytes[i] = nativeImg.image[i];
}
- params.addBodyParameter("rawSurveillancePhoto", FileUtil.writeToFile("rawSurveillancePhoto", imageBytes));
+ params.addBodyParameter("rawSurveillancePhoto", FileUtil.writeToFile("rawSurveillancePhoto_attender", imageBytes));
} else {
- params.addBodyParameter("rawSurveillancePhoto", FileUtil.writeToFile("rawSurveillancePhoto", new byte[]{}));
+ params.addBodyParameter("rawSurveillancePhoto", FileUtil.writeToFile("rawSurveillancePhoto_attender", new byte[]{}));
}
if (fragment_attender_register_surveillance_photo_img != null) {
@@ -167,9 +179,9 @@
fragment_attender_register_surveillance_photo_img.compress(Bitmap.CompressFormat.JPEG, 100, byteArrayOutputStream);
byte[] imageBytes = byteArrayOutputStream.toByteArray();
- params.addBodyParameter("surveillancePhoto", FileUtil.writeToFile("surveillancePhoto", imageBytes));
+ params.addBodyParameter("surveillancePhoto", FileUtil.writeToFile("surveillancePhoto_attender", imageBytes));
} else {
- params.addBodyParameter("surveillancePhoto", FileUtil.writeToFile("surveillancePhoto", new byte[]{}));
+ params.addBodyParameter("surveillancePhoto", FileUtil.writeToFile("surveillancePhoto_attender", new byte[]{}));
}
if (fragment_attender_register_upload_custom_photo_img != null) {
@@ -177,9 +189,9 @@
fragment_attender_register_upload_custom_photo_img.compress(Bitmap.CompressFormat.JPEG, 100, byteArrayOutputStream);
byte[] imageBytes = byteArrayOutputStream.toByteArray();
- params.addBodyParameter("uploadCustomPhoto", FileUtil.writeToFile("uploadCustomPhoto", imageBytes));
+ params.addBodyParameter("uploadCustomPhoto", FileUtil.writeToFile("uploadCustomPhoto_attender", imageBytes));
} else {
- params.addBodyParameter("uploadCustomPhoto", FileUtil.writeToFile("uploadCustomPhoto", new byte[]{}));
+ params.addBodyParameter("uploadCustomPhoto", FileUtil.writeToFile("uploadCustomPhoto_attender", new byte[]{}));
}
if (fragment_attender_register_id_card_photo_img != null) {
@@ -187,11 +199,11 @@
fragment_attender_register_id_card_photo_img.compress(Bitmap.CompressFormat.JPEG, 100, byteArrayOutputStream);
byte[] imageBytes = byteArrayOutputStream.toByteArray();
- params.addBodyParameter("idCardPhoto", FileUtil.writeToFile("idCardPhoto", imageBytes));
+ params.addBodyParameter("idCardPhoto", FileUtil.writeToFile("idCardPhoto_attender", imageBytes));
} else {
- params.addBodyParameter("idCardPhoto", FileUtil.writeToFile("idCardPhoto", new byte[]{}));
+ params.addBodyParameter("idCardPhoto", FileUtil.writeToFile("idCardPhoto_attender", new byte[]{}));
}
- RegisterMng.getInstance().add(params, idCardHeadPath);
+ RegisterMng.getInstance().addAttender(params, idCardHeadPath);
}
public void set_fragment_attender_register_surveillance_photo(SurveillanceQueryItem item) {
@@ -313,8 +325,8 @@
idCardHeadPath = "";
fragment_attender_register_name.setValue("寰愪慨婧�"+Math.random());
- fragment_attender_register_id_num.setValue("36041419292222222");
- fragment_attender_register_department.setValue("1985-08-12");
+ fragment_attender_register_id_num.setValue("111");
+ fragment_attender_register_department.setValue("123");
fragment_attender_register_remark.setValue("澶囨敞");
fragment_attender_register_name.setValue("");
@@ -361,22 +373,6 @@
//@OnClick(R.id.fragment_attender_register_birthday)
public void fragment_attender_register_birthday_click(View view) {
String birthdayStr = fragment_attender_register_department.getValue();
- Date birthday = new Date();
- if (birthdayStr != null && !"".equals(birthdayStr)) {
- SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
- try {
- birthday = sdf.parse(birthdayStr);
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
-
- new DateSelectDialog(
- new OkClickedListener(){
- public void onSelected(String value) {
- fragment_attender_register_department.setValue(value);
- }
- }, birthday);
}
//@OnClick(R.id.fragment_attender_register_id_class)
@@ -420,9 +416,6 @@
startActivityForResult(intent, fragment_attender_register_id_card_photo_);
}
- @Override
- public void onClick(View v) {}
-
public void setRegisterInfo(CheckInQueryItem item) {
fragment_attender_register_surveillance_photo.setImageURI(Uri.parse(AppApi.IMAGE_URL_BASE + item.getSurveillancePhoto()));
}
@@ -456,10 +449,8 @@
fragment_attender_register_name.setValue(idCard.getName());
fragment_attender_register_id_num.setValue(idCard.getCardNumber());
- SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
- SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd");
- fragment_attender_register_department.setValue(sdf1.format(sdf.parse(idCard.getBirthday())));
+ fragment_attender_register_department.setValue("");
fragment_attender_register_gender.setValue(idCard.getGender());
fragment_attender_register_id_class.setValue("韬唤璇�");
BitmapFactory.Options options = new BitmapFactory.Options();
@@ -482,4 +473,28 @@
registerFragmentVisible = menuVisible;
}
+ @OnClick(R.id.fragment_visitor_register_to_visitor_register)
+ public void fragment_visitor_register_to_visitor_register_click(View view) {
+ Fragment fragment = MainActivity.getInstance().myFragmentPagerAdapter.getItem(1);
+ 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() {
+ public void onSelected(String value) {
+ fragment_attender_register_post.setValue(value);
+ }
+ }, fragment_attender_register_post.getValue());
+ }
+
+ public void fragment_attender_register_department_click(View view) {
+ new SelectDialog(fragment_attender_register_linear_layout, Constant.DialogSelectType.DEPARTMENT, new OkClickedListener() {
+ public void onSelected(String value) {
+ fragment_attender_register_department.setValue(value);
+ }
+ }, fragment_attender_register_department.getValue());
+ }
+
}
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/RegisterFragment.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/RegisterFragment.java
deleted file mode 100644
index 8ebee3f..0000000
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/RegisterFragment.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package cn.com.basic.face.fragment;
-
-import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentTransaction;
-import android.view.View;
-
-import com.bsk.zhangbo.demoforbsk.R;
-import com.lidroid.xutils.view.annotation.event.OnClick;
-
-import cn.com.basic.face.base.BaseFragment;
-import cn.com.basic.face.base.MainActivity;
-
-/**
- * Created by xiuxi on 2017/7/12.
- */
-
-public class RegisterFragment extends BaseFragment {
-
- private static RegisterFragment instance = new RegisterFragment();
- public static RegisterFragment getInstance() {
- return instance;
- }
-
- @Override
- protected int getLayoutId() {
- return R.layout.fragment_register;
- }
-
- @Override
- public void onCreate(@Nullable Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
-// FragmentManager fragmentManager = MainActivity.getInstance().getSupportFragmentManager();
-// FragmentTransaction fragmentTransaction = fragmentManager.beginTransaction();
-//
-// fragmentTransaction.replace(R.id.fragment_register_linear_layout, VisitorRegisterFragment.getInstance());
-//
-// fragmentTransaction.commit();
-
-
-
- }
-
- @OnClick(R.id.test)
- public void test(View view) {
- //MainActivity.getInstance().myFragmentPagerAdapter.setFragment(1, VisitorRegisterFragment.getInstance());
- }
-
-}
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/SurveillanceFragment.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/SurveillanceFragment.java
index 871329f..0ed7ded 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/SurveillanceFragment.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/SurveillanceFragment.java
@@ -97,6 +97,9 @@
useNative = false;
}
//useNative = false;
+ if (CommonVariables.EMULATOR) {
+ useNative = false;
+ }
if (useNative) {
System.loadLibrary("cvface_api");
System.loadLibrary("opencv_java3");
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/VisitorRegisterFragment.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/VisitorRegisterFragment.java
index fdf02c2..394949b 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/VisitorRegisterFragment.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/VisitorRegisterFragment.java
@@ -8,8 +8,10 @@
import android.net.Uri;
import android.os.Environment;
import android.provider.MediaStore;
+import android.support.v4.app.FragmentTransaction;
import android.view.View;
import android.view.WindowManager;
+import android.widget.FrameLayout;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.TextView;
@@ -84,8 +86,8 @@
private ImageView fragment_visitor_register_upload_custom_photo;
@ViewInject(R.id.fragment_visitor_register_id_card_photo)
private ImageView fragment_visitor_register_id_card_photo;
- @ViewInject(R.id.fragment_visitor_register_linear_layout)
- private LinearLayout fragment_visitor_register_linear_layout;
+ @ViewInject(R.id.fragment_register_frame_layout)
+ private FrameLayout fragment_visitor_register_linear_layout;
@ViewInject(R.id.fragment_visitor_register_surveillance_photo_placeholder_image)
private ImageView fragment_visitor_register_surveillance_photo_placeholder_image;
@ViewInject(R.id.fragment_visitor_register_upload_custom_photo_placeholder_image)
@@ -515,15 +517,21 @@
}
}
- private boolean registerFragmentVisible = false;
-
@Override
public void setMenuVisibility(boolean menuVisible) {
super.setMenuVisibility(menuVisible);
- registerFragmentVisible = menuVisible;
}
+ @OnClick(R.id.fragment_visitor_register_to_attender_register)
+ private void fragment_visitor_register_to_attender_register_click(View view) {
+ AttenderRegisterFragment attenderRegisterFragment = AttenderRegisterFragment.getInstance();
+ FragmentTransaction transaction = getChildFragmentManager().beginTransaction();
+
+ transaction.addToBackStack(null);
+ transaction.replace(R.id.fragment_register_frame_layout, attenderRegisterFragment).commit();
+ CommonVariables.Register.VISITOR_REGISTER_SELECTED = false;
+ }
}
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/BaseMng.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/BaseMng.java
index 4e474fd..6121e1c 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/BaseMng.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/BaseMng.java
@@ -1,8 +1,12 @@
package cn.com.basic.face.service;
+import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
import cn.com.basic.face.discern.common.CommonVariables;
+import cn.com.basic.face.discern.entity.Dictionary;
public class BaseMng {
@@ -22,4 +26,19 @@
}
}
+ public List<String> getDictionaryNameList(List<Dictionary> dictionaryList) {
+ List nameList = new ArrayList();
+ for (Dictionary dictionary : dictionaryList) {
+ idMap.put(dictionary.getName(), dictionary.getDictId()+"");
+ nameList.add(dictionary.getName());
+ }
+ return nameList;
+ }
+
+ public Map<String, String> idMap = new HashMap<String, String>();
+
+ public String getId(String name) {
+ return idMap.get(name);
+ }
+
}
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/CheckInMng.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/CheckInMng.java
index 718a4ec..20e21b3 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/CheckInMng.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/CheckInMng.java
@@ -1,28 +1,28 @@
package cn.com.basic.face.service;
- import android.widget.Toast;
+import android.widget.Toast;
- import cn.com.basic.face.base.BaseApplication;
- import cn.com.basic.face.discern.common.CommonVariables;
- import cn.com.basic.face.discern.query.condition.CheckInQueryCondition;
- import cn.com.basic.face.fragment.CheckInFragment;
- import cn.com.basic.face.util.AppApi;
+import cn.com.basic.face.base.BaseApplication;
+import cn.com.basic.face.discern.common.CommonVariables;
+import cn.com.basic.face.discern.query.condition.CheckInQueryCondition;
+import cn.com.basic.face.fragment.CheckInFragment;
+import cn.com.basic.face.util.AppApi;
- import org.xutils.http.RequestParams;
- import org.xutils.x;
+import org.xutils.http.RequestParams;
+import org.xutils.x;
- import java.util.ArrayList;
- import java.util.Collections;
- import java.util.Comparator;
- import java.util.List;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
- import cn.com.basic.face.discern.common.BaseCommonCallBack;
- import cn.com.basic.face.discern.query.item.CheckInQueryItem;
- import cn.com.basic.face.util.CharacterParser;
+import cn.com.basic.face.discern.common.BaseCommonCallBack;
+import cn.com.basic.face.discern.query.item.CheckInQueryItem;
+import cn.com.basic.face.util.CharacterParser;
- public class CheckInMng extends BaseMng {
+public class CheckInMng extends BaseMng {
- public static CheckInMng instance = new CheckInMng();
+ public static CheckInMng instance = new CheckInMng();
public static CheckInMng getInstance() {
return instance;
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/DictionaryMng.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/DictionaryMng.java
index d6c24e7..1b12207 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/DictionaryMng.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/DictionaryMng.java
@@ -25,18 +25,12 @@
import cn.com.basic.face.util.CharacterParser;
import cn.com.basic.face.util.Constant;
-public class DictionaryMng {
+public class DictionaryMng extends BaseMng {
public static DictionaryMng instance = new DictionaryMng();
public static DictionaryMng getInstance() {
return instance;
- }
-
- public Map<String, String> idMap = new HashMap<String, String>();
-
- public String getId(String name) {
- return idMap.get(name);
}
public void loadAllDictionaryData() {
@@ -51,6 +45,8 @@
loadResolutionList();
loadProtocolList();
loadCameraBrandList();
+ DepartmentMng.getInstance().loadDepartmentDictionary();
+ PostMng.getInstance().loadPostDictionary();
}
public void loadCountries() {
@@ -183,15 +179,6 @@
SelectDialog.setCameraBrandList(getDictionaryNameList(getList(Dictionary.class)));
}
});
- }
-
- public List<String> getDictionaryNameList(List<Dictionary> dictionaryList) {
- List nameList = new ArrayList();
- for (Dictionary dictionary : dictionaryList) {
- idMap.put(dictionary.getName(), dictionary.getDictId()+"");
- nameList.add(dictionary.getName());
- }
- return nameList;
}
private void loadVisitorTypeList() {
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/RegisterMng.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/RegisterMng.java
index db5cfdc..2973b37 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/RegisterMng.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/RegisterMng.java
@@ -133,4 +133,59 @@
}
+ public void addAttender(RequestParams params, String idCardHeadPhoto) {
+ if (!BaseApplication.deviceAvailable) {
+ return;
+ }
+ try {
+ File path = BaseApplication.getInstance().getFilesDir();
+ File rawSurveillancePhotoFile = new File(path, "rawSurveillancePhoto_attender");
+ if (!rawSurveillancePhotoFile.exists()) {
+ rawSurveillancePhotoFile.createNewFile();
+ }
+ File f0 = new File(path, "f0");
+ if (!f0.exists()) {
+ f0.createNewFile();
+ }
+ File surveillancePhotoFile = new File(path, "surveillancePhoto_attender");
+ if (!surveillancePhotoFile.exists()) {
+ surveillancePhotoFile.createNewFile();
+ }
+ File uploadCustomPhotoFile = new File(path, "uploadCustomPhoto_attender");
+ if (!uploadCustomPhotoFile.exists()) {
+ uploadCustomPhotoFile.createNewFile();
+ }
+ File idCardPhotoFile = new File(path, "idCardPhoto_attender");
+ if (!idCardPhotoFile.exists()) {
+ idCardPhotoFile.createNewFile();
+ }
+
+ FileWriter fw0 = new FileWriter(f0);
+ fw0.write("test1");
+ fw0.close();
+ params.setUri(AppApi.BASE_URL +AppApi.ATTENDER_REGISTER_ADD);
+ params.addBodyParameter("f0", f0);
+ params.addBodyParameter("rawSurveillancePhoto", rawSurveillancePhotoFile);
+ params.addBodyParameter("surveillancePhoto", surveillancePhotoFile);
+ params.addBodyParameter("uploadCustomPhoto", uploadCustomPhotoFile);
+ params.addBodyParameter("idCardPhoto", idCardPhotoFile);
+ if (idCardHeadPhoto != null && !"".equals(idCardHeadPhoto)) {
+ File f5 = new File(idCardHeadPhoto);
+ if (!f5.exists()) {
+ f5.createNewFile();
+ }
+ params.addBodyParameter("idCardHeadPhoto_attender", f5);
+ }
+ x.http().post(params, new BaseCommonCallBack() {
+ @Override
+ public void success() {
+ Toast.makeText(BaseApplication.getInstance(),"娣诲姞鎴愬姛", Toast.LENGTH_SHORT).show();
+ VisitorRegisterFragment.getInstance().resetForm();
+ }
+ });
+ }catch(Exception e) {
+ e.printStackTrace();
+ }
+ }
+
}
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/AppApi.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/AppApi.java
index 1f718ad..90b7294 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/AppApi.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/AppApi.java
@@ -4,7 +4,7 @@
//public final static String IMAGE_URL_BASE = "http://192.168.1.137:8333/face/img/";
//public final static String BASE_URL = "http://192.168.1.137:8333/face/";
- public final static String IMAGE_URL_BASE = "http://192.168.1.65:8888/";
+ public final static String IMAGE_URL_BASE = "http://192.168.1.48:8888/";
//public final static String BASE_URL = "http://192.168.1.51/face/";
// public final static String BASE_URL = "http://192.168.1.4:8333/face/";
public final static String BASE_URL = "http://192.168.1.35:8080/face/";
@@ -58,6 +58,12 @@
//鏁版嵁瀛楀吀鏌ヨ
public final static String DICTIONARY_QUERY = "queryDictionary/v_list.do";
+ //閮ㄩ棬鐝骇
+ public final static String DEPARTMENT_QUERY = "queryDepartment/v_dictionary.do";
+
+ //鑱屼綅
+ public final static String POST_QUERY = "queryPost/v_dictionary.do";
+
}
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/Constant.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/Constant.java
index 714b0ca..5d64796 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/Constant.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/Constant.java
@@ -32,6 +32,8 @@
public static final int RESOLUTION = 6;
public static final int PROTOCOL = 7;
public static final int CAMERA_BRAND = 8;
+ public static final int POST = 9;
+ public static final int DEPARTMENT = 10;
}
public static class TabType {
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/SurveillanceQueryItemUtil.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/SurveillanceQueryItemUtil.java
index e90b449..21a6ad2 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/SurveillanceQueryItemUtil.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/SurveillanceQueryItemUtil.java
@@ -44,7 +44,9 @@
public void addItem(SurveillanceQueryItem returnItem, SurveillanceQueryItem requestItem, String cameraInOrOut) {
if (!CommonVariables.FACE_SERVER) {
- RtspFaceNative.setFaceLabel(Integer.parseInt(cameraInOrOut), requestItem.getStTrackId(), returnItem.getVisitorType());
+ RtspFaceNative.setFaceLabel(Integer.parseInt(cameraInOrOut), requestItem.getStTrackId(), returnItem.getVisitorType()==null?"":returnItem.getVisitorType().substring(0,
+ returnItem.getVisitorType().length() > 3 ? 3 : returnItem.getVisitorType().length()
+ ));
}
returnItem.setCreateTime(new Date());
returnItem.setStTrackId(requestItem.getStTrackId());
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/register/RegisterRightFieldLabelView.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/register/RegisterRightFieldLabelView.java
index 67cf543..6d06078 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/register/RegisterRightFieldLabelView.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/register/RegisterRightFieldLabelView.java
@@ -12,6 +12,8 @@
import com.lidroid.xutils.view.annotation.ViewInject;
import com.lidroid.xutils.view.annotation.event.OnClick;
+import cn.com.basic.face.discern.common.CommonVariables;
+import cn.com.basic.face.fragment.AttenderRegisterFragment;
import cn.com.basic.face.fragment.VisitorRegisterFragment;
public class RegisterRightFieldLabelView extends LinearLayout {
@@ -79,10 +81,18 @@
public void fragment_register_right_label_image_click(View view) {
String label = fragment_register_right_label_label.getText().toString();
if ("鎬у埆锛�".equals(label)) {
- VisitorRegisterFragment.getInstance().fragment_visitor_register_gender_click(view);
+ if (CommonVariables.Register.VISITOR_REGISTER_SELECTED) {
+ VisitorRegisterFragment.getInstance().fragment_visitor_register_gender_click(view);
+ } else {
+ AttenderRegisterFragment.getInstance().fragment_attender_register_gender_click(view);
+ }
}
if ("璇佷欢绫诲瀷锛�".equals(label)) {
- VisitorRegisterFragment.getInstance().fragment_visitor_register_id_class_click(view);
+ if (CommonVariables.Register.VISITOR_REGISTER_SELECTED) {
+ VisitorRegisterFragment.getInstance().fragment_visitor_register_id_class_click(view);
+ } else {
+ AttenderRegisterFragment.getInstance().fragment_attender_register_id_class_click(view);
+ }
}
if ("鍥界睄锛�".equals(label)) {
VisitorRegisterFragment.getInstance().fragment_visitor_register_country_click(view);
@@ -93,6 +103,12 @@
if ("璁垮绫诲瀷锛�".equals(label)) {
VisitorRegisterFragment.getInstance().fragment_visitor_register_visitor_class_click(view);
}
+ if ("鑱屽姟锛�".equals(label)) {
+ AttenderRegisterFragment.getInstance().fragment_attender_register_post_click(view);
+ }
+ if ("閮ㄩ棬/鐝骇锛�".equals(label)) {
+ AttenderRegisterFragment.getInstance().fragment_attender_register_department_click(view);
+ }
}
}
--
Gitblit v1.8.0