From e1bcafb39828e18a3605d94aad20376484b56b26 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期五, 12 五月 2017 10:07:00 +0800
Subject: [PATCH] 

---
 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/SurveillanceFragment.java |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 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 bec6689..d561e34 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
@@ -16,6 +16,7 @@
 import java.util.List;
 
 import cn.com.basic.face.base.MainActivity;
+import cn.com.basic.face.dialog.SurveillancePhotoDialog;
 import cn.com.basic.face.discern.common.CommonVariables;
 import cn.com.basic.face.discern.query.item.CheckInQueryItem;
 import cn.com.basic.face.discern.query.item.SurveillanceQueryItem;
@@ -98,6 +99,7 @@
                         if(item.getBitmap() != null) {
                             RegisterFragment.getInstance().setChoosePhoto(item.getBitmap());
                             RegisterFragment.getInstance().setSurveillanceQueryItem_selectPhoto(item);
+                            RegisterFragment.selectedSurveillancePhotoId = item.getIdForSelect();
                         }
                     }
                 });
@@ -264,19 +266,19 @@
 
         @Override
         public int[] getItemLayouts() {
-            return new int[]{R.layout.fragment_surveillance_photo_cell, R.layout.fragment_surveillance_bottom_visit_blank_cell};
+            return new int[]{R.layout.fragment_surveillance_photo_cell, R.layout.fragment_surveillance_photo_blank_cell};
         }
 
         @Override
         public void onBindRecycleViewHolder(EasyRecyclerViewHolder viewHolder, int position) {
-            if (((SurveillanceQueryItem)getList().get(position)).getRegisterOrCheckIn() != Constant.Surveillance.VISIT_REGISTER_ITEM_TYPE) {
-                return;
-            }
             RelativeLayout mLayout = viewHolder.findViewById(R.id.fragment_surveillance_photo_cell_relative_layout);
             ViewGroup.LayoutParams layoutParams = mLayout.getLayoutParams();
             layoutParams.height = (int)MainActivity.getInstance().getResources().getDimension(R.dimen.h127dp);
             layoutParams.width = (int)MainActivity.getInstance().getResources().getDimension(R.dimen.h122dp);
             mLayout.setLayoutParams(layoutParams);
+            if (((SurveillanceQueryItem)getList().get(position)).getRegisterOrCheckIn() != Constant.Surveillance.VISIT_REGISTER_ITEM_TYPE) {
+                return;
+            }
 
             ImageView fragment_surveillance_photo_cell_photo = (ImageView) mLayout.findViewById(R.id.fragment_surveillance_photo_cell_photo);
             final View fragment_surveillance_photo_cell_select = mLayout.findViewById(R.id.fragment_surveillance_photo_cell_select);
@@ -294,9 +296,11 @@
                     public void onClick(View v) {
                         if (selectPhotoOrUploadPhoto == CommonVariables.SelectPhotoType.SELECT_PHOTO) {
                             RegisterFragment.getInstance().set_fragment_register_surveillance_photo(item);
+                            RegisterFragment.selectedSurveillancePhotoId = item.getIdForSelect();
                         }
                         if (selectPhotoOrUploadPhoto == CommonVariables.SelectPhotoType.UPLOAD_PHOTO) {
                             RegisterFragment.getInstance().set_fragment_register_upload_custom_photo(item);
+                            RegisterFragment.selectedCustomPhotoId = item.getIdForSelect();
                         }
                         for (SurveillanceQueryItem queryItem : (List<SurveillanceQueryItem>)getList()) {
                             queryItem.setSurveillancePhotoSelected(false);

--
Gitblit v1.8.0