From d6119c2d7fe2f802dd224d77bf2d95eeeedb4526 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期一, 10 七月 2017 16:08:15 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/base/BaseApplication.java | 37 ++++++++++++++++++++++++++++++-------
1 files changed, 30 insertions(+), 7 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..6b81919 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
@@ -1,6 +1,11 @@
package cn.com.basic.face.base;
import android.app.Application;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.ServiceConnection;
+import android.os.IBinder;
import cn.com.basic.face.discern.entity.Device;
import cn.com.basic.face.service.DictionaryMng;
@@ -22,23 +27,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
@@ -63,4 +85,5 @@
OkHttpUtils.init(this);
}
+
}
--
Gitblit v1.8.0