From 0d2d3d6cb41f54531ab4c24c75298caff19574f2 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期四, 27 四月 2017 10:29:38 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/CheckInMng.java | 60 +++++++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 43 insertions(+), 17 deletions(-)
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 e19794a..ca088c9 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
@@ -31,13 +31,16 @@
}
public void add(RequestParams params, final String visitReasonId) {
+ if (!BaseApplication.deviceAvailable) {
+ return;
+ }
params.setUri(AppApi.BASE_URL +AppApi.VISIT_ADD);
x.http().post(params, new BaseCommonCallBack() {
@Override
public void success() {
Toast.makeText(BaseApplication.getInstance(),"娣诲姞鎴愬姛", Toast.LENGTH_SHORT).show();
CheckInFragment.getInstance().resetForm();
- if (visitReasonId != null && !"".equals(visitReasonId)) {
+ if (visitReasonId == null || "".equals(visitReasonId)) {
DictionaryMng.getInstance().loadVisitReasonList();
}
}
@@ -45,18 +48,38 @@
}
public void findCheckInLeftList(final boolean isVisitorList, final boolean isSortByDept, String searchText, final int pageNum, final boolean append) {
+ if (!BaseApplication.deviceAvailable) {
+ return;
+ }
RequestParams params = new RequestParams(AppApi.BASE_URL +AppApi.Query.CHECK_IN_QUERY);
+ String deviceCompanyId = BaseApplication.getInstance().getDevice().getDeviceCompanyId();
if (isVisitorList) {
- params.addBodyParameter(CheckInQueryCondition.FieldNames.visitorCompanyId, BaseApplication.getInstance().getDevice().getCompanyId());
+ params.addBodyParameter(CheckInQueryCondition.FieldNames.visitorCompanyId, deviceCompanyId);
} else {
- params.addBodyParameter(CheckInQueryCondition.FieldNames.employeeCompanyId, BaseApplication.getInstance().getDevice().getCompanyId());
+ params.addBodyParameter(CheckInQueryCondition.FieldNames.employeeCompanyId, deviceCompanyId);
}
params.addBodyParameter(CheckInQueryCondition.FieldNames.username, searchText);
params.addBodyParameter(CommonVariables.Page.PAGE_NUM, pageNum+"");
- params.addBodyParameter(CommonVariables.Page.PAGE_SIZE, "5");
+ params.addBodyParameter(CommonVariables.Page.PAGE_SIZE, CommonVariables.Page.DEFAULT_PAGE_SIZE);
x.http().post(params, new BaseCommonCallBack() {
public void success() {
List<CheckInQueryItem> list = getList(CheckInQueryItem.class);
+
+ List prevList = null;
+ if (append) {
+ if (isVisitorList) {
+ prevList = CheckInFragment.getInstance().get_fragment_check_in_left_visitor().getPrevList();
+ } else {
+ prevList = CheckInFragment.getInstance().get_fragment_check_in_left_interviewee().getPrevList();
+ }
+ for (int i = 0; i < prevList.size(); i++) {
+ Object item = prevList.get(i);
+ if (item instanceof CheckInQueryItem) {
+ list.add(0, (CheckInQueryItem) item);
+ }
+ }
+ }
+
sort(list, isSortByDept);
List allItems = new ArrayList();
String name = "";
@@ -81,17 +104,17 @@
allItems.add(CommonVariables.Page.hasMorePages);
} else {
if (getPageNum() > 1) {
- allItems.add(CommonVariables.Page.reachBottom);
+ //allItems.add(CommonVariables.Page.reachBottom);
} else {
if (allItems.size() > 0) {
- allItems.add(CommonVariables.Page.reachBottom);
+ //allItems.add(CommonVariables.Page.reachBottom);
} else {
- allItems.add(CommonVariables.Page.noMorePage);
+ //allItems.add(CommonVariables.Page.noMorePage);
}
}
}
if (isVisitorList) {
- CheckInFragment.getInstance().get_fragment_check_in_left_visitor().show(allItems, append);
+ CheckInFragment.getInstance().get_fragment_check_in_left_visitor().show(allItems);
} else {
CheckInFragment.getInstance().get_fragment_check_in_left_interviewee().show(allItems, isSortByDept, append);
}
@@ -100,12 +123,15 @@
}
private void sort(List<CheckInQueryItem> list, final boolean sortedByDept) {
+ if (!BaseApplication.deviceAvailable) {
+ return;
+ }
Collections.sort(list, new Comparator<CheckInQueryItem>() {
@Override
- public int compare(CheckInQueryItem t1, CheckInQueryItem t2) {
+ public int compare(CheckInQueryItem item1, CheckInQueryItem item2) {
if (sortedByDept) {
- String dept1Name = t1.getDeptName()==null?"":t1.getDeptName();
- String dept2Name = t2.getDeptName()==null?"":t2.getDeptName();
+ String dept1Name = item1.getDeptName()==null?"":item1.getDeptName();
+ String dept2Name = item2.getDeptName()==null?"":item2.getDeptName();
if(!dept1Name.equals(dept2Name)) {
String dept1Name_a = dept1Name.trim();
String dept1Name_b = dept2Name.trim();
@@ -116,13 +142,13 @@
return dept1Name_a.compareTo(dept1Name_b);
}
}
- String name1 = t1.getUsername()==null?"":t1.getUsername();
- String name2 = t2.getUsername()==null?"":t2.getUsername();
- String dept1Name_a = name1.trim();
- String dept1Name_b = name2.trim();
+ String username1 = item1.getUsername()==null?"":item1.getUsername();
+ String username2 = item2.getUsername()==null?"":item2.getUsername();
+ String dept1Name_a = username1.trim();
+ String dept1Name_b = username2.trim();
if (dept1Name_a.length() > 0 && dept1Name_b.length() > 0) {
- dept1Name_a = CharacterParser.getInstance().getSelling(name1).toLowerCase();
- dept1Name_b = CharacterParser.getInstance().getSelling(name2).toLowerCase();
+ dept1Name_a = CharacterParser.getInstance().getSelling(username1).toLowerCase();
+ dept1Name_b = CharacterParser.getInstance().getSelling(username2).toLowerCase();
}
return dept1Name_a.compareTo(dept1Name_b);
}
--
Gitblit v1.8.0