From 5838c9545e775d9f0586e2b654ed538d9a85ee51 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期二, 20 六月 2017 09:57:31 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/SurveillanceFragment.java | 35 ++++++++++++++++++++++++-----------
1 files changed, 24 insertions(+), 11 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 d561e34..403af37 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
@@ -22,6 +22,7 @@
import cn.com.basic.face.discern.query.item.SurveillanceQueryItem;
import cn.com.basic.face.fragment.*;
import cn.com.basic.face.util.AppApi;
+import cn.com.basic.face.util.BitmapUtil;
import cn.com.basic.face.util.Constant;
public class SurveillanceFragment {
@@ -39,14 +40,18 @@
@Override
public void onBindRecycleViewHolder(EasyRecyclerViewHolder viewHolder, int position) {
- switch (((SurveillanceQueryItem)getList().get(position)).getRegisterOrCheckIn()){
- case Constant.Surveillance.VISIT_REGISTER_ITEM_TYPE:
- RegisterCellViewFillData(viewHolder,position);
- break;
- case Constant.Surveillance.VISIT_CHECK_IN_ITEM_TYPE:
- checkInCellViewFillData(viewHolder,position);
- break;
+ Object obj = getList().get(position);
+ if (obj instanceof SurveillanceQueryItem) {
+ switch (((SurveillanceQueryItem)getList().get(position)).getRegisterOrCheckIn()){
+ case Constant.Surveillance.VISIT_REGISTER_ITEM_TYPE:
+ RegisterCellViewFillData(viewHolder,position);
+ break;
+ case Constant.Surveillance.VISIT_CHECK_IN_ITEM_TYPE:
+ checkInCellViewFillData(viewHolder,position);
+ break;
+ }
}
+
}
@Override
@@ -85,7 +90,10 @@
fragment_home_bottom_register_cell_photo.setImageURI(Uri.parse(AppApi.IMAGE_URL_BASE +item.getImagePath()));
} else {
if (item.getBitmap() != null) {
+ //fragment_home_bottom_register_cell_photo.setImageResource(R.drawable.u45);
fragment_home_bottom_register_cell_photo.setImageBitmap(item.getBitmap());
+// fragment_home_bottom_register_cell_photo.setImageBitmap(BitmapUtil.getRoundedCornerBitmap(item.getBitmap(),
+// (int)MainActivity.getInstance().getResources().getDimension(R.dimen.w10dp)));
} else {
fragment_home_bottom_register_cell_photo.setImageResource(R.drawable.u45);
}
@@ -95,7 +103,7 @@
@Override
public void onClick(View view) {
MainActivity.selectPage(1);
- RegisterFragment.getInstance().setRegisterInfo(getVo(item));//java.lang.OutOfMemoryError: Failed to allocate a 25338980 byte allocation with 15827186 free bytes and 15MB until OOM
+// RegisterFragment.getInstance().setRegisterInfo(getVo(item));//java.lang.OutOfMemoryError: Failed to allocate a 25338980 byte allocation with 15827186 free bytes and 15MB until OOM
if(item.getBitmap() != null) {
RegisterFragment.getInstance().setChoosePhoto(item.getBitmap());
RegisterFragment.getInstance().setSurveillanceQueryItem_selectPhoto(item);
@@ -162,7 +170,8 @@
fragment_home_bottom_visitor_cell_photo.setImageURI(Uri.parse(AppApi.IMAGE_URL_BASE +item.getImagePath()));
} else {
if (item.getBitmap() != null) {
- fragment_home_bottom_visitor_cell_photo.setImageBitmap(item.getBitmap());
+ fragment_home_bottom_visitor_cell_photo.setImageBitmap(BitmapUtil.getRoundedCornerBitmap(item.getBitmap(),
+ (int)MainActivity.getInstance().getResources().getDimension(R.dimen.w10dp)));
} else {
fragment_home_bottom_visitor_cell_photo.setImageResource(R.drawable.u45);
}
@@ -238,7 +247,10 @@
fragment_home_bottom_attendance_cell_photo.setImageURI(Uri.parse(AppApi.IMAGE_URL_BASE +item.getImagePath()));
} else {
if (item.getBitmap() != null) {
- fragment_home_bottom_attendance_cell_photo.setImageBitmap(item.getBitmap());
+ fragment_home_bottom_attendance_cell_photo.setImageBitmap(
+ BitmapUtil.getRoundedCornerBitmap(item.getBitmap(),
+ (int)MainActivity.getInstance().getResources().getDimension(R.dimen.w10dp))
+ );
} else {
fragment_home_bottom_attendance_cell_photo.setImageResource(R.drawable.u45);
}
@@ -314,7 +326,8 @@
fragment_surveillance_photo_cell_photo.setImageURI(Uri.parse(AppApi.IMAGE_URL_BASE +item.getImagePath()));
} else {
if (item.getBitmap() != null) {
- fragment_surveillance_photo_cell_photo.setImageBitmap(item.getBitmap());
+ fragment_surveillance_photo_cell_photo.setImageBitmap(BitmapUtil.getRoundedCornerBitmap(item.getBitmap(),
+ (int)MainActivity.getInstance().getResources().getDimension(R.dimen.w10dp)));
} else {
fragment_surveillance_photo_cell_photo.setImageResource(R.drawable.u45);
}
--
Gitblit v1.8.0