From bef8d3da93bc4f16b1ff11da5f41c758f4f7d70d Mon Sep 17 00:00:00 2001 From: qvyuanxin <qvyuanxin@454eff88-639b-444f-9e54-f578c98de674> Date: 星期五, 21 七月 2017 11:04:31 +0800 Subject: [PATCH] --- VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/AttendanceMng.java | 74 +++++++++++++++++++++---------------- 1 files changed, 42 insertions(+), 32 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 c26ba13..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,6 +10,7 @@ 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; @@ -30,39 +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, 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 = ""; - 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()); - } + 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 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(hasMorePages(), getPageNum(), itemList); - 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) { @@ -72,7 +82,7 @@ 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().getAndroidDevice().getCompanyId()); params.addBodyParameter(CommonVariables.Page.PAGE_SIZE, "20"); -- Gitblit v1.8.0