From c7fe31931a26a941ca2adf002e40b47a049a604c Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期四, 27 四月 2017 11:07:57 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/SurveillanceFragment.java | 97 ++++++++++++++++++++++++++++--------------------
1 files changed, 57 insertions(+), 40 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 0bf2b53..c39767f 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
@@ -15,7 +15,6 @@
import cn.com.basic.face.base.MainActivity;
import cn.com.basic.face.discern.query.item.CheckInQueryItem;
-import cn.com.basic.face.discern.query.item.FacePhotoItem;
import cn.com.basic.face.discern.query.item.SurveillanceQueryItem;
import cn.com.basic.face.fragment.*;
import cn.com.basic.face.util.AppApi;
@@ -37,7 +36,7 @@
@Override
public void onBindRecycleViewHolder(EasyRecyclerViewHolder viewHolder, int position) {
- switch (((SurveillanceQueryItem)getList().get(position)).getType()){
+ switch (((SurveillanceQueryItem)getList().get(position)).getRegisterOrCheckIn()){
case Constant.Surveillance.VISIT_REGISTER_ITEM_TYPE:
RegisterCellViewFillData(viewHolder,position);
break;
@@ -49,7 +48,7 @@
@Override
public int getRecycleViewItemType(int position) {
- switch (((SurveillanceQueryItem)getList().get(position)).getType()) {
+ switch (((SurveillanceQueryItem)getList().get(position)).getRegisterOrCheckIn()) {
case Constant.Surveillance.VISIT_REGISTER_ITEM_TYPE:
return Constant.Surveillance.REGISTER_CELL_VIEW_INDEX;
case Constant.Surveillance.VISIT_CHECK_IN_ITEM_TYPE:
@@ -61,7 +60,7 @@
}
/**
- * 璁垮->浜哄憳娉ㄥ唽
+ * 浜哄憳娉ㄥ唽
*/
private void RegisterCellViewFillData(EasyRecyclerViewHolder holder, int position){
@@ -69,8 +68,6 @@
ViewGroup.LayoutParams layoutParams = mLayout.getLayoutParams();
layoutParams.height = WindowsUtil.dip2px(context, 127);
layoutParams.width = WindowsUtil.dip2px(context, 104);
-// layoutParams.height = WindowsUtil.px2dip(context, 480);
-// layoutParams.width = WindowsUtil.px2dip(context, 640);
mLayout.setLayoutParams(layoutParams);
final Object data = this.getItem(position);
@@ -84,7 +81,11 @@
if (item.getImagePath() != null && !item.getImagePath().equals("")) {
fragment_home_bottom_register_cell_photo.setImageURI(Uri.parse(AppApi.IMAGE_URL_BASE +item.getImagePath()));
} else {
- fragment_home_bottom_register_cell_photo.setImageResource(R.drawable.u45);
+ if (item.getBitmap() != null) {
+ fragment_home_bottom_register_cell_photo.setImageBitmap(item.getBitmap());
+ } else {
+ fragment_home_bottom_register_cell_photo.setImageResource(R.drawable.u45);
+ }
}
fragment_home_bottom_register_cell_to_register.setOnClickListener(new View.OnClickListener(){
@@ -92,13 +93,17 @@
public void onClick(View view) {
MainActivity.selectPage(1);
RegisterFragment.getInstance().setRegisterInfo(getVo(item));
+ if(item.getBitmap() != null) {
+ RegisterFragment.getInstance().setChoosePhoto(item.getBitmap());
+ RegisterFragment.getInstance().setSurveillanceQueryItem(item);
+ }
}
});
}
}
/**
- * 璁垮->鏉ヨ鐧昏
+ * 鏉ヨ鐧昏
*/
private void checkInCellViewFillData(EasyRecyclerViewHolder holder, int position){
@@ -106,8 +111,6 @@
ViewGroup.LayoutParams layoutParams = mLayout.getLayoutParams();
layoutParams.height = WindowsUtil.dip2px(context, 127);
layoutParams.width = WindowsUtil.dip2px(context, 104);
-// layoutParams.height = WindowsUtil.px2dip(context, 480);
-// layoutParams.width = WindowsUtil.px2dip(context, 640);
mLayout.setLayoutParams(layoutParams);
ImageView fragment_home_bottom_visitor_cell_photo = (ImageView) mLayout.findViewById(R.id.fragment_home_bottom_visitor_cell_photo);
@@ -115,36 +118,36 @@
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);
- }
- }
+// 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) {
@@ -154,7 +157,11 @@
if (item.getImagePath() != null && !item.getImagePath().equals("")) {
fragment_home_bottom_visitor_cell_photo.setImageURI(Uri.parse(AppApi.IMAGE_URL_BASE +item.getImagePath()));
} else {
- fragment_home_bottom_visitor_cell_photo.setImageResource(R.drawable.u45);
+ if (item.getBitmap() != null) {
+ fragment_home_bottom_visitor_cell_photo.setImageBitmap(item.getBitmap());
+ } else {
+ fragment_home_bottom_visitor_cell_photo.setImageResource(R.drawable.u45);
+ }
}
if (1==1) {
fragment_home_bottom_visitor_cell_status.setBackground(context.getDrawable(R.drawable.rectangle_textview));
@@ -167,9 +174,19 @@
cn.com.basic.face.fragment.CheckInFragment.getInstance().
getFragment_check_in_right_visitor_cell()
.setVisitorInfo(getVo(item));
+ if (item.getBitmap() != null && (item.getImagePath() == null || "".equals(item.getImagePath()))) {
+ cn.com.basic.face.fragment.CheckInFragment.getInstance().
+ getFragment_check_in_right_visitor_cell().setPhoto(item.getBitmap());
+ }
}
});
}
+ 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);
+ }
+
}
}
--
Gitblit v1.8.0