VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/CheckInRightCellAdapter.java
@@ -17,7 +17,7 @@ import java.util.List; import cn.com.basic.face.discern.query.item.VisitorQueryItem; import cn.com.basic.face.discern.query.item.CheckInQueryItem; /** * Created by Sinoe on 2017/2/23. @@ -85,8 +85,8 @@ @Override public void onClick(View view) { Object data = getList().get(posistion); if (data instanceof VisitorQueryItem) { VisitorQueryItem item = (VisitorQueryItem) data; if (data instanceof CheckInQueryItem) { CheckInQueryItem item = (CheckInQueryItem) data; CheckInFragment.getInstance().setVisitorInfo(item); } } @@ -95,8 +95,8 @@ fragment_check_in_left_visitor_row_name.setText(""); Object data = getList().get(posistion); if (data instanceof VisitorQueryItem) { VisitorQueryItem item = (VisitorQueryItem) data; if (data instanceof CheckInQueryItem) { CheckInQueryItem item = (CheckInQueryItem) data; fragment_check_in_left_visitor_row_name.setText(item.getName()); fragment_check_in_left_visitor_row_photo.setImageURI(Uri.parse(AppApi.IMAGEURL_BASE + item.getImagePath())); } @@ -115,8 +115,8 @@ fragment_check_in_left_interviewee_row_photo = holder.findViewById(R.id.fragment_check_in_left_interviewee_row_photo); Object data = getList().get(posistion); if (data instanceof VisitorQueryItem) { VisitorQueryItem item = (VisitorQueryItem) data; if (data instanceof CheckInQueryItem) { CheckInQueryItem item = (CheckInQueryItem) data; fragment_check_in_left_interviewee_row_name.setText(item.getName()); fragment_check_in_left_interviewee_row_dept.setText(item.getDeptName()); fragment_check_in_left_interviewee_row_photo.setImageURI(Uri.parse(AppApi.IMAGEURL_BASE + item.getImagePath())); @@ -126,8 +126,8 @@ @Override public void onClick(View view) { Object data = getList().get(posistion); if (data instanceof VisitorQueryItem) { VisitorQueryItem item = (VisitorQueryItem) data; if (data instanceof CheckInQueryItem) { CheckInQueryItem item = (CheckInQueryItem) data; CheckInFragment.getInstance().setIntervieweeInfo(item); } } VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/HomeAdapter.java
@@ -20,7 +20,7 @@ import java.util.List; import cn.com.basic.face.discern.query.item.FacePhotoItem; import cn.com.basic.face.discern.query.item.VisitorQueryItem; import cn.com.basic.face.discern.query.item.CheckInQueryItem; /** * Created by zhangbo on 2017/2/15. @@ -85,8 +85,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 VisitorQueryItem) { final VisitorQueryItem item = (VisitorQueryItem)data; if (data instanceof CheckInQueryItem) { final CheckInQueryItem item = (CheckInQueryItem)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 @@ -151,8 +151,8 @@ } fragment_home_bottom_visitor_cell_name.setText(""); if (data instanceof VisitorQueryItem) { final VisitorQueryItem item = (VisitorQueryItem)data; if (data instanceof CheckInQueryItem) { final CheckInQueryItem item = (CheckInQueryItem)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) { VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/CheckInQueryItem.java
File was renamed from VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/VisitorQueryItem.java @@ -1,7 +1,7 @@ package cn.com.basic.face.discern.query.item; public class VisitorQueryItem { public class CheckInQueryItem { // 人员主键 private String id; VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/CheckInFragment.java
@@ -1,7 +1,6 @@ package cn.com.basic.face.fragment; import android.os.Bundle; import android.support.v7.widget.LinearLayoutManager; import android.text.Editable; import android.text.TextWatcher; import android.view.Gravity; @@ -40,7 +39,7 @@ import cn.com.basic.face.discern.common.CommonVariables; import cn.com.basic.face.discern.entity.Visit; import cn.com.basic.face.discern.query.item.FacePhotoItem; import cn.com.basic.face.discern.query.item.VisitorQueryItem; import cn.com.basic.face.discern.query.item.CheckInQueryItem; public class CheckInFragment extends MainUIBaseFragment { private View fragment_check_in_left; @@ -60,8 +59,8 @@ private static CheckInFragment instance = new CheckInFragment(); private List<String> visitPurposeList = new ArrayList<String>(); private VisitorQueryItem selectedVisitor; private VisitorQueryItem selectedInterviewee; private CheckInQueryItem selectedVisitor; private CheckInQueryItem selectedInterviewee; @ViewInject(R.id.fragment_check_in_right_remark) private EditText visitorRemarkEt; @@ -155,10 +154,10 @@ } } private void sort(List<VisitorQueryItem> list, final boolean sortedByDept) { Collections.sort(list, new Comparator<VisitorQueryItem>() { private void sort(List<CheckInQueryItem> list, final boolean sortedByDept) { Collections.sort(list, new Comparator<CheckInQueryItem>() { @Override public int compare(VisitorQueryItem t1, VisitorQueryItem t2) { public int compare(CheckInQueryItem t1, CheckInQueryItem t2) { if (sortedByDept) { String dept1Name = t1.getDeptName()==null?"":t1.getDeptName(); String dept2Name = t2.getDeptName()==null?"":t2.getDeptName(); @@ -246,7 +245,7 @@ // fragment_check_in_right_visitor_cell.setTitle(item.getName()); } public void visitorCheckIn(VisitorQueryItem item) { public void visitorCheckIn(CheckInQueryItem item) { fragment_check_in_left_interviewee_radio.performClick(); fragment_check_in_right_visitor_cell.setVisitorInfo(item); selectedVisitor = item; @@ -266,12 +265,12 @@ fragment_check_in_left_list_view.setAdapter(mAdapter); } public void setVisitorInfo(VisitorQueryItem item) { public void setVisitorInfo(CheckInQueryItem item) { fragment_check_in_right_visitor_cell.setVisitorInfo(item); selectedVisitor = item; } public void setIntervieweeInfo(final VisitorQueryItem item) { public void setIntervieweeInfo(final CheckInQueryItem item) { fragment_check_in_right_interviewee_cell.setIntervieweeInfo(item); selectedInterviewee = item; } VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/HomeFragment.java
@@ -27,8 +27,7 @@ import java.util.ArrayList; import java.util.List; import cn.com.basic.face.discern.query.item.FacePhotoItem; import cn.com.basic.face.discern.query.item.VisitorQueryItem; import cn.com.basic.face.discern.query.item.CheckInQueryItem; /** @@ -227,7 +226,7 @@ mRecyclerViewRegister.setAdapter(mAdapter); } public void visitorListChanged(List<VisitorQueryItem> list) { public void visitorListChanged(List<CheckInQueryItem> list) { mList.clear(); mList.addAll(list); mAdapter.setList(mList); VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/RegisterFragment.java
@@ -17,7 +17,7 @@ import com.bsk.zhangbo.demoforbsk.R; import cn.com.basic.face.base.BaseFragment; import cn.com.basic.face.discern.query.item.VisitorQueryItem; import cn.com.basic.face.discern.query.item.CheckInQueryItem; import cn.com.basic.face.service.DictionaryMng; import cn.com.basic.face.service.RegisterMng; import cn.com.basic.face.service.VisitorTypeMng; @@ -304,7 +304,7 @@ public void onClick(View v) {} public void setRegisterInfo(VisitorQueryItem item) { public void setRegisterInfo(CheckInQueryItem item) { register_choose_photo.setImageURI(Uri.parse(AppApi.IMAGEURL_BASE + item.getImagePath())); } } VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/VisitorCheckInMng.java
@@ -12,7 +12,7 @@ import cn.com.basic.face.discern.common.BaseCommonCallBack; import cn.com.basic.face.discern.query.condition.VisitorQueryCondition; import cn.com.basic.face.discern.query.item.VisitorQueryItem; import cn.com.basic.face.discern.query.item.CheckInQueryItem; /** * 来访登记 @@ -36,7 +36,7 @@ params.addBodyParameter(VisitorQueryCondition.FieldNames.name, name); x.http().post(params, new BaseCommonCallBack() { public void success() { CheckInFragment.getInstance().listChanged(getList(VisitorQueryItem.class), isClear); CheckInFragment.getInstance().listChanged(getList(CheckInQueryItem.class), isClear); } }); } @@ -50,7 +50,7 @@ params.addBodyParameter(VisitorQueryCondition.FieldNames.notCompanyId, BaseApplication.getInstance().getPlace().getCompanyId()); x.http().post(params, new BaseCommonCallBack() { public void success() { HomeFragment.getInstance().visitorListChanged(getList(VisitorQueryItem.class)); HomeFragment.getInstance().visitorListChanged(getList(CheckInQueryItem.class)); } }); } @@ -59,20 +59,12 @@ * 查询被访问人员列表 */ public void findIntervieweeList(String pageNum, String name, final boolean isClear) { // RequestParams params = new RequestParams(AppApi.BASEURL+AppApi.DICTIONARY_TYPE_LIST); // params.addBodyParameter(IntervieweeQueryCondition.FieldNames.companyId, "1"); // params.addBodyParameter(IntervieweeQueryCondition.FieldNames.name, name); // x.http().post(params, new BaseCommonCallBack() { // public void success() { // VisitorRegisterFragment.getInstance().listChanged(getList(IntervieweeQueryItem.class), isClear); // } // }); RequestParams params = new RequestParams(AppApi.BASEURL+AppApi.VISITOR_LIST); params.addBodyParameter(VisitorQueryCondition.FieldNames.companyId, BaseApplication.getInstance().getPlace().getCompanyId()); params.addBodyParameter(VisitorQueryCondition.FieldNames.name, name); x.http().post(params, new BaseCommonCallBack() { public void success() { CheckInFragment.getInstance().listChanged(getList(VisitorQueryItem.class), isClear); CheckInFragment.getInstance().listChanged(getList(CheckInQueryItem.class), isClear); } }); } VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/CheckInIntervieweeCell.java
@@ -15,7 +15,7 @@ import com.lidroid.xutils.view.annotation.ViewInject; import cn.com.basic.face.base.MainActivity; import cn.com.basic.face.discern.query.item.VisitorQueryItem; import cn.com.basic.face.discern.query.item.CheckInQueryItem; import cn.com.basic.face.util.AppApi; /** @@ -47,7 +47,7 @@ @ViewInject(R.id.fragment_check_in_right_interviewee_cell_photo) private ImageView fragment_check_in_right_interviewee_cell_photo; public void setIntervieweeInfo(final VisitorQueryItem item) { public void setIntervieweeInfo(final CheckInQueryItem item) { fragment_check_in_right_interviewee_cell_name.setText(item.getName()); fragment_check_in_right_interviewee_cell_dept.setText(item.getDeptName()); VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/CheckInRightVisitorCell.java
@@ -13,7 +13,7 @@ import com.lidroid.xutils.ViewUtils; import com.lidroid.xutils.view.annotation.ViewInject; import cn.com.basic.face.discern.query.item.VisitorQueryItem; import cn.com.basic.face.discern.query.item.CheckInQueryItem; import cn.com.basic.face.util.AppApi; /** @@ -44,7 +44,7 @@ @ViewInject(R.id.fragment_check_in_right_visitor_cell_mobile_phone) private TextView fragment_check_in_right_visitor_cell_mobile_phone; public void setVisitorInfo(VisitorQueryItem item) { public void setVisitorInfo(CheckInQueryItem item) { fragment_check_in_right_visitor_cell_name.setText(item.getName()); fragment_check_in_right_visitor_cell_company_name.setText(item.getCompanyName()); fragment_check_in_right_visitor_cell_identity_number.setText(item.getIdentify());
