From 3a233b6f416cc51c64a56b7f648a6164ae14c393 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期四, 20 七月 2017 15:45:20 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/SurveillanceFragment.java | 103 +++++++++++++++++++++++++++------------------------
1 files changed, 55 insertions(+), 48 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 e2d43ba..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
@@ -17,7 +17,6 @@
import java.util.List;
import cn.com.basic.face.base.MainActivity;
-import cn.com.basic.face.dialog.SurveillancePhotoDialog;
import cn.com.basic.face.discern.common.CommonVariables;
import cn.com.basic.face.discern.query.item.CheckInQueryItem;
import cn.com.basic.face.discern.query.item.SurveillanceQueryItem;
@@ -101,9 +100,9 @@
public void onClick(View view) {
MainActivity.selectPage(1);
if(item.getBitmap() != null) {
- RegisterFragment.getInstance().setChoosePhoto(item.getBitmap());
- RegisterFragment.getInstance().setSurveillanceQueryItem_selectPhoto(item);
- RegisterFragment.selectedSurveillancePhotoId = item.getIdForSelect();
+ VisitorRegisterFragment.getInstance().setChoosePhoto(item.getBitmap());
+ VisitorRegisterFragment.getInstance().setSurveillanceQueryItem_selectPhoto(item);
+ VisitorRegisterFragment.selectedSurveillancePhotoId = item.getIdForSelect();
}
}
});
@@ -126,41 +125,24 @@
TextView fragment_home_bottom_visitor_cell_name = (TextView) mLayout.findViewById(R.id.fragment_home_bottom_visitor_cell_name);
TextView fragment_home_bottom_visitor_cell_status = (TextView) mLayout.findViewById(R.id.fragment_home_bottom_visitor_cell_status);
-
Object data = this.getItem(position);
-// if (data instanceof FacePhotoItem) {
-// final FacePhotoItem item = (FacePhotoItem) data;
-//
-// if (item.getWarning().length() > 0 && "鏉ヨ鐧昏".equals(item.getStatus())) {
-// //warningTv.setText("璀﹀憡");
-// fragment_home_bottom_visitor_cell_warning.setVisibility(View.VISIBLE);
-// } else {
-// fragment_home_bottom_visitor_cell_warning.setVisibility(View.GONE);
-// }
-//
-// fragment_home_bottom_visitor_cell_name.setText(item.getName());
-//
-// fragment_home_bottom_visitor_cell_status.setText(item.getStatus());
-// if ("鏉ヨ鐧昏".equals(item.getStatus())) {
-// fragment_home_bottom_visitor_cell_status.setBackground(context.getDrawable(R.drawable.rectangle_textview));
-//
-// fragment_home_bottom_visitor_cell_status.setHeight((int)(context.getResources().getDisplayMetrics().density * 45));
-// fragment_home_bottom_visitor_cell_status.setOnClickListener(new View.OnClickListener(){
-// @Override
-// public void onClick(View view) {
-// MainActivity.selectPage(2);
-// }
-// });
-// } else {
-// fragment_home_bottom_visitor_cell_status.setBackground(null);
-// fragment_home_bottom_visitor_cell_status.setOnClickListener(null);
-// }
-// }
fragment_home_bottom_visitor_cell_name.setText("");
if (data instanceof SurveillanceQueryItem) {
final SurveillanceQueryItem item = (SurveillanceQueryItem)data;
- fragment_home_bottom_visitor_cell_name.setText(item.getUsername());
+ fragment_home_bottom_visitor_cell_warning.setVisibility(View.VISIBLE);
+ if (item.getWarning() != null && item.getWarning().length() > 0) {
+ fragment_home_bottom_visitor_cell_photo.setBackgroundColor(Color.RED);
+ fragment_home_bottom_visitor_cell_warning.setText("璀﹀憡");
+ } else {
+ fragment_home_bottom_visitor_cell_photo.setBackgroundColor(Color.GRAY);
+ if (item.getAuthentication() != null && item.getAuthentication().length() > 0) {
+ fragment_home_bottom_visitor_cell_warning.setText("宸茶璇�");
+ } else {
+ fragment_home_bottom_visitor_cell_warning.setText("鏈璇�");
+ }
+ }
+ fragment_home_bottom_visitor_cell_name.setText(item.getVisitorType());
if (item.getSurveillancePhoto() != null && !item.getSurveillancePhoto().equals("")) {
fragment_home_bottom_visitor_cell_photo.setImageURI(Uri.parse(AppApi.IMAGE_URL_BASE +item.getSurveillancePhoto()));
@@ -174,6 +156,7 @@
}
if (1==1) {
fragment_home_bottom_visitor_cell_status.setHeight((int)(context.getResources().getDisplayMetrics().density * 45));
+ fragment_home_bottom_visitor_cell_status.setText(item.getStatus()); //绂诲紑
fragment_home_bottom_visitor_cell_photo.setOnClickListener(new View.OnClickListener(){
@Override
public void onClick(View view) {
@@ -191,12 +174,6 @@
}
});
}
- if (item.getWarning() != null && "1".equals(item.getWarning())) {
- fragment_home_bottom_visitor_cell_warning.setVisibility(View.VISIBLE);
- } else {
- fragment_home_bottom_visitor_cell_warning.setVisibility(View.INVISIBLE);
- }
-
}
}
@@ -223,6 +200,17 @@
@Override
public void onBindRecycleViewHolder(EasyRecyclerViewHolder viewHolder, int position) {
+ Object obj = getList().get(position);
+ if (obj instanceof SurveillanceQueryItem) {
+ if(((SurveillanceQueryItem)getList().get(position)).getRegisterOrCheckIn() == CommonVariables.Surveillance.VISIT_ATTENDANCE_BLANK) {
+ return;
+ } else {
+
+ }
+ } else {
+ return;
+ }
+
RelativeLayout mLayout = viewHolder.findViewById(R.id.fragment_supervisory_bottom_attendance_cell_relative_layout);
ViewGroup.LayoutParams layoutParams = mLayout.getLayoutParams();
layoutParams.height = (int)MainActivity.getInstance().getResources().getDimension(R.dimen.h127dp);
@@ -238,10 +226,10 @@
fragment_home_bottom_attendance_cell_name.setText("");
if (data instanceof SurveillanceQueryItem) {
final SurveillanceQueryItem item = (SurveillanceQueryItem)data;
- fragment_home_bottom_attendance_cell_name.setText(item.getUsername());
+ fragment_home_bottom_attendance_cell_name.setText(item.getVisitorType());
- if (item.getImagePath() != null && !item.getImagePath().equals("")) {
- fragment_home_bottom_attendance_cell_photo.setImageURI(Uri.parse(AppApi.IMAGE_URL_BASE +item.getImagePath()));
+ if (item.getSurveillancePhoto() != null && !item.getSurveillancePhoto().equals("")) {
+ fragment_home_bottom_attendance_cell_photo.setImageURI(Uri.parse(AppApi.IMAGE_URL_BASE +item.getSurveillancePhoto()));
} else {
if (item.getBitmap() != null) {
fragment_home_bottom_attendance_cell_photo.setImageBitmap(
@@ -258,7 +246,16 @@
@Override
public int getRecycleViewItemType(int position) {
- return 0;
+ int type = ((SurveillanceQueryItem)getList().get(position)).getRegisterOrCheckIn();
+ if (type == CommonVariables.Surveillance.VISIT_ATTENDANCE_IN ||
+ type == CommonVariables.Surveillance.VISIT_ATTENDANCE_OUT
+ ) {
+ return 0;
+ }
+ if (type == CommonVariables.Surveillance.VISIT_ATTENDANCE_BLANK) {
+ return 1;
+ }
+ return 1;
}
private CheckInQueryItem getVo(SurveillanceQueryItem item) {
@@ -304,12 +301,22 @@
@Override
public void onClick(View v) {
if (selectPhotoOrUploadPhoto == CommonVariables.SelectPhotoType.SELECT_PHOTO) {
- RegisterFragment.getInstance().set_fragment_register_surveillance_photo(item);
- RegisterFragment.selectedSurveillancePhotoId = item.getIdForSelect();
+ if (CommonVariables.Register.VISITOR_REGISTER_SELECTED) {
+ 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) {
- RegisterFragment.getInstance().set_fragment_register_upload_custom_photo(item);
- RegisterFragment.selectedCustomPhotoId = item.getIdForSelect();
+ if (CommonVariables.Register.VISITOR_REGISTER_SELECTED) {
+ 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()) {
queryItem.setSurveillancePhotoSelected(false);
--
Gitblit v1.8.0