From d999731ac1ba495dbfea06cbb14dcfd3a53bcd64 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期六, 22 七月 2017 00:03:04 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/base/MainActivity.java | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/base/MainActivity.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/base/MainActivity.java
index 756095e..4941c9a 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/base/MainActivity.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/base/MainActivity.java
@@ -48,6 +48,7 @@
import java.io.InputStream;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Date;
import java.util.List;
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantLock;
@@ -61,6 +62,7 @@
import cn.com.basic.face.fragment.SurveillanceFragment;
import cn.com.basic.face.fragment.VisitFragment;
import cn.com.basic.face.fragment.VisitorRegisterFragment;
+import cn.com.basic.face.service.DeviceMng;
import cn.com.basic.face.service.SurveillanceMng;
import cn.com.basic.face.service.sqlite.SurveillanceDao;
import cn.com.basic.face.service.sqlite.TestDao;
@@ -125,8 +127,7 @@
myThread = new MyThread();
myThread.start();
}
- initDb();
- initSqlMap();
+// initSqlMap();
}
public static MainActivity getInstance() {
@@ -336,13 +337,15 @@
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
+ initDb();
db=openOrCreateDatabase("/data/data/com.bsk.zhangbo.demoforbsk/databases/aibatis_test_db", Context.MODE_PRIVATE, null);
TestDao.getInstance().test();
+ DeviceMng.getInstance().findDevice();
if (CommonVariables.FACE_SERVER) {
sDensity = getResources().getDisplayMetrics().scaledDensity;
String s = FileUtil.getStringFromFile("/system/a");
- int res = FSDK.ActivateLibrary(s);
+ int res = FSDK.ActivateLibrary("bSB3NdbTnv/0eW/uhypSe6hDMtjZ76Sisw5NwcN+0sfahxOtoUW22el54e/M6cSG5/xsdVIorPgugbTIfoIIn7ltyw1QMSleNebVx/Xe8aRA8bP+aVDybjoWdW/0rDP9Pv7yqBzNXyuwjgsVhPB53VGP8oTirTSUP7PTzSwOEe0=");
if (res != FSDK.FSDKE_OK) {
mIsFailed = true;
showErrorAndClose("failed", res);
@@ -508,7 +511,8 @@
@Override
protected void onStop() {
super.onStop();
- Config.sqlMap.getDb().close();
+ //Config.sqlMap.getDb().close();
+ db.close();
}
}
@@ -718,12 +722,13 @@
surveillanceQueryItem.setWidth("100");
surveillanceQueryItem.setHeight("100");
surveillanceQueryItem.setRegisterOrCheckIn(CommonVariables.Surveillance.OFFLINE_SURVEILLANCE_ITEM_TYPE);
+ surveillanceQueryItem.setCreateTime(new Date());
bitmapList.add(surveillanceQueryItem);
if (BaseApplication.getInstance().networkAvailable()) {
SurveillanceMng.getInstance().addBitmap(bitmapList, nativeImg.image, 0, CommonVariables.Camera.IN+"", nativeImg.image);
} else {
- SurveillanceDao.getInstance().saveOfflineUnknownToLocal(bitmapList, nativeImg.image, CommonVariables.Camera.IN+"");
+ SurveillanceMng.getInstance().addOfflineBitmap(bitmapList, nativeImg.image, CommonVariables.Camera.IN+"");
}
}
--
Gitblit v1.8.0