From 81b5612ff5fa95f7af8fcb9c10d92495de79150e Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期四, 13 四月 2017 10:08:52 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/AppApi.java | 4 -
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/checkin/CheckInLeftInterviewee.java | 7 +-
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/condition/CheckInQueryCondition.java | 75 +++++++++++++++++++++++++
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/CheckInQueryItem.java | 46 +++++----------
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/CheckInFragment.java | 15 +++++
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/CheckInMng.java | 11 ++-
6 files changed, 115 insertions(+), 43 deletions(-)
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/CheckInFragment.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/CheckInFragment.java
index 0cdfc30..e6c4bb8 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/CheckInFragment.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/CheckInFragment.java
@@ -11,6 +11,7 @@
import com.camnter.easyrecyclerview.holder.EasyRecyclerViewHolder;
import com.facebook.drawee.view.SimpleDraweeView;
+import cn.com.basic.face.base.MainActivity;
import cn.com.basic.face.discern.query.item.CheckInQueryItem;
import cn.com.basic.face.util.AppApi;
@@ -71,6 +72,8 @@
public static class CheckInLeftIntervieweeAdapter extends EasyRecyclerViewAdapter {
+ private boolean isSortByDept;
+
@Override
public int[] getItemLayouts() {
return new int[]{R.layout.fragment_check_in_left_interviewee_row, R.layout.fragment_check_in_left_first_letter_row};
@@ -86,6 +89,14 @@
TextView fragment_check_in_left_interviewee_row_name = viewHolder.findViewById(R.id.fragment_check_in_left_interviewee_row_name);
TextView fragment_check_in_left_interviewee_row_dept = viewHolder.findViewById(R.id.fragment_check_in_left_interviewee_row_dept);
SimpleDraweeView fragment_check_in_left_interviewee_row_photo = viewHolder.findViewById(R.id.fragment_check_in_left_interviewee_row_photo);
+
+ if (isSortByDept) {
+ fragment_check_in_left_interviewee_row_name.setTextColor(MainActivity.getInstance().getResources().getColor(R.color.colorText_b));
+ fragment_check_in_left_interviewee_row_dept.setTextColor(MainActivity.getInstance().getResources().getColor(R.color.colorText_5));
+ } else {
+ fragment_check_in_left_interviewee_row_name.setTextColor(MainActivity.getInstance().getResources().getColor(R.color.colorText_5));
+ fragment_check_in_left_interviewee_row_dept.setTextColor(MainActivity.getInstance().getResources().getColor(R.color.colorText_b));
+ }
Object data = getList().get(position);
if (data instanceof CheckInQueryItem) {
@@ -120,6 +131,10 @@
}
+ public void setSortByDept(boolean isSortByDept) {
+ this.isSortByDept = isSortByDept;
+ }
+
}
}
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/condition/CheckInQueryCondition.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/condition/CheckInQueryCondition.java
new file mode 100644
index 0000000..f94a173
--- /dev/null
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/condition/CheckInQueryCondition.java
@@ -0,0 +1,75 @@
+package cn.com.basic.face.discern.query.condition;
+
+
+public class CheckInQueryCondition extends BaseCondition {
+
+ public static final class FieldNames {
+ /**
+ *
+ */
+ public static final String employeeCompanyId = "employeeCompanyId";
+ /**
+ *
+ */
+ public static final String visitorCompanyId = "visitorCompanyId";
+ /**
+ * 浜哄憳鍚嶅瓧
+ */
+ public static final String username = "username";
+ }
+
+ //
+ private String employeeCompanyId;
+ //
+ private String visitorCompanyId;
+ // 浜哄憳鍚嶅瓧
+ private String username;
+
+ /**
+ * Get
+ */
+ public String getEmployeeCompanyId() {
+ return employeeCompanyId;
+ }
+
+ /**
+ * Set
+ */
+ public void setEmployeeCompanyId(String employeeCompanyId) {
+ this.employeeCompanyId = employeeCompanyId;
+ }
+
+ /**
+ * Get
+ */
+ public String getVisitorCompanyId() {
+ return visitorCompanyId;
+ }
+
+ /**
+ * Set
+ */
+ public void setVisitorCompanyId(String visitorCompanyId) {
+ this.visitorCompanyId = visitorCompanyId;
+ }
+
+ /**
+ * Get 浜哄憳鍚嶅瓧
+ */
+ public String getUsername() {
+ return username;
+ }
+
+ /**
+ * Set 浜哄憳鍚嶅瓧
+ */
+ public void setUsername(String username) {
+ this.username = username;
+ }
+
+ public String toString() {
+ return
+ ", =" + employeeCompanyId + ", =" + visitorCompanyId + ",浜哄憳鍚嶅瓧 =" + username
+ ;
+ }
+}
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/CheckInQueryItem.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/CheckInQueryItem.java
index fc162b6..f006ec9 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/CheckInQueryItem.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/CheckInQueryItem.java
@@ -23,8 +23,6 @@
private String postName;
// 绉诲姩鐢佃瘽
private String mobilePhone;
- //
- private String type;
/**
* Get 浜哄憳涓婚敭
@@ -32,7 +30,7 @@
public String getRegisterId() {
return registerId;
}
-
+
/**
* Set 浜哄憳涓婚敭
*/
@@ -46,7 +44,7 @@
public String getUsername() {
return username;
}
-
+
/**
* Set 浜哄憳鍚嶅瓧
*/
@@ -60,7 +58,7 @@
public String getImagePath() {
return imagePath;
}
-
+
/**
* Set 鍥剧墖鍦板潃
*/
@@ -74,7 +72,7 @@
public String getCompanyName() {
return companyName;
}
-
+
/**
* Set 鍏徃鍚嶇О
*/
@@ -88,7 +86,7 @@
public String getTel() {
return tel;
}
-
+
/**
* Set 搴ф満鐢佃瘽
*/
@@ -102,7 +100,7 @@
public String getIdentifyNum() {
return identifyNum;
}
-
+
/**
* Set 璇佷欢缂栧彿
*/
@@ -116,7 +114,7 @@
public String getDeptName() {
return deptName;
}
-
+
/**
* Set 閮ㄩ棬鍚嶇О
*/
@@ -130,7 +128,7 @@
public String getCompanyId() {
return companyId;
}
-
+
/**
* Set 鍏徃涓婚敭
*/
@@ -144,7 +142,7 @@
public String getPostName() {
return postName;
}
-
+
/**
* Set 鑱屼綅鍚嶇О
*/
@@ -158,7 +156,7 @@
public String getMobilePhone() {
return mobilePhone;
}
-
+
/**
* Set 绉诲姩鐢佃瘽
*/
@@ -166,25 +164,11 @@
this.mobilePhone = mobilePhone;
}
- /**
- * Get
- */
- public String getType() {
- return type;
- }
-
- /**
- * Set
- */
- public void setType(String type) {
- this.type = type;
- }
-
public String toString() {
- return
- ",浜哄憳涓婚敭 =" + registerId + ",浜哄憳鍚嶅瓧 =" + username + ",鍥剧墖鍦板潃 =" + imagePath +
- ",鍏徃鍚嶇О =" + companyName + ",搴ф満鐢佃瘽 =" + tel + ",璇佷欢缂栧彿 =" + identifyNum +
- ",閮ㄩ棬鍚嶇О =" + deptName + ",鍏徃涓婚敭 =" + companyId + ",鑱屼綅鍚嶇О =" + postName +
- ",绉诲姩鐢佃瘽 =" + mobilePhone + ", =" + type ;
+ return
+ ",浜哄憳涓婚敭 =" + registerId + ",浜哄憳鍚嶅瓧 =" + username + ",鍥剧墖鍦板潃 =" + imagePath +
+ ",鍏徃鍚嶇О =" + companyName + ",搴ф満鐢佃瘽 =" + tel + ",璇佷欢缂栧彿 =" + identifyNum +
+ ",閮ㄩ棬鍚嶇О =" + deptName + ",鍏徃涓婚敭 =" + companyId + ",鑱屼綅鍚嶇О =" + postName +
+ ",绉诲姩鐢佃瘽 =" + mobilePhone;
}
}
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/CheckInMng.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/CheckInMng.java
index a792a4a..ce70b07 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/CheckInMng.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/CheckInMng.java
@@ -3,6 +3,7 @@
import android.widget.Toast;
import cn.com.basic.face.base.BaseApplication;
+import cn.com.basic.face.discern.query.condition.CheckInQueryCondition;
import cn.com.basic.face.discern.query.item.PhoneCallQueryItem;
import cn.com.basic.face.fragment.CheckInFragment;
import cn.com.basic.face.util.AppApi;
@@ -40,13 +41,13 @@
}
public void findCheckInLeftList(final boolean isVisitorList, final boolean isSortByDept, String searchText) {
- RequestParams params = new RequestParams(AppApi.BASE_URL +AppApi.Query.REGISTER_QUERY);
+ RequestParams params = new RequestParams(AppApi.BASE_URL +AppApi.Query.CHECK_IN_QUERY);
if (isVisitorList) {
- params.addBodyParameter(VisitorQueryCondition.FieldNames.notCompanyId, BaseApplication.getInstance().getDevice().getCompanyId());
+ params.addBodyParameter(CheckInQueryCondition.FieldNames.visitorCompanyId, BaseApplication.getInstance().getDevice().getCompanyId());
} else {
- params.addBodyParameter(VisitorQueryCondition.FieldNames.companyId, BaseApplication.getInstance().getDevice().getCompanyId());
+ params.addBodyParameter(CheckInQueryCondition.FieldNames.employeeCompanyId, BaseApplication.getInstance().getDevice().getCompanyId());
}
- params.addBodyParameter(VisitorQueryCondition.FieldNames.name, searchText);
+ params.addBodyParameter(CheckInQueryCondition.FieldNames.username, searchText);
x.http().post(params, new BaseCommonCallBack() {
public void success() {
List<CheckInQueryItem> list = getList(CheckInQueryItem.class);
@@ -73,7 +74,7 @@
if (isVisitorList) {
CheckInFragment.getInstance().get_fragment_check_in_left_visitor().show(allItems);
} else {
- CheckInFragment.getInstance().get_fragment_check_in_left_interviewee().show(allItems);
+ CheckInFragment.getInstance().get_fragment_check_in_left_interviewee().show(allItems, isSortByDept);
}
}
});
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/AppApi.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/AppApi.java
index e2aac48..878435e 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/AppApi.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/AppApi.java
@@ -4,10 +4,6 @@
public final static String IMAGE_URL_BASE = "http://192.168.1.27:8080/ssm/img/";
public final static String BASE_URL = "http://192.168.1.27:8080/ssm/";
- public final static String VISITOR_TYPE_LIST = "VisitorType/v_list.do";
-
- public final static String DICTIONARY_TYPE_LIST = "Dictionary/v_list.do";
-
public static final String REGISTER_ADD = "Register/o_add.do";
public static final String VISIT_ADD = "Visit/o_add.do";
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/checkin/CheckInLeftInterviewee.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/checkin/CheckInLeftInterviewee.java
index 3acd19b..4b4ab4b 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/checkin/CheckInLeftInterviewee.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/checkin/CheckInLeftInterviewee.java
@@ -36,14 +36,15 @@
setAdapter(context);
}
- public void show(List list) {
- refresh(list);
+ public void show(List list, boolean isSortByDept) {
+ refresh(list, isSortByDept);
}
- public void refresh(List list) {
+ public void refresh(List list, boolean isSortByDept) {
this.list.clear();
this.list.addAll(list);
mAdapter.setList(this.list);
+ mAdapter.setSortByDept(isSortByDept);
this.setAdapter(mAdapter);
}
--
Gitblit v1.8.0