From 0e32d241f9ddd7e202879230585cb939dd3877b2 Mon Sep 17 00:00:00 2001
From: houxiao <houxiao@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期二, 25 四月 2017 13:00:34 +0800
Subject: [PATCH] bug fix
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/AttendanceMng.java | 77 +++++++++++++++++++++++++++++++-------
1 files changed, 62 insertions(+), 15 deletions(-)
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/AttendanceMng.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/AttendanceMng.java
index 28421e5..eb380f0 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/AttendanceMng.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/AttendanceMng.java
@@ -3,14 +3,18 @@
import org.xutils.http.RequestParams;
import org.xutils.x;
+import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.List;
+import cn.com.basic.face.base.BaseApplication;
import cn.com.basic.face.discern.common.BaseCommonCallBack;
+import cn.com.basic.face.discern.common.CommonVariables;
import cn.com.basic.face.discern.query.condition.AttendanceDetailQueryCondition;
import cn.com.basic.face.discern.query.condition.AttendanceQueryCondition;
import cn.com.basic.face.discern.query.item.AttendanceDetailQueryItem;
import cn.com.basic.face.discern.query.item.AttendanceQueryItem;
+import cn.com.basic.face.discern.query.item.VisitQueryItem;
import cn.com.basic.face.fragment.AttendanceFragment;
import cn.com.basic.face.util.AppApi;
@@ -21,37 +25,80 @@
return instance;
}
- public void reloadLeftList(String searchText) {
+ public void reloadLeftList(String searchText, final int pageNum, final boolean append) {
+ if (!BaseApplication.deviceAvailable) {
+ return;
+ }
RequestParams params = new RequestParams(AppApi.BASE_URL +AppApi.Query.ATTENDANCE_QUERY);
params.addBodyParameter(AttendanceQueryCondition.FieldNames.username, searchText);
+ params.addBodyParameter(CommonVariables.Page.PAGE_NUM, pageNum+"");
+ params.addBodyParameter(CommonVariables.Page.PAGE_SIZE, "7");
x.http().post(params, new BaseCommonCallBack() {
public void success() {
List<AttendanceQueryItem> list = getList(AttendanceQueryItem.class);
- String date = "";
List itemList = new ArrayList();
int i = 0;
- for (AttendanceQueryItem item : list) {
- if (i % 3 == 0) {
- itemList.add("2016-10-10");
+ String previewDate = "";
+ SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd");
+ SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy骞碝M鏈坉d鏃�");
+ if (append) {
+ List prevList = AttendanceFragment.getInstance().get_fragment_attendance_left_list_view().getPrevList();
+ if (prevList != null && prevList.size() > 1) {
+ AttendanceQueryItem lastItem = (AttendanceQueryItem)prevList.get(prevList.size()-2);
+ try {
+ previewDate = sdf2.format(sdf1.parse(lastItem.getTime()));
+ } catch (Exception e) { }
}
+ }
+ for (AttendanceQueryItem item : list) {
+ try {
+ String yearMonthDay = sdf2.format(sdf1.parse(item.getTime()));
+ if (!previewDate.equals(yearMonthDay)) {
+ itemList.add(yearMonthDay);
+ previewDate = yearMonthDay;
+ }
+ } catch (Exception e) { }
itemList.add(item);
i++;
}
- AttendanceFragment.getInstance().get_fragment_attendance_left_list_view().show(itemList);
+ if (hasMorePages()) {
+ itemList.add(CommonVariables.Page.hasMorePages);
+ } else {
+ if (getPageNum() > 1) {
+ itemList.add(CommonVariables.Page.reachBottom);
+ } else {
+ if (itemList.size() > 0) {
+ itemList.add(CommonVariables.Page.reachBottom);
+ } else {
+ itemList.add(CommonVariables.Page.noMorePage);
+ }
+ }
+ }
+ AttendanceFragment.getInstance().get_fragment_attendance_left_list_view().show(itemList, append);
}
});
}
- public void reloadAttendanceDetail(String registerId) {
- RequestParams params = new RequestParams(AppApi.BASE_URL +AppApi.Query.ATTENDANCE_DETAIL_QUERY);
- params.addBodyParameter(AttendanceDetailQueryCondition.FieldNames.registerId, registerId);
- x.http().post(params, new BaseCommonCallBack() {
- public void success() {
- AttendanceFragment.getInstance().get_fragment_attendance_right_list_view().show(getList(AttendanceDetailQueryItem.class));
- }
- });
-
+ public void reloadAttendanceDetail(AttendanceQueryItem item) {
+ if (!BaseApplication.deviceAvailable) {
+ return;
+ }
+ try {
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+ RequestParams params = new RequestParams(AppApi.BASE_URL +AppApi.Query.ATTENDANCE_DETAIL_QUERY);
+ params.addBodyParameter(AttendanceDetailQueryCondition.FieldNames.time, sdf.format(sdf.parse(item.getTime())));
+ params.addBodyParameter(AttendanceDetailQueryCondition.FieldNames.registerId, item.getRegisterId());
+ params.addBodyParameter(AttendanceDetailQueryCondition.FieldNames.deviceCompanyId, BaseApplication.getInstance().getDevice().getDeviceCompanyId());
+ params.addBodyParameter(CommonVariables.Page.PAGE_SIZE, "20");
+ x.http().post(params, new BaseCommonCallBack() {
+ public void success() {
+ AttendanceFragment.getInstance().get_fragment_attendance_right_list_view().show(getList(AttendanceDetailQueryItem.class));
+ }
+ });
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
}
}
--
Gitblit v1.8.0