From c769d1392f1b540d61d78027d5a1295fb156bb4f Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期五, 02 六月 2017 16:17:10 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/PhoneCallMng.java | 3
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/SurveillanceMng.java | 4
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/base/BaseApplication.java | 31 ++++++++--
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/DeviceMng.java | 75 ++++++++++++++++++------
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/AttendanceMng.java | 3
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/RtspFaceNative.java | 7 --
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/CheckInFragment.java | 2
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/CheckInMng.java | 4 -
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/DeviceFragment.java | 13 ++++
9 files changed, 100 insertions(+), 42 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 85bf8a0..313e485 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
@@ -22,23 +22,40 @@
return application;
}
- private Device device;
+ private Device androidDevice;
+ private Device camera1;
+ private Device camera2;
+
public static boolean deviceAvailable = false;
- public void setDevice(Device device) {
- this.device = device;
+ public void setAndroidDevice(Device device) {
+ this.androidDevice = device;
if (device != null && device.getDeviceId() != null && !"".equals(device.getDeviceId())) {
deviceAvailable = true;
DictionaryMng.getInstance().loadAllDictionaryData();
}
}
- public Device getDevice() {
- if (device == null) {
- device = new Device();
+ public void setCamera1(Device camera1) {
+ this.camera1 = camera1;
+ if (camera1 != null && camera1.getDeviceId() != null && !"".equals(camera1.getDeviceId())) {
+ DictionaryMng.getInstance().loadAllDictionaryData();
}
- return device;
+ }
+
+ public void setCamera2(Device camera2) {
+ this.camera2 = camera2;
+ if (camera2 != null && camera2.getDeviceId() != null && !"".equals(camera2.getDeviceId())) {
+ DictionaryMng.getInstance().loadAllDictionaryData();
+ }
+ }
+
+ public Device getAndroidDevice() {
+ if (androidDevice == null) {
+ androidDevice = new Device();
+ }
+ return androidDevice;
}
@Override
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/CheckInFragment.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/CheckInFragment.java
index 0bcf130..f41150a 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/CheckInFragment.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/CheckInFragment.java
@@ -211,7 +211,7 @@
params.addBodyParameter(VisitDetail.FieldNames.stateId, ""+CommonVariables.VisitType.VISITOR_ENTERED);
params.addBodyParameter(VisitDetail.FieldNames.createTime, sdf.format(new Date()));
- params.addBodyParameter(VisitDetail.FieldNames.deviceId, BaseApplication.getInstance().getDevice().getDeviceId());
+ params.addBodyParameter(VisitDetail.FieldNames.deviceId, BaseApplication.getInstance().getAndroidDevice().getDeviceId());
CheckInMng.getInstance().add(params, visitReasonId);
}
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/DeviceFragment.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/DeviceFragment.java
index ced6efd..66931e1 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/DeviceFragment.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/DeviceFragment.java
@@ -14,6 +14,7 @@
import cn.com.basic.face.base.MainActivity;
import cn.com.basic.face.dialog.SelectDialog;
import cn.com.basic.face.discern.common.CommonVariables;
+import cn.com.basic.face.discern.entity.Device;
import cn.com.basic.face.service.DeviceMng;
import cn.com.basic.face.util.Constant;
import cn.com.basic.face.util.OkClickedListener;
@@ -304,5 +305,17 @@
},fragment_device_right_lan_protocol.getText().toString());
}
+ public void setAndroidDevice(Device androidDevice) {
+
+ }
+
+ public void setCamera1(Device camera1) {
+
+ }
+
+ public void setCamera2(Device camera2) {
+
+ }
+
}
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 9cbf508..741c8ab 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
@@ -14,7 +14,6 @@
import cn.com.basic.face.discern.query.condition.AttendanceQueryCondition;
import cn.com.basic.face.discern.query.item.AttendanceDetailQueryItem;
import cn.com.basic.face.discern.query.item.AttendanceQueryItem;
-import cn.com.basic.face.discern.query.item.VisitQueryItem;
import cn.com.basic.face.fragment.AttendanceFragment;
import cn.com.basic.face.util.AppApi;
import cn.com.basic.face.util.DateUtil;
@@ -74,7 +73,7 @@
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().getDevice().getCompanyId());
+ 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() {
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 ebb1730..20e21b3 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
@@ -5,7 +5,6 @@
import cn.com.basic.face.base.BaseApplication;
import cn.com.basic.face.discern.common.CommonVariables;
import cn.com.basic.face.discern.query.condition.CheckInQueryCondition;
-import cn.com.basic.face.discern.query.item.PhoneCallQueryItem;
import cn.com.basic.face.fragment.CheckInFragment;
import cn.com.basic.face.util.AppApi;
@@ -18,7 +17,6 @@
import java.util.List;
import cn.com.basic.face.discern.common.BaseCommonCallBack;
-import cn.com.basic.face.discern.query.condition.VisitorQueryCondition;
import cn.com.basic.face.discern.query.item.CheckInQueryItem;
import cn.com.basic.face.util.CharacterParser;
@@ -52,7 +50,7 @@
return;
}
RequestParams params = new RequestParams(AppApi.BASE_URL +AppApi.Query.CHECK_IN_QUERY);
- String deviceCompanyId = BaseApplication.getInstance().getDevice().getCompanyId();
+ String deviceCompanyId = BaseApplication.getInstance().getAndroidDevice().getCompanyId();
if (isVisitorList) {
params.addBodyParameter(CheckInQueryCondition.FieldNames.visitorCompanyId, deviceCompanyId);
} else {
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 f74447c..83d99d9 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
@@ -7,6 +7,7 @@
import cn.com.basic.face.base.BaseApplication;
import cn.com.basic.face.base.MainActivity;
import cn.com.basic.face.discern.common.CommonVariables;
+import cn.com.basic.face.fragment.DeviceFragment;
import cn.com.basic.face.util.AppApi;
import org.xutils.http.RequestParams;
@@ -65,9 +66,45 @@
params.addBodyParameter(Device.FieldNames.type, CommonVariables.DeviceType.ANDROID_DEVICE);
x.http().post(params, new BaseCommonCallBack() {
public void success() {
- List<Device> places = resultBean.getListBeanOfType(Device.class);
- if (places.size() > 0) {
- BaseApplication.getInstance().setDevice(places.get(0));
+ List<Device> devices = resultBean.getListBeanOfType(Device.class);
+ if (devices.size() > 0) {
+ final Device device = devices.get(0);
+ BaseApplication.getInstance().setAndroidDevice(device);
+ MainActivity.getInstance().runOnUiThread(new Runnable() {
+ @Override
+ public void run() {
+ DeviceFragment.getInstance().setAndroidDevice(device);
+
+ 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);
+ x.http().post(params, new BaseCommonCallBack() {
+ public void success() {
+ List<Device> devices = resultBean.getListBeanOfType(Device.class);
+ if (devices.size() > 0) {
+ final Device camera1 = devices.get(0);
+ BaseApplication.getInstance().setCamera1(camera1);
+ DeviceFragment.getInstance().setCamera1(camera1);
+ }
+ }
+ });
+
+
+ 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);
+ x.http().post(params, new BaseCommonCallBack() {
+ public void success() {
+ List<Device> devices = resultBean.getListBeanOfType(Device.class);
+ if (devices.size() > 0) {
+ final Device camera2 = devices.get(0);
+ BaseApplication.getInstance().setCamera2(camera2);
+ DeviceFragment.getInstance().setCamera2(camera2);
+ }
+ }
+ });
+ }
+ });
} else {
Toast.makeText(BaseApplication.getInstance(), "鏁版嵁搴撲腑鎵句笉鍒拌璁惧", Toast.LENGTH_SHORT).show();
}
@@ -92,22 +129,22 @@
public void saveLanSetting(Map<String, String> fields) {
- RequestParams params = new RequestParams(AppApi.BASE_URL + AppApi.Query.DEVICE_QUERY);
- params.addBodyParameter(Device.FieldNames.sn, authorationId);
- params.addBodyParameter(Device.FieldNames.type, CommonVariables.DeviceType.ANDROID_DEVICE);
- x.http().post(params, new BaseCommonCallBack() {
- public void success() {
- List<Device> places = resultBean.getListBeanOfType(Device.class);
- if (places.size() > 0) {
- BaseApplication.getInstance().setDevice(places.get(0));
- } else {
- Toast.makeText(BaseApplication.getInstance(), "鏁版嵁搴撲腑鎵句笉鍒拌璁惧", Toast.LENGTH_SHORT).show();
- }
- }
- });
-
-
- SharedPreferencesUtils.save(CommonVariables.DeviceSharedPreferences.LAN, fields);
+// RequestParams params = new RequestParams(AppApi.BASE_URL + AppApi.Query.DEVICE_QUERY);
+// params.addBodyParameter(Device.FieldNames.sn, authorationId);
+// params.addBodyParameter(Device.FieldNames.type, CommonVariables.DeviceType.ANDROID_DEVICE);
+// x.http().post(params, new BaseCommonCallBack() {
+// public void success() {
+// List<Device> places = resultBean.getListBeanOfType(Device.class);
+// if (places.size() > 0) {
+// BaseApplication.getInstance().setAndroidDevice(places.get(0));
+// } else {
+// Toast.makeText(BaseApplication.getInstance(), "鏁版嵁搴撲腑鎵句笉鍒拌璁惧", Toast.LENGTH_SHORT).show();
+// }
+// }
+// });
+//
+//
+// SharedPreferencesUtils.save(CommonVariables.DeviceSharedPreferences.LAN, fields);
}
public void saveSchoolSetting(Map<String, String> fields) {
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 e1f7d60..80540f6 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
@@ -20,7 +20,6 @@
import cn.com.basic.face.discern.query.condition.PhoneCallQueryCondition;
import cn.com.basic.face.discern.query.item.CheckInQueryItem;
import cn.com.basic.face.discern.query.item.PhoneCallQueryItem;
-import cn.com.basic.face.fragment.CheckInFragment;
import cn.com.basic.face.fragment.PhoneCallFragment;
import cn.com.basic.face.util.AppApi;
import cn.com.basic.face.util.CharacterParser;
@@ -131,7 +130,7 @@
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().getDevice().getDeviceId());
+ params.addBodyParameter(PhoneCall.FieldNames.deviceId, BaseApplication.getInstance().getAndroidDevice().getDeviceId());
params.addBodyParameter(PhoneCall.FieldNames.callerId, visitor.getRegisterId());
x.http().post(params, new BaseCommonCallBack() {
public void success() {
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 4fedf2d..dfed82e 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
@@ -74,8 +74,8 @@
}
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("deviceId", BaseApplication.getInstance().getDevice().getDeviceId());
+ params.addBodyParameter("deviceCompanyId", BaseApplication.getInstance().getAndroidDevice().getCompanyId());
+ params.addBodyParameter("deviceId", BaseApplication.getInstance().getAndroidDevice().getDeviceId());
params.addBodyParameter("InOrOutCamera", cameraInOrOut+"");
x.http().post(params, new BaseCommonCallBack() {
public void success() {
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/RtspFaceNative.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/RtspFaceNative.java
index 6ed3406..8604f22 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/RtspFaceNative.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/RtspFaceNative.java
@@ -1,20 +1,15 @@
package cn.com.basic.face.util;
import android.graphics.Bitmap;
-import android.util.Base64;
import android.util.Log;
import android.view.Surface;
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
import java.nio.ByteBuffer;
import java.util.ArrayList;
import java.util.List;
import cn.com.basic.face.base.BaseApplication;
-import cn.com.basic.face.base.MainActivity;
import cn.com.basic.face.discern.query.item.SurveillanceQueryItem;
-import cn.com.basic.face.fragment.RegisterFragment;
import cn.com.basic.face.service.SurveillanceMng;
/**
@@ -72,7 +67,7 @@
RefByteArray faceListPb = new RefByteArray();
try {
- COMPANY_ID = Integer.parseInt(BaseApplication.getInstance().getDevice().getCompanyId());
+ COMPANY_ID = Integer.parseInt(BaseApplication.getInstance().getAndroidDevice().getCompanyId());
} catch (Exception e) {
COMPANY_ID = 0;
}
--
Gitblit v1.8.0