From f6fcbe3c965b4ad906ac8b327bb5b301c0ebd348 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期三, 28 六月 2017 11:53:38 +0800
Subject: [PATCH] 

---
 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/SurveillanceFragment.java |   36 +++++++++++++++++++++++-------------
 1 files changed, 23 insertions(+), 13 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 1c633ef..4889f49 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
@@ -40,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
@@ -86,8 +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.setImageBitmap(BitmapUtil.getRoundedCornerBitmap(item.getBitmap(),
-                                (int)MainActivity.getInstance().getResources().getDimension(R.dimen.w10dp)));
+                        //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);
                     }
@@ -160,11 +166,12 @@
                 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(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);
                     }
@@ -240,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);
                     }

--
Gitblit v1.8.0