From e2d0579f1d183796e015f6aa23eaa8d55efc4ef1 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期一, 24 四月 2017 16:29:16 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/CheckInMng.java | 31 ++++++++++++++++++++++++++++---
1 files changed, 28 insertions(+), 3 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..3be790b 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,11 +48,14 @@
}
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);
if (isVisitorList) {
- params.addBodyParameter(CheckInQueryCondition.FieldNames.visitorCompanyId, BaseApplication.getInstance().getDevice().getCompanyId());
+ params.addBodyParameter(CheckInQueryCondition.FieldNames.visitorCompanyId, BaseApplication.getInstance().getDevice().getDeviceCompanyId());
} else {
- params.addBodyParameter(CheckInQueryCondition.FieldNames.employeeCompanyId, BaseApplication.getInstance().getDevice().getCompanyId());
+ params.addBodyParameter(CheckInQueryCondition.FieldNames.employeeCompanyId, BaseApplication.getInstance().getDevice().getDeviceCompanyId());
}
params.addBodyParameter(CheckInQueryCondition.FieldNames.username, searchText);
params.addBodyParameter(CommonVariables.Page.PAGE_NUM, pageNum+"");
@@ -57,6 +63,22 @@
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 = "";
@@ -100,6 +122,9 @@
}
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) {
--
Gitblit v1.8.0