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 | 102 ++++++++++++++++----------------------------------
1 files changed, 33 insertions(+), 69 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 2bbcd90..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
@@ -1,38 +1,34 @@
package cn.com.basic.face.base;
-import android.Manifest;
import android.app.AlertDialog;
import android.content.Context;
import android.content.DialogInterface;
import android.content.pm.ActivityInfo;
-import android.content.pm.PackageManager;
import android.content.res.Configuration;
import android.database.sqlite.SQLiteDatabase;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.graphics.Canvas;
import android.graphics.Color;
-import android.graphics.ImageFormat;
import android.graphics.Paint;
-import android.graphics.PorterDuff;
-import android.graphics.SurfaceTexture;
+import android.graphics.Paint.Align;
+import android.graphics.drawable.ColorDrawable;
import android.hardware.Camera;
+import android.hardware.Camera.PreviewCallback;
+import android.hardware.Camera.Size;
+import android.os.Bundle;
import android.os.Handler;
import android.support.design.widget.TabLayout;
-import android.support.v4.app.ActivityCompat;
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentManager;
import android.support.v4.app.FragmentPagerAdapter;
-import android.support.v4.content.ContextCompat;
import android.support.v4.view.ViewPager;
-import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.MotionEvent;
import android.view.SurfaceHolder;
import android.view.SurfaceView;
-import android.view.TextureView;
import android.view.View;
-import android.view.ViewGroup;
+import android.view.ViewGroup.LayoutParams;
import android.view.WindowManager;
import android.widget.EditText;
import android.widget.ImageView;
@@ -43,24 +39,7 @@
import com.awsle.aibatis.client.SqlMapClientBuilder;
import com.bsk.zhangbo.demoforbsk.R;
import com.luxand.FSDK;
-
-import cn.com.basic.face.discern.common.CommonVariables;
-import cn.com.basic.face.discern.entity.PhoneCall;
-import cn.com.basic.face.discern.query.item.SurveillanceQueryItem;
-import cn.com.basic.face.fragment.AttenderRegisterFragment;
-import cn.com.basic.face.fragment.SurveillanceFragment;
-import cn.com.basic.face.service.SurveillanceMng;
-import cn.com.basic.face.service.sqlite.SurveillanceDao;
-import cn.com.basic.face.service.sqlite.TestDao;
-import cn.com.basic.face.util.FileUtil;
-import cn.com.basic.face.util.NativeImg;
-import cn.com.basic.face.util.TabNameUtil;
-import cn.com.basic.face.fragment.AttendanceFragment;
-import cn.com.basic.face.fragment.CheckInFragment;
-import cn.com.basic.face.fragment.DeviceFragment;
-import cn.com.basic.face.fragment.PhoneCallFragment;
-import cn.com.basic.face.fragment.VisitorRegisterFragment;
-import cn.com.basic.face.fragment.VisitFragment;
+import com.luxand.FSDK.HTracker;
import java.io.File;
import java.io.FileNotFoundException;
@@ -69,46 +48,27 @@
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;
-import android.view.ViewGroup.LayoutParams;
-import com.luxand.FSDK;
-import com.luxand.FSDK.HTracker;
-
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileWriter;
-import java.util.List;
-import java.util.concurrent.locks.Lock;
-import java.util.concurrent.locks.ReentrantLock;
-import android.app.Activity;
-import android.app.AlertDialog;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.pm.ActivityInfo;
-import android.content.res.Configuration;
-import android.graphics.Canvas;
-import android.graphics.Color;
-import android.graphics.Paint;
-import android.graphics.Paint.Align;
-import android.graphics.drawable.ColorDrawable;
-import android.hardware.Camera;
-import android.hardware.Camera.PreviewCallback;
-import android.hardware.Camera.Size;
-import android.os.Bundle;
-import android.util.Log;
-import android.view.LayoutInflater;
-import android.view.MotionEvent;
-import android.view.SurfaceHolder;
-import android.view.SurfaceView;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.view.Window;
-import android.view.WindowManager;
-import android.view.ViewGroup.LayoutParams;
-import android.widget.EditText;
+import cn.com.basic.face.discern.common.CommonVariables;
+import cn.com.basic.face.discern.query.item.SurveillanceQueryItem;
+import cn.com.basic.face.fragment.AttendanceFragment;
+import cn.com.basic.face.fragment.CheckInFragment;
+import cn.com.basic.face.fragment.DeviceFragment;
+import cn.com.basic.face.fragment.PhoneCallFragment;
+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;
+import cn.com.basic.face.util.FileUtil;
+import cn.com.basic.face.util.NativeImg;
+import cn.com.basic.face.util.TabNameUtil;
public class MainActivity extends BaseActivity implements View.OnClickListener{
@@ -167,8 +127,7 @@
myThread = new MyThread();
myThread.start();
}
- initDb();
- initSqlMap();
+// initSqlMap();
}
public static MainActivity getInstance() {
@@ -378,12 +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);
@@ -549,7 +511,8 @@
@Override
protected void onStop() {
super.onStop();
- Config.sqlMap.getDb().close();
+ //Config.sqlMap.getDb().close();
+ db.close();
}
}
@@ -759,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