From 3abc131d818343ebd4b6be03d5133afce6f2adf8 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期四, 30 三月 2017 09:33:51 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/RegisterFragment.java | 4 +-
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/CheckInQueryItem.java | 2
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/VisitorCheckInMng.java | 16 ++------
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/HomeFragment.java | 5 +-
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/CheckInIntervieweeCell.java | 4 +-
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/CheckInRightCellAdapter.java | 18 ++++----
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/HomeAdapter.java | 10 ++--
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/CheckInFragment.java | 19 ++++-----
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/CheckInRightVisitorCell.java | 4 +-
9 files changed, 36 insertions(+), 46 deletions(-)
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/CheckInRightCellAdapter.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/CheckInRightCellAdapter.java
index fe7174d..6aec27b 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/CheckInRightCellAdapter.java
+++ b/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);
}
}
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/HomeAdapter.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/HomeAdapter.java
index 2d704ee..95e7a07 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/HomeAdapter.java
+++ b/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) {
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/VisitorQueryItem.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/CheckInQueryItem.java
similarity index 98%
rename from VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/VisitorQueryItem.java
rename to VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/CheckInQueryItem.java
index 7c907c3..7b26ed4 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/VisitorQueryItem.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/CheckInQueryItem.java
@@ -1,7 +1,7 @@
package cn.com.basic.face.discern.query.item;
-public class VisitorQueryItem {
+public class CheckInQueryItem {
// 浜哄憳涓婚敭
private String id;
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/CheckInFragment.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/CheckInFragment.java
index f6c8d17..38f0fd5 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/CheckInFragment.java
+++ b/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;
}
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/HomeFragment.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/HomeFragment.java
index 3f878bd..ea9b593 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/HomeFragment.java
+++ b/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);
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/RegisterFragment.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/RegisterFragment.java
index 7f932de..1daf44c 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/RegisterFragment.java
+++ b/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()));
}
}
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/VisitorCheckInMng.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/VisitorCheckInMng.java
index 0774dc2..4825dd9 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/VisitorCheckInMng.java
+++ b/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);
}
});
}
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/CheckInIntervieweeCell.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/CheckInIntervieweeCell.java
index b7f0faa..836e78e 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/CheckInIntervieweeCell.java
+++ b/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());
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/CheckInRightVisitorCell.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/CheckInRightVisitorCell.java
index c7f7855..e156292 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/CheckInRightVisitorCell.java
+++ b/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());
--
Gitblit v1.8.0