From d56dfe791f22ddcccd7de6fb2c4be1255a80f9c5 Mon Sep 17 00:00:00 2001
From: sujinwen <sujinwen@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期四, 27 七月 2017 20:39:23 +0800
Subject: [PATCH] Failed commit: Default
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/AttendanceMng.java | 60 ++++++++++++++++++++++++++++++++++++++----------------------
1 files changed, 38 insertions(+), 22 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 e6fcbff..5fcb38e 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;
@@ -31,9 +32,7 @@
if (!BaseApplication.deviceAvailable) {
return;
}
- if(BaseApplication.getInstance().networkNotAvailable()) {
- reloadLeftListAfterReturn(append, AttendanceDao.getInstance().reloadLeftList(searchText, pageNum, append));
- } else {
+ if(BaseApplication.getInstance().networkAvailable()) {
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());
@@ -44,12 +43,14 @@
reloadLeftListAfterReturn(append, resultBean);
}
});
+ } else {
+ reloadLeftListAfterReturn(append, AttendanceDao.getInstance().reloadLeftList(searchText, pageNum, append));
}
}
- public void reloadLeftListAfterReturn(boolean append, ResultBean resultBean) {
+ public void reloadLeftListAfterReturn(final boolean append, ResultBean resultBean) {
List<AttendanceQueryItem> list = resultBean.getList(AttendanceQueryItem.class);
- List itemList = new ArrayList();
+ final List itemList = new ArrayList();
int i = 0;
String previewDate = "";
if (append) {
@@ -72,30 +73,45 @@
i++;
}
addPageFooter(resultBean.hasMorePages(), resultBean.getPageNum(), itemList);
- AttendanceFragment.getInstance().get_fragment_attendance_left_list_view().show(itemList, append);
+ 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