From db2c035c3406d310af30094ec2bbf55ab396bf83 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期二, 01 八月 2017 18:25:46 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/PhoneCallMng.java | 21 ++++++++++++++++-----
1 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/PhoneCallMng.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/PhoneCallMng.java
index f5116d2..4c1f763 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/PhoneCallMng.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/PhoneCallMng.java
@@ -44,17 +44,18 @@
params.addBodyParameter(PhoneCallQueryCondition.FieldNames.username, searchText);
params.addBodyParameter(CommonVariables.Page.PAGE_SIZE, CommonVariables.Page.DEFAULT_PAGE_SIZE);
params.addBodyParameter(CommonVariables.Page.PAGE_NUM, pageNum+"");
+ params.addBodyParameter("deviceCompanyId", BaseApplication.getInstance().getAndroidDevice().getCompanyId());
x.http().post(params, new BaseCommonCallBack() {
public void success() {
findPhoneCallLeftListAfterReturn(resultBean, isSortByDept, append);
}
});
} else {
- findPhoneCallLeftListAfterReturn(PhoneCallDao.getInstance().findPhoneCallLeftList(searchText, pageNum), isSortByDept, append);
+ findPhoneCallLeftListAfterReturn(PhoneCallDao.getInstance().findPhoneCallLeftList(searchText, pageNum), isSortByDept, append);
}
}
- private void findPhoneCallLeftListAfterReturn(ResultBean resultBean, boolean isSortByDept, boolean append) {
+ private void findPhoneCallLeftListAfterReturn(ResultBean resultBean, final boolean isSortByDept, final boolean append) {
List<PhoneCallQueryItem> list = resultBean.getList(PhoneCallQueryItem.class);
if (append) {
@@ -69,7 +70,7 @@
}
}
sort(list, isSortByDept);
- List itemList = new ArrayList();
+ final List itemList = new ArrayList();
String name = "";
String prev = "";
for (int i = 0; i < list.size(); i++) {
@@ -94,7 +95,16 @@
prev = name;
}
addPageFooter(resultBean.hasMorePages(), resultBean.getPageNum(), itemList);
- PhoneCallFragment.getInstance().get_fragment_phone_call_left_list_view().show(isSortByDept, itemList, append);
+ if (BaseApplication.getInstance().networkAvailable()) {
+ PhoneCallFragment.getInstance().get_fragment_phone_call_left_list_view().show(isSortByDept, itemList, append);
+ } else {
+ MainActivity.getInstance().runOnUiThread(new Runnable() {
+ @Override
+ public void run() {
+ PhoneCallFragment.getInstance().get_fragment_phone_call_left_list_view().show(isSortByDept, itemList, append);
+ }
+ });
+ }
}
private void sort(List<PhoneCallQueryItem> list, final boolean sortedByDept) {
@@ -129,7 +139,7 @@
public void addPhoneCall(CheckInQueryItem visitor, CheckInQueryItem interviewee) {
if (visitor == null) {
- Toast.makeText(MainActivity.getInstance(), "璇峰厛閫夋嫨琚浜�", Toast.LENGTH_SHORT).show();
+ Toast.makeText(MainActivity.getInstance(), "璇峰厛閫夋嫨鏉ヨ浜�", Toast.LENGTH_SHORT).show();
return;
}
if (interviewee == null) {
@@ -144,6 +154,7 @@
params.addBodyParameter(PhoneCall.FieldNames.calleeId, interviewee.getRegisterId());
params.addBodyParameter(PhoneCall.FieldNames.deviceId, BaseApplication.getInstance().getAndroidDevice().getDeviceId());
params.addBodyParameter(PhoneCall.FieldNames.callerId, visitor.getRegisterId());
+ params.addBodyParameter("deviceCompanyId", BaseApplication.getInstance().getAndroidDevice().getCompanyId());
x.http().post(params, new BaseCommonCallBack() {
public void success() {
SqliteSqlUtil.insert(getExtraList(SqliteSqlBean.class));
--
Gitblit v1.8.0