From ea6265546c3a91ad9d41abd5814df803599124ad Mon Sep 17 00:00:00 2001
From: houxiao <houxiao@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期三, 16 八月 2017 17:55:37 +0800
Subject: [PATCH] aaaaa
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/PhoneCallMng.java | 46 ++++++++++++++++++++++++++++++++++++++--------
1 files changed, 38 insertions(+), 8 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..1d63e26 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
@@ -26,7 +26,9 @@
import cn.com.basic.face.service.sqlite.PhoneCallDao;
import cn.com.basic.face.util.AppApi;
import cn.com.basic.face.util.CharacterParser;
+import cn.com.basic.face.util.RtspFaceNative;
import cn.com.basic.face.util.SqliteSqlUtil;
+import cn.com.basic.face.util.ToastUtil;
public class PhoneCallMng extends BaseMng {
@@ -44,17 +46,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 +72,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 +97,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) {
@@ -127,23 +139,40 @@
});
}
- public void addPhoneCall(CheckInQueryItem visitor, CheckInQueryItem interviewee) {
+ public void addPhoneCall(CheckInQueryItem visitor, CheckInQueryItem interviewee, boolean isMobilePhone) {
if (visitor == null) {
- Toast.makeText(MainActivity.getInstance(), "璇峰厛閫夋嫨琚浜�", Toast.LENGTH_SHORT).show();
+ ToastUtil.show("璇峰厛閫夋嫨鏉ヨ浜�");
return;
}
if (interviewee == null) {
- Toast.makeText(MainActivity.getInstance(), "璇峰厛閫夋嫨琚浜�", Toast.LENGTH_SHORT).show();
+ ToastUtil.show("璇峰厛閫夋嫨琚浜�");
return;
}
+ if (isMobilePhone) {
+ String mobilePhone = interviewee.getMobilePhone();
+ if (mobilePhone == null || mobilePhone.trim().length() != 11) {
+ ToastUtil.show("鎵嬫満鍙风爜涓嶆纭�");
+ return;
+ }
+ RtspFaceNative.teleCall(mobilePhone);
+ } else {
+ String tel = interviewee.getTel();
+ if (tel == null || tel.trim().length() == 0) {
+ ToastUtil.show("搴ф満涓嶆纭�");
+ return;
+ }
+ RtspFaceNative.teleCall(tel);
+ }
+
if (BaseApplication.getInstance().networkAvailable()) {
- Toast.makeText(MainActivity.getInstance(), "宸叉坊鍔犲埌鍛煎彨璁板綍", Toast.LENGTH_SHORT).show();
+ Toast.makeText(MainActivity.getInstance(), "", Toast.LENGTH_SHORT).show();
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
RequestParams params = new RequestParams(AppApi.BASE_URL +AppApi.PHONE_CALL_ADD);
params.addBodyParameter(PhoneCall.FieldNames.date, sdf.format(new Date()));
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));
@@ -152,6 +181,7 @@
} else {
PhoneCallDao.getInstance().addPhoneCall(visitor, interviewee);
}
+ ToastUtil.show("宸叉坊鍔犲埌鍛煎彨璁板綍");
}
}
--
Gitblit v1.8.0