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 | 42 +++++++++++++++++++++++++++++++++---------
1 files changed, 33 insertions(+), 9 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 b4a6e44..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
@@ -7,12 +7,14 @@
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;
@@ -24,6 +26,9 @@
}
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+"");
@@ -36,6 +41,15 @@
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()));
@@ -66,15 +80,25 @@
}
- 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