From 109ffe9a777658936a38d0c146579a67c60a0d17 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期四, 11 五月 2017 17:48:48 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/AttendanceMng.java | 63 ++++++++++++++++---------------
1 files changed, 32 insertions(+), 31 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 3195ee0..8784fdd 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
@@ -14,10 +14,12 @@
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;
+import cn.com.basic.face.util.DateUtil;
-public class AttendanceMng {
+public class AttendanceMng extends BaseMng{
private static AttendanceMng instance = new AttendanceMng();
public static AttendanceMng getInstance() {
@@ -31,58 +33,57 @@
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");
+ params.addBodyParameter(CommonVariables.Page.PAGE_SIZE, CommonVariables.Page.DEFAULT_PAGE_SIZE);
x.http().post(params, new BaseCommonCallBack() {
public void success() {
List<AttendanceQueryItem> list = getList(AttendanceQueryItem.class);
List itemList = new ArrayList();
int i = 0;
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) {
+ previewDate = DateUtil.yyyy_MM_dd_to_yyyy骞碝M鏈坉d鏃�(
+ ((AttendanceQueryItem)prevList.get(prevList.size()-2)).getTime());
+ }
+ }
for (AttendanceQueryItem item : list) {
try {
- String yearMonthDay = sdf2.format(sdf1.parse(item.getTime()));
- if (!previewDate.equals(yearMonthDay)) {
- itemList.add(yearMonthDay);
- previewDate = yearMonthDay;
+ String yyyyMMdd = DateUtil.yyyy_MM_dd_to_yyyy骞碝M鏈坉d鏃�(item.getTime());
+ if (!previewDate.equals(yyyyMMdd)) {
+ itemList.add(yyyyMMdd);
+ previewDate = yyyyMMdd;
}
} catch (Exception e) { }
itemList.add(item);
i++;
}
- 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);
- }
- }
- }
+ addPageFooter(hasMorePages(), getPageNum(), itemList);
AttendanceFragment.getInstance().get_fragment_attendance_left_list_view().show(itemList, append);
}
});
}
- public void reloadAttendanceDetail(String registerId) {
+ public void reloadAttendanceDetail(AttendanceQueryItem item) {
if (!BaseApplication.deviceAvailable) {
return;
}
- RequestParams params = new RequestParams(AppApi.BASE_URL +AppApi.Query.ATTENDANCE_DETAIL_QUERY);
- params.addBodyParameter(AttendanceDetailQueryCondition.FieldNames.registerId, registerId);
- 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));
- }
- });
-
+ 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