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 | 120 ++++++++++++++++++++++++++++++++++++------------------------ 1 files changed, 72 insertions(+), 48 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 eb9f265..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 @@ -38,10 +38,10 @@ @Override public void onBindRecycleViewHolder(EasyRecyclerViewHolder viewHolder, int position) { switch (((SurveillanceQueryItem)getList().get(position)).getType()){ - case Constant.Supervisory.VISIT_REGISTER_ITEM_TYPE: + case Constant.Surveillance.VISIT_REGISTER_ITEM_TYPE: RegisterCellViewFillData(viewHolder,position); break; - case Constant.Supervisory.VISIT_CHECK_IN_ITEM_TYPE: + case Constant.Surveillance.VISIT_CHECK_IN_ITEM_TYPE: checkInCellViewFillData(viewHolder,position); break; } @@ -50,20 +50,20 @@ @Override public int getRecycleViewItemType(int position) { switch (((SurveillanceQueryItem)getList().get(position)).getType()) { - case Constant.Supervisory.VISIT_REGISTER_ITEM_TYPE: - return Constant.Supervisory.REGISTER_CELL_VIEW_INDEX; - case Constant.Supervisory.VISIT_CHECK_IN_ITEM_TYPE: - return Constant.Supervisory.CHECK_IN_CELL_VIEW_INDEX; - case Constant.Supervisory.VISIT_BLANK_ITEM_TYPE: - return Constant.Supervisory.VISIT_BLANK_CELL_VIEW_INDEX; + case Constant.Surveillance.VISIT_REGISTER_ITEM_TYPE: + return Constant.Surveillance.REGISTER_CELL_VIEW_INDEX; + case Constant.Surveillance.VISIT_CHECK_IN_ITEM_TYPE: + return Constant.Surveillance.CHECK_IN_CELL_VIEW_INDEX; + case Constant.Surveillance.VISIT_BLANK_ITEM_TYPE: + return Constant.Surveillance.VISIT_BLANK_CELL_VIEW_INDEX; } - return Constant.Supervisory.VISIT_BLANK_CELL_VIEW_INDEX; + return Constant.Surveillance.VISIT_BLANK_CELL_VIEW_INDEX; } /** - * 璁垮->浜哄憳娉ㄥ唽 + * 浜哄憳娉ㄥ唽 */ - private void RegisterCellViewFillData(EasyRecyclerViewHolder holder, int posistion){ + private void RegisterCellViewFillData(EasyRecyclerViewHolder holder, int position){ RelativeLayout mLayout = holder.findViewById(R.id.fragment_home_bottom_register_cell_relative_layout); ViewGroup.LayoutParams layoutParams = mLayout.getLayoutParams(); @@ -71,28 +71,41 @@ layoutParams.width = WindowsUtil.dip2px(context, 104); mLayout.setLayoutParams(layoutParams); - final Object data = this.getItem(posistion); + final Object data = this.getItem(position); ImageView fragment_home_bottom_register_cell_photo = holder.findViewById(R.id.fragment_home_bottom_register_cell_photo); TextView fragment_home_bottom_register_cell_to_register = holder.findViewById(R.id.fragment_home_bottom_register_cell_to_register); if (data instanceof SurveillanceQueryItem) { final SurveillanceQueryItem item = (SurveillanceQueryItem)data; - fragment_home_bottom_register_cell_photo.setImageURI(Uri.parse(AppApi.IMAGE_URL_BASE +item.getImagePath())); + + if (item.getImagePath() != null && !item.getImagePath().equals("")) { + 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(item.getBitmap()); + } else { + fragment_home_bottom_register_cell_photo.setImageResource(R.drawable.u45); + } + } + fragment_home_bottom_register_cell_to_register.setOnClickListener(new View.OnClickListener(){ @Override 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 posistion){ + private void checkInCellViewFillData(EasyRecyclerViewHolder holder, int position){ RelativeLayout mLayout = holder.findViewById(R.id.fragment_supervisory_bottom_visitor_cell_relative_layout); ViewGroup.LayoutParams layoutParams = mLayout.getLayoutParams(); @@ -104,44 +117,51 @@ TextView fragment_home_bottom_visitor_cell_warning = (TextView) mLayout.findViewById(R.id.fragment_home_bottom_visitor_cell_warning); TextView fragment_home_bottom_visitor_cell_name = (TextView) mLayout.findViewById(R.id.fragment_home_bottom_visitor_cell_name); TextView fragment_home_bottom_visitor_cell_status = (TextView) mLayout.findViewById(R.id.fragment_home_bottom_visitor_cell_status); - //statusTv.setText(""); - Object data = this.getItem(posistion); - 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); - } - } + 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); +// } +// } fragment_home_bottom_visitor_cell_name.setText(""); if (data instanceof SurveillanceQueryItem) { final SurveillanceQueryItem item = (SurveillanceQueryItem)data; - fragment_home_bottom_visitor_cell_name.setText(item.getName()); - fragment_home_bottom_visitor_cell_photo.setImageURI(Uri.parse(AppApi.IMAGE_URL_BASE +item.getImagePath())); + 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())); + } else { + 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)); @@ -153,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