From 2ae0446917184b36996823e9dbf452dba82e8994 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期五, 21 四月 2017 12:31:44 +0800
Subject: [PATCH] 

---
 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/SurveillanceFragment.java |   84 +++++++++++++++++++++++------------------
 1 files changed, 47 insertions(+), 37 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..9827445 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
@@ -61,7 +61,7 @@
         }
 
         /**
-         * 璁垮->浜哄憳娉ㄥ唽
+         * 浜哄憳娉ㄥ唽
          */
         private void RegisterCellViewFillData(EasyRecyclerViewHolder holder, int position){
 
@@ -69,8 +69,6 @@
             ViewGroup.LayoutParams layoutParams = mLayout.getLayoutParams();
             layoutParams.height = WindowsUtil.dip2px(context, 127);
             layoutParams.width = WindowsUtil.dip2px(context, 104);
-//            layoutParams.height = WindowsUtil.px2dip(context, 480);
-//            layoutParams.width = WindowsUtil.px2dip(context, 640);
             mLayout.setLayoutParams(layoutParams);
 
             final Object data = this.getItem(position);
@@ -84,7 +82,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(){
@@ -92,13 +94,16 @@
                     public void onClick(View view) {
                         MainActivity.selectPage(1);
                         RegisterFragment.getInstance().setRegisterInfo(getVo(item));
+                        if(item.getBitmap() != null) {
+                            RegisterFragment.getInstance().setChoosePhoto(item.getBitmap());
+                        }
                     }
                 });
             }
         }
 
         /**
-         * 璁垮->鏉ヨ鐧昏
+         * 鏉ヨ鐧昏
          */
         private void checkInCellViewFillData(EasyRecyclerViewHolder holder, int position){
 
@@ -106,8 +111,6 @@
             ViewGroup.LayoutParams layoutParams = mLayout.getLayoutParams();
             layoutParams.height = WindowsUtil.dip2px(context, 127);
             layoutParams.width = WindowsUtil.dip2px(context, 104);
-//            layoutParams.height = WindowsUtil.px2dip(context, 480);
-//            layoutParams.width = WindowsUtil.px2dip(context, 640);
             mLayout.setLayoutParams(layoutParams);
 
             ImageView fragment_home_bottom_visitor_cell_photo = (ImageView) mLayout.findViewById(R.id.fragment_home_bottom_visitor_cell_photo);
@@ -116,35 +119,34 @@
             TextView fragment_home_bottom_visitor_cell_status = (TextView) mLayout.findViewById(R.id.fragment_home_bottom_visitor_cell_status);
 
             Object data = this.getItem(position);
-            if (data instanceof FacePhotoItem) {
-                final FacePhotoItem item = (FacePhotoItem) data;
-
-                if (item.getWarning().length() > 0 && "鏉ヨ鐧昏".equals(item.getStatus())) {
-                    //warningTv.setText("璀﹀憡");
-                    fragment_home_bottom_visitor_cell_warning.setVisibility(View.VISIBLE);
-                } else {
-                    fragment_home_bottom_visitor_cell_warning.setVisibility(View.GONE);
-                }
-
-
-                fragment_home_bottom_visitor_cell_name.setText(item.getName());
-
-                fragment_home_bottom_visitor_cell_status.setText(item.getStatus());
-                if ("鏉ヨ鐧昏".equals(item.getStatus())) {
-                    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(){
-                        @Override
-                        public void onClick(View view) {
-                            MainActivity.selectPage(2);
-                        }
-                    });
-                } else {
-                    fragment_home_bottom_visitor_cell_status.setBackground(null);
-                    fragment_home_bottom_visitor_cell_status.setOnClickListener(null);
-                }
-            }
+//            if (data instanceof FacePhotoItem) {
+//                final FacePhotoItem item = (FacePhotoItem) data;
+//
+//                if (item.getWarning().length() > 0 && "鏉ヨ鐧昏".equals(item.getStatus())) {
+//                    //warningTv.setText("璀﹀憡");
+//                    fragment_home_bottom_visitor_cell_warning.setVisibility(View.VISIBLE);
+//                } else {
+//                    fragment_home_bottom_visitor_cell_warning.setVisibility(View.GONE);
+//                }
+//
+//                fragment_home_bottom_visitor_cell_name.setText(item.getName());
+//
+//                fragment_home_bottom_visitor_cell_status.setText(item.getStatus());
+//                if ("鏉ヨ鐧昏".equals(item.getStatus())) {
+//                    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(){
+//                        @Override
+//                        public void onClick(View view) {
+//                            MainActivity.selectPage(2);
+//                        }
+//                    });
+//                } else {
+//                    fragment_home_bottom_visitor_cell_status.setBackground(null);
+//                    fragment_home_bottom_visitor_cell_status.setOnClickListener(null);
+//                }
+//            }
 
             fragment_home_bottom_visitor_cell_name.setText("");
             if (data instanceof SurveillanceQueryItem) {
@@ -154,7 +156,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));
@@ -167,6 +173,10 @@
                             cn.com.basic.face.fragment.CheckInFragment.getInstance().
                                     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());
+                            }
                         }
                     });
                 }

--
Gitblit v1.8.0