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,8 +76,8 @@ 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; if (data instanceof SurveillanceQueryItem) { final SurveillanceQueryItem item = (SurveillanceQueryItem)data; fragment_home_bottom_register_cell_photo.setImageURI(Uri.parse(AppApi.IMAGEURL_BASE +item.getImagePath())); fragment_home_bottom_register_cell_to_register.setOnClickListener(new View.OnClickListener(){ @Override @@ -135,8 +138,8 @@ } 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())); if (1==1) { @@ -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) { } VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/SurveillanceQueryItem.java
File was renamed from VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/SupervisoryQueryItem.java @@ -1,7 +1,7 @@ package cn.com.basic.face.discern.query.item; public class SupervisoryQueryItem { public class SurveillanceQueryItem { // 人员主键 private String id; VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/SurveillanceFragment.java
@@ -17,11 +17,6 @@ import com.lidroid.xutils.view.annotation.ViewInject; /** * Created by zhangbo on 2017/2/15. */ public class SurveillanceFragment extends BaseFragment { @ViewInject(R.id.fragment_supervisory_bottom_left_radio_group) @@ -82,12 +77,6 @@ RtspFaceNative.createPlayer(1, "rtsp://admin:admin12345@192.168.1.70:554/h264/ch1/sub/av_stream"); RtspFaceNative.createPlayer(2, "rtsp://admin:admin12345@192.168.1.70:554/h264/ch1/sub/av_stream"); } else { // fragment_supervisory_enter_camera.setVideoURI(Uri.parse("rtsp://admin:admin12345@192.168.1.70:554/h264/ch1/sub/av_stream")); // fragment_supervisory_enter_camera.requestFocus(); // fragment_supervisory_enter_camera.start(); // fragment_supervisory_exit_camera.setVideoURI(Uri.parse("rtsp://admin:admin12345@192.168.1.70:554/h264/ch1/main/av_stream")); // fragment_supervisory_exit_camera.requestFocus(); // fragment_supervisory_exit_camera.start(); } } catch (Exception e) { e.printStackTrace(); VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/SurvalanceMng.java
@@ -7,7 +7,7 @@ import java.util.List; import cn.com.basic.face.discern.common.BaseCommonCallBack; import cn.com.basic.face.discern.query.item.SupervisoryQueryItem; import cn.com.basic.face.discern.query.item.SurveillanceQueryItem; import cn.com.basic.face.fragment.SurveillanceFragment; import cn.com.basic.face.util.AppApi; import cn.com.basic.face.util.Constant; @@ -26,10 +26,10 @@ // params.addBodyParameter(VisitorQueryCondition.FieldNames.notCompanyId, BaseApplication.getInstance().getPlace().getCompanyId()); x.http().post(params, new BaseCommonCallBack() { public void success() { List<SupervisoryQueryItem> list = getList(SupervisoryQueryItem.class); List<SurveillanceQueryItem> list = getList(SurveillanceQueryItem.class); if (isVisit) { int i = 0; for (SupervisoryQueryItem item : list) { for (SurveillanceQueryItem item : list) { if (i % 5 == 0) { item.setType(Constant.Supervisory.VISIT_REGISTER_ITEM_TYPE); } else { @@ -38,7 +38,7 @@ i++; } List<SupervisoryQueryItem> doubleList = new ArrayList<SupervisoryQueryItem>(); List<SurveillanceQueryItem> doubleList = new ArrayList<SurveillanceQueryItem>(); fillBlank(list, doubleList); SurveillanceFragment.getInstance().get_fragment_supervisory_bottom_visit_list_view().show(doubleList, true); @@ -50,11 +50,11 @@ } private void fillBlank(List<SupervisoryQueryItem> list, List<SupervisoryQueryItem> doubleList) { List<SupervisoryQueryItem> registerList = new ArrayList<SupervisoryQueryItem>(); List<SupervisoryQueryItem> checkInList = new ArrayList<SupervisoryQueryItem>(); private void fillBlank(List<SurveillanceQueryItem> list, List<SurveillanceQueryItem> doubleList) { List<SurveillanceQueryItem> registerList = new ArrayList<SurveillanceQueryItem>(); List<SurveillanceQueryItem> checkInList = new ArrayList<SurveillanceQueryItem>(); for (SupervisoryQueryItem item : list) { for (SurveillanceQueryItem item : list) { if (item.getType() == Constant.Supervisory.VISIT_REGISTER_ITEM_TYPE) { registerList.add(item); } @@ -63,11 +63,11 @@ } } List<SupervisoryQueryItem> blenderList = new ArrayList<SupervisoryQueryItem>(); List<SurveillanceQueryItem> blenderList = new ArrayList<SurveillanceQueryItem>(); int i = 0, m = 0, n = 0; for (i = 0; i < registerList.size() + checkInList.size(); i++) { SupervisoryQueryItem item; SurveillanceQueryItem item; if (i % 2 == 0 && m < registerList.size()) { item = registerList.get(m); m++; @@ -78,7 +78,7 @@ blenderList.add(item); } for (SupervisoryQueryItem item : blenderList) { for (SurveillanceQueryItem item : blenderList) { if (doubleList.size() % 2 == 0 && item.getType() != Constant.Supervisory.VISIT_REGISTER_ITEM_TYPE) { doubleList.add(getBlankItem()); } @@ -89,8 +89,8 @@ } } private SupervisoryQueryItem getBlankItem() { SupervisoryQueryItem blankItem = new SupervisoryQueryItem(); private SurveillanceQueryItem getBlankItem() { SurveillanceQueryItem blankItem = new SurveillanceQueryItem(); blankItem.setType(Constant.Supervisory.VISIT_BLANK_ITEM_TYPE); return blankItem; } VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/Constant.java
@@ -30,4 +30,14 @@ public static final int VISIT_REASON = 4; } public static class TabType { public static final int SURVEILLANCE = 0; public static final int REGISTER = 1; public static final int CHECK_IN = 2; public static final int PHONE_CALL = 3; public static final int VISIT = 4; public static final int ATTENDANCE = 5; public static final int DEVICE = 6; } } VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/checkin/CheckInRightVisitorCell.java
@@ -16,10 +16,6 @@ import cn.com.basic.face.discern.query.item.CheckInQueryItem; import cn.com.basic.face.util.AppApi; /** * Created by Sinoe on 2017/2/22. */ public class CheckInRightVisitorCell extends LinearLayout{ private CheckInQueryItem item;
