From 3839ef806215a981ef9b2e83dafaab5e1d694764 Mon Sep 17 00:00:00 2001
From: houxiao <houxiao@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期二, 11 四月 2017 16:22:31 +0800
Subject: [PATCH] detect only develop finished
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/SurveillanceFragment.java | 34 +++++++++++++++++++++-------------
1 files changed, 21 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 ef34297..eb9f265 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
@@ -8,13 +8,16 @@
import android.widget.RelativeLayout;
import android.widget.TextView;
+import com.alibaba.fastjson.JSON;
import com.bsk.zhangbo.demoforbsk.R;
import com.camnter.easyrecyclerview.adapter.EasyRecyclerViewAdapter;
import com.camnter.easyrecyclerview.holder.EasyRecyclerViewHolder;
import cn.com.basic.face.base.MainActivity;
+import cn.com.basic.face.discern.query.item.CheckInQueryItem;
import cn.com.basic.face.discern.query.item.FacePhotoItem;
-import cn.com.basic.face.discern.query.item.SupervisoryQueryItem;
+import cn.com.basic.face.discern.query.item.SurveillanceQueryItem;
+import cn.com.basic.face.fragment.*;
import cn.com.basic.face.util.AppApi;
import cn.com.basic.face.util.Constant;
import cn.com.basic.face.util.WindowsUtil;
@@ -34,7 +37,7 @@
@Override
public void onBindRecycleViewHolder(EasyRecyclerViewHolder viewHolder, int position) {
- switch (((SupervisoryQueryItem)getList().get(position)).getType()){
+ switch (((SurveillanceQueryItem)getList().get(position)).getType()){
case Constant.Supervisory.VISIT_REGISTER_ITEM_TYPE:
RegisterCellViewFillData(viewHolder,position);
break;
@@ -46,7 +49,7 @@
@Override
public int getRecycleViewItemType(int position) {
- switch (((SupervisoryQueryItem)getList().get(position)).getType()) {
+ 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:
@@ -73,14 +76,14 @@
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 SupervisoryQueryItem) {
- final SupervisoryQueryItem item = (SupervisoryQueryItem)data;
- fragment_home_bottom_register_cell_photo.setImageURI(Uri.parse(AppApi.IMAGEURL_BASE +item.getImagePath()));
+ if (data instanceof SurveillanceQueryItem) {
+ final SurveillanceQueryItem item = (SurveillanceQueryItem)data;
+ fragment_home_bottom_register_cell_photo.setImageURI(Uri.parse(AppApi.IMAGE_URL_BASE +item.getImagePath()));
fragment_home_bottom_register_cell_to_register.setOnClickListener(new View.OnClickListener(){
@Override
public void onClick(View view) {
MainActivity.selectPage(1);
- //RegisterFragment.getInstance().setRegisterInfo(item);
+ RegisterFragment.getInstance().setRegisterInfo(getVo(item));
}
});
}
@@ -135,10 +138,10 @@
}
fragment_home_bottom_visitor_cell_name.setText("");
- if (data instanceof SupervisoryQueryItem) {
- final SupervisoryQueryItem item = (SupervisoryQueryItem)data;
+ 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.IMAGEURL_BASE +item.getImagePath()));
+ fragment_home_bottom_visitor_cell_photo.setImageURI(Uri.parse(AppApi.IMAGE_URL_BASE +item.getImagePath()));
if (1==1) {
fragment_home_bottom_visitor_cell_status.setBackground(context.getDrawable(R.drawable.rectangle_textview));
@@ -146,9 +149,10 @@
fragment_home_bottom_visitor_cell_status.setOnClickListener(new View.OnClickListener(){
@Override
public void onClick(View view) {
- MainActivity.selectPage(2);
- //CheckInFragment.getInstance().checkInFromHomePage(item);
- //CheckInFragment.getInstance().getFragment_check_in_right_visitor_cell().setVisitorInfo(item);
+ MainActivity.selectPage(Constant.TabType.CHECK_IN);
+ cn.com.basic.face.fragment.CheckInFragment.getInstance().
+ getFragment_check_in_right_visitor_cell()
+ .setVisitorInfo(getVo(item));
}
});
}
@@ -156,6 +160,10 @@
}
+ private CheckInQueryItem getVo(SurveillanceQueryItem item) {
+ return JSON.parseObject(JSON.toJSONString(item), CheckInQueryItem.class);
+ }
+
public void setRowType(int i) {
}
--
Gitblit v1.8.0