From d343b71cd89f59a87e85c46ce7a04d47c357462d Mon Sep 17 00:00:00 2001 From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674> Date: 星期二, 25 七月 2017 15:46:45 +0800 Subject: [PATCH] --- VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/AttendanceMng.java | 76 ++++++++++++++++++++++++-------------- 1 files changed, 48 insertions(+), 28 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 66e6551..716d381 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 @@ -8,6 +8,7 @@ import java.util.List; import cn.com.basic.face.base.BaseApplication; +import cn.com.basic.face.base.MainActivity; import cn.com.basic.face.discern.common.BaseCommonCallBack; import cn.com.basic.face.discern.common.CommonVariables; import cn.com.basic.face.discern.common.ResultBean; @@ -32,7 +33,7 @@ return; } if(BaseApplication.getInstance().networkNotAvailable()) { - ResultBean resultBean = AttendanceDao.getInstance().reloadLeftList(searchText, pageNum, append); + 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); @@ -41,18 +42,25 @@ 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) { + reloadLeftListAfterReturn(append, resultBean); + } + }); + } + } + + public void reloadLeftListAfterReturn(final boolean append, ResultBean resultBean) { + List<AttendanceQueryItem> list = resultBean.getList(AttendanceQueryItem.class); + final 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) { + } + for (AttendanceQueryItem item : list) { // try { // String yyyyMMdd = DateUtil.yyyy_MM_dd_to_yyyy骞碝M鏈坉d鏃�(item.getTime()); // if (!previewDate.equals(yyyyMMdd)) { @@ -61,37 +69,49 @@ // } // } catch (Exception e) { // } - itemList.add(item); - i++; - } - addPageFooter(hasMorePages(), getPageNum(), itemList); + itemList.add(item); + i++; + } + addPageFooter(resultBean.hasMorePages(), resultBean.getPageNum(), itemList); + if (BaseApplication.getInstance().networkAvailable()) { + AttendanceFragment.getInstance().get_fragment_attendance_left_list_view().show(itemList, append); + } else { + MainActivity.getInstance().runOnUiThread(new Runnable() { + @Override + public void run() { AttendanceFragment.getInstance().get_fragment_attendance_left_list_view().show(itemList, append); } }); } } - public void reloadAttendanceDetail(AttendanceQueryItem item) { + public void reloadAttendanceDetail(final 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().getAndroidDevice().getCompanyId()); - 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)); + if (BaseApplication.getInstance().networkAvailable()) { + 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().getAndroidDevice().getCompanyId()); + 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(); + } + } else { + MainActivity.getInstance().runOnUiThread(new Runnable() { + @Override + public void run() { + AttendanceFragment.getInstance().get_fragment_attendance_right_list_view().show(AttendanceDao.getInstance().reloadAttendanceDetail(item)); } }); - } catch (Exception e) { - e.printStackTrace(); - } - if (1==1) {//娌$綉浜� - AttendanceDao.getInstance().reloadAttendanceDetail(item); } } -- Gitblit v1.8.0