From 3ca99f2b70ec9301c682e4271410b866eb4f4549 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期日, 23 七月 2017 15:31:37 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/AttendanceMng.java | 100 ++++++++++++++++++++++++-------------------------
1 files changed, 49 insertions(+), 51 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 eb380f0..e6fcbff 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
@@ -10,15 +10,17 @@
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.common.ResultBean;
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.service.sqlite.AttendanceDao;
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() {
@@ -29,55 +31,48 @@
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);
- 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) {
- AttendanceQueryItem lastItem = (AttendanceQueryItem)prevList.get(prevList.size()-2);
- try {
- previewDate = sdf2.format(sdf1.parse(lastItem.getTime()));
- } catch (Exception e) { }
- }
+ if(BaseApplication.getInstance().networkNotAvailable()) {
+ reloadLeftListAfterReturn(append, AttendanceDao.getInstance().reloadLeftList(searchText, pageNum, append));
+ } else {
+ RequestParams params = new RequestParams(AppApi.BASE_URL + AppApi.Query.ATTENDANCE_QUERY);
+ params.addBodyParameter(AttendanceQueryCondition.FieldNames.username, searchText);
+ params.addBodyParameter(AttendanceQueryCondition.FieldNames.deviceCompanyId, BaseApplication.getInstance().getAndroidDevice().getCompanyId());
+ params.addBodyParameter(CommonVariables.Page.PAGE_NUM, pageNum + "");
+ params.addBodyParameter(CommonVariables.Page.PAGE_SIZE, CommonVariables.Page.DEFAULT_PAGE_SIZE);
+ x.http().post(params, new BaseCommonCallBack() {
+ public void success() {
+ reloadLeftListAfterReturn(append, resultBean);
}
- 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++;
- }
- 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 reloadLeftListAfterReturn(boolean append, ResultBean resultBean) {
+ List<AttendanceQueryItem> list = resultBean.getList(AttendanceQueryItem.class);
+ List itemList = new ArrayList();
+ int i = 0;
+ String previewDate = "";
+ 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 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++;
+ }
+ addPageFooter(resultBean.hasMorePages(), resultBean.getPageNum(), itemList);
+ AttendanceFragment.getInstance().get_fragment_attendance_left_list_view().show(itemList, append);
}
public void reloadAttendanceDetail(AttendanceQueryItem item) {
@@ -87,9 +82,9 @@
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.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(AttendanceDetailQueryCondition.FieldNames.deviceCompanyId, BaseApplication.getInstance().getAndroidDevice().getCompanyId());
params.addBodyParameter(CommonVariables.Page.PAGE_SIZE, "20");
x.http().post(params, new BaseCommonCallBack() {
public void success() {
@@ -99,6 +94,9 @@
} catch (Exception e) {
e.printStackTrace();
}
+ if (1==1) {//娌＄綉浜�
+ AttendanceDao.getInstance().reloadAttendanceDetail(item);
+ }
}
}
--
Gitblit v1.8.0