From 4bee2fa9f76f7e200bf1bf01c24b709d16a58488 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期六, 22 七月 2017 14:33:34 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/PhoneCallMng.java | 2 ++
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/SurveillanceMng.java | 2 ++
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/PostMng.java | 1 +
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/DeviceMng.java | 3 +++
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/DepartmentMng.java | 1 +
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/RegisterMng.java | 4 ++++
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/VisitMng.java | 1 +
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/DictionaryMng.java | 10 ++++++++++
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/CheckInMng.java | 3 +++
9 files changed, 27 insertions(+), 0 deletions(-)
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/CheckInMng.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/CheckInMng.java
index 4b40e2a..918349f 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/CheckInMng.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/CheckInMng.java
@@ -8,6 +8,7 @@
import cn.com.basic.face.discern.common.SqliteSqlBean;
import cn.com.basic.face.discern.entity.Visit;
import cn.com.basic.face.discern.entity.VisitDetail;
+import cn.com.basic.face.discern.query.condition.AttendanceQueryCondition;
import cn.com.basic.face.discern.query.condition.CheckInQueryCondition;
import cn.com.basic.face.fragment.CheckInFragment;
import cn.com.basic.face.service.sqlite.CheckInDao;
@@ -44,6 +45,7 @@
}
if (BaseApplication.getInstance().networkAvailable()) {
params.setUri(AppApi.BASE_URL +AppApi.VISIT_ADD);
+ params.addBodyParameter(Visit.FieldNames.deviceCompanyId, BaseApplication.getInstance().getAndroidDevice().getCompanyId());
x.http().post(params, new BaseCommonCallBack() {
@Override
public void success() {
@@ -93,6 +95,7 @@
params.addBodyParameter(CheckInQueryCondition.FieldNames.username, searchText);
params.addBodyParameter(CommonVariables.Page.PAGE_NUM, pageNum+"");
params.addBodyParameter(CommonVariables.Page.PAGE_SIZE, CommonVariables.Page.DEFAULT_PAGE_SIZE);
+ params.addBodyParameter("deviceCompanyId", BaseApplication.getInstance().getAndroidDevice().getCompanyId());
x.http().post(params, new BaseCommonCallBack() {
public void success() {
findCheckInLeftListAfterReturn(resultBean, isVisitorList, isSortByDept, append);
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/DepartmentMng.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/DepartmentMng.java
index c9f353e..75b391f 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/DepartmentMng.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/DepartmentMng.java
@@ -27,6 +27,7 @@
}
if (BaseApplication.getInstance().networkAvailable()) {
RequestParams params = new RequestParams(AppApi.BASE_URL +AppApi.Query.DEPARTMENT_QUERY);
+ params.addBodyParameter("deviceCompanyId", BaseApplication.getInstance().getAndroidDevice().getCompanyId());
x.http().get(params, new BaseCommonCallBack() {
public void success() {
SelectDialog.setDepartmentDictionaryList(getDictionaryNameList(getList(Dictionary.class)));
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/DeviceMng.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/DeviceMng.java
index 57d534e..eb38d12 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/DeviceMng.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/DeviceMng.java
@@ -69,6 +69,7 @@
params.addBodyParameter(Device.FieldNames.sn, authorationId);
params.addBodyParameter(Device.FieldNames.type, CommonVariables.DeviceType.ANDROID_DEVICE);
+ params.addBodyParameter("deviceCompanyId", BaseApplication.getInstance().getAndroidDevice().getCompanyId());
x.http().post(params, new BaseCommonCallBack() {
public void success() {
loadAfterReturn(getList(Device.class));
@@ -98,6 +99,7 @@
RequestParams params = new RequestParams(AppApi.BASE_URL + AppApi.Query.DEVICE_QUERY);
params.addBodyParameter(Device.FieldNames.belongId, device.getBelongId());
params.addBodyParameter(Device.FieldNames.type, CommonVariables.DeviceType.CAMERA1);
+ params.addBodyParameter("deviceCompanyId", BaseApplication.getInstance().getAndroidDevice().getCompanyId());
x.http().post(params, new BaseCommonCallBack() {
public void success() {
List<Device> devices = resultBean.getList(Device.class);
@@ -112,6 +114,7 @@
params = new RequestParams(AppApi.BASE_URL + AppApi.Query.DEVICE_QUERY);
params.addBodyParameter(Device.FieldNames.belongId, device.getBelongId());
params.addBodyParameter(Device.FieldNames.type, CommonVariables.DeviceType.CAMERA2);
+ params.addBodyParameter("deviceCompanyId", BaseApplication.getInstance().getAndroidDevice().getCompanyId());
x.http().post(params, new BaseCommonCallBack() {
public void success() {
List<Device> devices = resultBean.getList(Device.class);
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/DictionaryMng.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/DictionaryMng.java
index 5a60e71..2dd297c 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/DictionaryMng.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/DictionaryMng.java
@@ -58,6 +58,7 @@
if (BaseApplication.getInstance().networkAvailable()) {
RequestParams params = new RequestParams(AppApi.BASE_URL +AppApi.Query.DICTIONARY_QUERY);
params.addParameter(DictionaryQueryCondition.FieldNames.type, CommonVariables.DictionaryType.COUNTRY);
+ params.addBodyParameter("deviceCompanyId", BaseApplication.getInstance().getAndroidDevice().getCompanyId());
x.http().get(params, new BaseCommonCallBack() {
public void success() {
loadCountriesAfterReturn(getList(Dictionary.class));
@@ -120,6 +121,7 @@
if (BaseApplication.getInstance().networkAvailable()) {
RequestParams params = new RequestParams(AppApi.BASE_URL +AppApi.Query.DICTIONARY_QUERY);
params.addParameter(DictionaryQueryCondition.FieldNames.type, CommonVariables.DictionaryType.ID_TYPE);
+ params.addBodyParameter("deviceCompanyId", BaseApplication.getInstance().getAndroidDevice().getCompanyId());
x.http().get(params, new BaseCommonCallBack() {
public void success() {
SelectDialog.setIdTypeList(getDictionaryNameList(getList(Dictionary.class)));
@@ -137,6 +139,7 @@
if (BaseApplication.getInstance().networkAvailable()) {
RequestParams params = new RequestParams(AppApi.BASE_URL +AppApi.Query.DICTIONARY_QUERY);
params.addParameter(DictionaryQueryCondition.FieldNames.type, CommonVariables.DictionaryType.GENDER);
+ params.addBodyParameter("deviceCompanyId", BaseApplication.getInstance().getAndroidDevice().getCompanyId());
x.http().get(params, new BaseCommonCallBack() {
public void success() {
SelectDialog.setGenderList(getDictionaryNameList(getList(Dictionary.class)));
@@ -154,6 +157,7 @@
if (BaseApplication.getInstance().networkAvailable()) {
RequestParams params = new RequestParams(AppApi.BASE_URL +AppApi.Query.DICTIONARY_QUERY);
params.addParameter(DictionaryQueryCondition.FieldNames.type, CommonVariables.DictionaryType.VISIT_REASON);
+ params.addBodyParameter("deviceCompanyId", BaseApplication.getInstance().getAndroidDevice().getCompanyId());
x.http().get(params, new BaseCommonCallBack() {
public void success() {
SelectDialog.setVisitReasonList(getDictionaryNameList(getList(Dictionary.class)));
@@ -171,6 +175,7 @@
if (BaseApplication.getInstance().networkAvailable()) {
RequestParams params = new RequestParams(AppApi.BASE_URL +AppApi.Query.DICTIONARY_QUERY);
params.addParameter(DictionaryQueryCondition.FieldNames.type, CommonVariables.DictionaryType.RESOLUTION);
+ params.addBodyParameter("deviceCompanyId", BaseApplication.getInstance().getAndroidDevice().getCompanyId());
x.http().get(params, new BaseCommonCallBack() {
public void success() {
SelectDialog.setResolutionList(getDictionaryNameList(getList(Dictionary.class)));
@@ -188,6 +193,7 @@
if (BaseApplication.getInstance().networkAvailable()) {
RequestParams params = new RequestParams(AppApi.BASE_URL +AppApi.Query.DICTIONARY_QUERY);
params.addParameter(DictionaryQueryCondition.FieldNames.type, CommonVariables.DictionaryType.PROTOCOL);
+ params.addBodyParameter("deviceCompanyId", BaseApplication.getInstance().getAndroidDevice().getCompanyId());
x.http().get(params, new BaseCommonCallBack() {
public void success() {
SelectDialog.setProtocolList(getDictionaryNameList(getList(Dictionary.class)));
@@ -205,6 +211,7 @@
if (BaseApplication.getInstance().networkAvailable()) {
RequestParams params = new RequestParams(AppApi.BASE_URL +AppApi.Query.DICTIONARY_QUERY);
params.addParameter(DictionaryQueryCondition.FieldNames.type, CommonVariables.DictionaryType.CAMERA_BRAND);
+ params.addBodyParameter("deviceCompanyId", BaseApplication.getInstance().getAndroidDevice().getCompanyId());
x.http().get(params, new BaseCommonCallBack() {
public void success() {
SelectDialog.setCameraBrandList(getDictionaryNameList(getList(Dictionary.class)));
@@ -222,6 +229,7 @@
if (BaseApplication.getInstance().networkAvailable()) {
RequestParams params = new RequestParams(AppApi.BASE_URL +AppApi.Query.DICTIONARY_QUERY);
params.addParameter(DictionaryQueryCondition.FieldNames.type, CommonVariables.DictionaryType.VISITOR_TYPE);
+ params.addBodyParameter("deviceCompanyId", BaseApplication.getInstance().getAndroidDevice().getCompanyId());
x.http().get(params, new BaseCommonCallBack() {
public void success() {
SelectDialog.setVisitorTypeList(getDictionaryNameList(getList(Dictionary.class)));
@@ -240,6 +248,7 @@
if (BaseApplication.getInstance().networkAvailable()) {
RequestParams params = new RequestParams(AppApi.BASE_URL +AppApi.Query.DICTIONARY_QUERY);
params.addParameter(DictionaryQueryCondition.FieldNames.type, CommonVariables.DictionaryType.ATTENDER_TYPE);
+ params.addBodyParameter("deviceCompanyId", BaseApplication.getInstance().getAndroidDevice().getCompanyId());
x.http().get(params, new BaseCommonCallBack() {
public void success() {
SelectDialog.setAttenderTypeList(getDictionaryNameList(getList(Dictionary.class)));
@@ -259,6 +268,7 @@
params.addBodyParameter(Dictionary.FieldNames.type, type1);
params.addBodyParameter(Dictionary.FieldNames.name, name);
params.addBodyParameter(Dictionary.FieldNames.orderBy, "10");
+ params.addBodyParameter("deviceCompanyId", BaseApplication.getInstance().getAndroidDevice().getCompanyId());
x.http().post(params, new BaseCommonCallBack() {
public void success() {
SqliteSqlUtil.insert(getExtraList(SqliteSqlBean.class));
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..034f01f 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,6 +44,7 @@
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);
@@ -144,6 +145,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));
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/PostMng.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/PostMng.java
index 2c8d0c5..e1f4459 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/PostMng.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/PostMng.java
@@ -26,6 +26,7 @@
}
if (BaseApplication.getInstance().networkAvailable()) {
RequestParams params = new RequestParams(AppApi.BASE_URL +AppApi.Query.POST_QUERY);
+ params.addBodyParameter("deviceCompanyId", BaseApplication.getInstance().getAndroidDevice().getCompanyId());
x.http().get(params, new BaseCommonCallBack() {
public void success() {
SelectDialog.setPostDictionaryList(getDictionaryNameList(getList(Dictionary.class)));
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/RegisterMng.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/RegisterMng.java
index b195e77..cc29ef5 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/RegisterMng.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/RegisterMng.java
@@ -76,6 +76,7 @@
params.addBodyParameter("surveillancePhoto", surveillancePhotoFile);
params.addBodyParameter("uploadCustomPhoto", uploadCustomPhotoFile);
params.addBodyParameter("idCardPhoto", idCardPhotoFile);
+ params.addBodyParameter("deviceCompanyId", BaseApplication.getInstance().getAndroidDevice().getCompanyId());
if (idCardHeadPhoto != null && !"".equals(idCardHeadPhoto)) {
File f5 = new File(idCardHeadPhoto);
if (!f5.exists()) {
@@ -132,6 +133,7 @@
params.addBodyParameter("f0", f0);
params.addBodyParameter("surveillancePhoto", surveillancePhotoFile);
params.addBodyParameter("idCardPhoto", idCardHeadPhotoFile);
+ params.addBodyParameter("deviceCompanyId", BaseApplication.getInstance().getAndroidDevice().getCompanyId());
x.http().post(params, new BaseCommonCallBack() {
@Override
public void success() {
@@ -203,6 +205,7 @@
params.addBodyParameter("surveillancePhoto", surveillancePhotoFile);
params.addBodyParameter("uploadCustomPhoto", uploadCustomPhotoFile);
params.addBodyParameter("idCardPhoto", idCardPhotoFile);
+ params.addBodyParameter("deviceCompanyId", BaseApplication.getInstance().getAndroidDevice().getCompanyId());
if (idCardHeadPhoto != null && !"".equals(idCardHeadPhoto)) {
File f5 = new File(idCardHeadPhoto);
if (!f5.exists()) {
@@ -251,6 +254,7 @@
params.addBodyParameter("surveillancePhoto", item.getSurveillancePhoto());
params.addBodyParameter("uploadCustomPhoto", item.getUploadCustomPhoto());
params.addBodyParameter("idCardPhoto", item.getIdCardPhoto());
+ params.addBodyParameter("deviceCompanyId", BaseApplication.getInstance().getAndroidDevice().getCompanyId());
try {
File path = BaseApplication.getInstance().getFilesDir();
File f0 = new File(path, "f0");
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/SurveillanceMng.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/SurveillanceMng.java
index 99d7ae9..2ad661c 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/SurveillanceMng.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/SurveillanceMng.java
@@ -93,6 +93,7 @@
params.setUri(AppApi.BASE_URL + AppApi.SURVEILLANCE_UPLOAD);
params.addBodyParameter("f0", f0);
params.addBodyParameter("rawSurveillancePhoto", rawSurveillancePhotoFile);
+ params.addBodyParameter("deviceCompanyId", BaseApplication.getInstance().getAndroidDevice().getCompanyId());
x.http().post(params, new BaseCommonCallBack() {
@Override
public void success() {
@@ -149,6 +150,7 @@
params.addBodyParameter("rawSurveillancePhoto", rawSurveillancePhotoFile);
params.addBodyParameter("androidCreateTime", item.getCreateTime());
params.addBodyParameter("offlineUnknown", CommonVariables.Surveillance.OFFLINE_SURVEILLANCE_ITEM_TYPE +"");
+ params.addBodyParameter("deviceCompanyId", BaseApplication.getInstance().getAndroidDevice().getCompanyId());
x.http().post(params, new BaseCommonCallBack() {
@Override
public void success() {
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/VisitMng.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/VisitMng.java
index 389509d..2b18214 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/VisitMng.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/VisitMng.java
@@ -32,6 +32,7 @@
params.addBodyParameter(VisitQueryCondition.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() {
findLeftVisitorListAfterReturn(resultBean, append);
--
Gitblit v1.8.0