From a9c8b39ffcb8f8a5f922cb0fce18861b3463d438 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期三, 19 四月 2017 11:30:45 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/SurveillanceMng.java | 2 +-
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/base/BaseApplication.java | 6 +-----
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/DeviceMng.java | 2 +-
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Device.java | 14 +++++++-------
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/CheckInMng.java | 4 ++--
5 files changed, 12 insertions(+), 16 deletions(-)
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/base/BaseApplication.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/base/BaseApplication.java
index 6b54d6b..cc3f78c 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/base/BaseApplication.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/base/BaseApplication.java
@@ -13,10 +13,6 @@
import org.xutils.x;
-/**
- * Created by zhangbo on 2017/2/15.
- */
-
public class BaseApplication extends Application{
private static BaseApplication application;
@@ -45,7 +41,7 @@
Fresco.initialize(this);
initOkHttpUtils();
application = this;
- DeviceMng.getInstance().findPlace();
+ DeviceMng.getInstance().findDevice();
DictionaryMng.getInstance().loadAllDictionaryData();
}
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Device.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Device.java
index 6a0cce1..8fcd35e 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Device.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Device.java
@@ -21,7 +21,7 @@
/**
* 鍏徃涓婚敭
*/
- public static final String companyId = "companyId";
+ public static final String deviceCompanyId = "deviceCompanyId";
/**
* 璁惧鍦扮偣
*/
@@ -35,7 +35,7 @@
// 璁惧涓婚敭
private String deviceId;
// 鍏徃涓婚敭
- private String companyId;
+ private String deviceCompanyId;
// 璁惧鍦扮偣
private String deviceName;
// 璁惧鎺堟潈鐮�
@@ -58,15 +58,15 @@
/**
* Get 鍏徃涓婚敭
*/
- public String getCompanyId() {
- return companyId;
+ public String getDeviceCompanyId() {
+ return deviceCompanyId;
}
/**
* Set 鍏徃涓婚敭
*/
- public void setCompanyId(String companyId) {
- this.companyId = companyId;
+ public void setDeviceCompanyId(String deviceCompanyId) {
+ this.deviceCompanyId = deviceCompanyId;
}
/**
@@ -99,7 +99,7 @@
public String toString() {
return
- ",璁惧涓婚敭 =" + deviceId + ",鍏徃涓婚敭 =" + companyId + ",璁惧鍦扮偣 =" + deviceName +
+ ",璁惧涓婚敭 =" + deviceId + ",鍏徃涓婚敭 =" + deviceCompanyId + ",璁惧鍦扮偣 =" + deviceName +
",璁惧鎺堟潈鐮� ="+ authorizationId;
}
}
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 6f6ae8d..45f8c07 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
@@ -47,9 +47,9 @@
public void findCheckInLeftList(final boolean isVisitorList, final boolean isSortByDept, String searchText, final int pageNum, final boolean append) {
RequestParams params = new RequestParams(AppApi.BASE_URL +AppApi.Query.CHECK_IN_QUERY);
if (isVisitorList) {
- params.addBodyParameter(CheckInQueryCondition.FieldNames.visitorCompanyId, BaseApplication.getInstance().getDevice().getCompanyId());
+ params.addBodyParameter(CheckInQueryCondition.FieldNames.visitorCompanyId, BaseApplication.getInstance().getDevice().getDeviceCompanyId());
} else {
- params.addBodyParameter(CheckInQueryCondition.FieldNames.employeeCompanyId, BaseApplication.getInstance().getDevice().getCompanyId());
+ params.addBodyParameter(CheckInQueryCondition.FieldNames.employeeCompanyId, BaseApplication.getInstance().getDevice().getDeviceCompanyId());
}
params.addBodyParameter(CheckInQueryCondition.FieldNames.username, searchText);
params.addBodyParameter(CommonVariables.Page.PAGE_NUM, pageNum+"");
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 8af3387..d500a20 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
@@ -22,7 +22,7 @@
return instance;
}
- public void findPlace() {
+ public void findDevice() {
try {
RequestParams params = new RequestParams(AppApi.BASE_URL + AppApi.Query.DEVICE_QUERY);
params.addBodyParameter(Device.FieldNames.authorizationId, authorationId);
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 8c3a5aa..3f19cd0 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
@@ -59,7 +59,7 @@
public void addBitmap(final List<Bitmap> bitmapList, byte[] byteArray, int len) {
RequestParams params = new RequestParams(AppApi.BASE_URL +AppApi.SURVEILLANCE_UPLOAD);
params.addBodyParameter("base64Photo", Base64.encodeToString(byteArray, 0, len, Base64.DEFAULT));
- params.addBodyParameter("deviceCompanyId", BaseApplication.getInstance().getDevice().getCompanyId());
+ params.addBodyParameter("deviceCompanyId", BaseApplication.getInstance().getDevice().getDeviceCompanyId());
params.addBodyParameter("deviceId", BaseApplication.getInstance().getDevice().getDeviceId());
params.addBodyParameter("enterOrExit", CommonVariables.EnterOrExit.ENTER+"");
x.http().post(params, new BaseCommonCallBack() {
--
Gitblit v1.8.0