From 15ff843a8c1889b0f66f827f97f22008291dceab Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期四, 06 七月 2017 11:39:45 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/SurveillanceFragment.java | 37 ++++++++++++++++++++-----------------
1 files changed, 20 insertions(+), 17 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 de6f27f..e2d43ba 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
@@ -1,6 +1,7 @@
package cn.com.basic.face.adapter;
import android.content.Context;
+import android.graphics.Color;
import android.net.Uri;
import android.view.View;
import android.view.ViewGroup;
@@ -40,13 +41,16 @@
@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;
+ }
}
}
@@ -86,18 +90,16 @@
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.setImageBitmap(BitmapUtil.getRoundedCornerBitmap(item.getBitmap(),
- (int)MainActivity.getInstance().getResources().getDimension(R.dimen.w10dp)));
+ 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(){
+ fragment_home_bottom_register_cell_photo.setOnClickListener(new View.OnClickListener(){
@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
if(item.getBitmap() != null) {
RegisterFragment.getInstance().setChoosePhoto(item.getBitmap());
RegisterFragment.getInstance().setSurveillanceQueryItem_selectPhoto(item);
@@ -160,8 +162,8 @@
final SurveillanceQueryItem item = (SurveillanceQueryItem)data;
fragment_home_bottom_visitor_cell_name.setText(item.getUsername());
- if (item.getImagePath() != null && !item.getImagePath().equals("")) {
- fragment_home_bottom_visitor_cell_photo.setImageURI(Uri.parse(AppApi.IMAGE_URL_BASE +item.getImagePath()));
+ if (item.getSurveillancePhoto() != null && !item.getSurveillancePhoto().equals("")) {
+ fragment_home_bottom_visitor_cell_photo.setImageURI(Uri.parse(AppApi.IMAGE_URL_BASE +item.getSurveillancePhoto()));
} else {
if (item.getBitmap() != null) {
fragment_home_bottom_visitor_cell_photo.setImageBitmap(BitmapUtil.getRoundedCornerBitmap(item.getBitmap(),
@@ -171,10 +173,8 @@
}
}
if (1==1) {
- 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(){
+ fragment_home_bottom_visitor_cell_photo.setOnClickListener(new View.OnClickListener(){
@Override
public void onClick(View view) {
MainActivity.selectPage(Constant.TabType.CHECK_IN);
@@ -182,9 +182,12 @@
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());
cn.com.basic.face.fragment.CheckInFragment.getInstance().
- getFragment_check_in_right_visitor_cell().setPhoto(item.getBitmap());
+ getFragment_check_in_right_visitor_cell().setPhotoUri(Uri.parse(AppApi.IMAGE_URL_BASE +item.getSurveillancePhoto()));
}
+ cn.com.basic.face.fragment.CheckInFragment.getInstance().selectVisiteeRadio();
}
});
}
--
Gitblit v1.8.0