From 851f3674eb5aa96eda84424d99ef11dcd9366e6c Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期二, 18 四月 2017 17:18:35 +0800
Subject: [PATCH] 

---
 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/SurveillanceMng.java                  |   26 ++++----------------------
 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/SurveillanceQueryItem.java |   11 +++++++++++
 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/SurveillanceFragment.java             |   12 ++++++++++--
 3 files changed, 25 insertions(+), 24 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..902b73c 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
@@ -84,7 +84,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(){
@@ -154,7 +158,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));
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/SurveillanceQueryItem.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/SurveillanceQueryItem.java
index a9a7b64..9490371 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/SurveillanceQueryItem.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/SurveillanceQueryItem.java
@@ -1,6 +1,8 @@
 package cn.com.basic.face.discern.query.item;
 
 
+import android.graphics.Bitmap;
+
 public class SurveillanceQueryItem {
 
 	// 浜哄憳涓婚敭
@@ -16,6 +18,7 @@
 	// 绉诲姩鐢佃瘽
 	private String mobilePhone;
 	private int type;
+	private Bitmap bitmap;
 
 	/**
 	 * Get 浜哄憳涓婚敭
@@ -115,4 +118,12 @@
 	public int getType() {
 		return type;
 	}
+
+	public void setBitmap(Bitmap bitmap) {
+		this.bitmap = bitmap;
+	}
+
+	public Bitmap getBitmap() {
+		return bitmap;
+	}
 }
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/SurveillanceMng.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/SurveillanceMng.java
index 901937e..8c3a5aa 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/SurveillanceMng.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/SurveillanceMng.java
@@ -56,25 +56,6 @@
         });
     }
 
-    public List getRegisterList() {
-        return new ArrayList();
-    }
-
-    public List getCheckInList() {
-        return new ArrayList();
-    }
-
-    public void getList() {
-        List registerList = new ArrayList();
-        List checkInList = new ArrayList();
-        List blendInList = blendIn(registerList, checkInList);
-        SurveillanceFragment.getInstance().get_fragment_supervisory_bottom_visit_list_view().show(null, true);
-    }
-
-    public List blendIn(List registerList, List checkInList) {
-        return null;
-    }
-
     public void addBitmap(final List<Bitmap> bitmapList, byte[] byteArray, int len) {
         RequestParams params = new RequestParams(AppApi.BASE_URL +AppApi.SURVEILLANCE_UPLOAD);
         params.addBodyParameter("base64Photo", Base64.encodeToString(byteArray, 0, len, Base64.DEFAULT));
@@ -87,6 +68,10 @@
                 if (item.getType() == CommonVariables.Surveillance.VISIT_REGISTER_ITEM_TYPE
                         || item.getType() == CommonVariables.Surveillance.VISIT_CHECK_IN_ITEM_TYPE
                         ) {
+                    if (bitmapList != null && bitmapList.size() > 0) {
+                        item.setBitmap(bitmapList.get(0));
+                    }
+
                     List<SurveillanceQueryItem> doubleList = new ArrayList<SurveillanceQueryItem>();
 
                     List list = SurveillanceFragment.getInstance().get_fragment_supervisory_bottom_visit_list_view().getPrevList();
@@ -99,9 +84,6 @@
 
             }
         });
-        if (bitmapList != null && bitmapList.size() > 0) {
-            //RegisterFragment.getInstance().get_fragment_register_choose_photo().setImageBitmap(bitmapList.get(0));
-        }
     }
 
     private void fillBlank(List<SurveillanceQueryItem> list, List<SurveillanceQueryItem> doubleList) {

--
Gitblit v1.8.0