From e465984927353ef5922b5c1fe9f7dd1cf29e9094 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期三, 26 七月 2017 10:05:06 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/base/MainActivity.java | 131 ++++++++++++++++++++-----------------------
1 files changed, 62 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 cda3df0..1a1d374 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,37 +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;
@@ -42,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;
@@ -68,46 +48,33 @@
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.dialog.AttenderRegisterSelectPhotoDialog;
+import cn.com.basic.face.dialog.AttenderRegisterUploadPhotoDialog;
+import cn.com.basic.face.dialog.VisitorRegisterSelectPhotoDialog;
+import cn.com.basic.face.dialog.VisitorRegisterUploadPhotoDialog;
+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.InternetAccessThread;
+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.service.sync.up.BaseSync;
+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{
@@ -115,6 +82,16 @@
private static TabLayout mTabLayout;
public static ViewPager mViewPager;
+ public SQLiteDatabase db;
+ private int internetAccessible = CommonVariables.InternetAccess.INTERNET_NOT_INITIALIZE;
+
+ public int getInternetAccessible() {
+ return internetAccessible;
+ }
+
+ public void setInternetAccessible(int internetAccessible) {
+ this.internetAccessible = internetAccessible;
+ }
public static void selectPage(int pageNum) {
mTabLayout.getTabAt(pageNum).select();
@@ -131,6 +108,7 @@
mViewPager = (ViewPager) findViewById(R.id.viewpager);
mTabLayout.setTabGravity(TabLayout.GRAVITY_FILL);
instance = this;
+ internetAccessThread.start();
}
public MyFragmentPagerAdapter myFragmentPagerAdapter;
@@ -165,8 +143,7 @@
myThread = new MyThread();
myThread.start();
}
- initDb();
- initSqlMap();
+// initSqlMap();
}
public static MainActivity getInstance() {
@@ -373,9 +350,15 @@
public static float sDensity = 1.0f;
+ InternetAccessThread internetAccessThread = new InternetAccessThread();
+
@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;
@@ -484,6 +467,10 @@
String templatePath = this.getApplicationInfo().dataDir + "/" + database;
FSDK.SaveTrackerMemoryToFile(mDraw.mTracker, templatePath);
}
+ VisitorRegisterUploadPhotoDialog.getInstance().hide();
+ VisitorRegisterSelectPhotoDialog.getInstance().hide();
+ AttenderRegisterSelectPhotoDialog.getInstance().hide();
+ AttenderRegisterUploadPhotoDialog.getInstance().hide();
}
@Override
@@ -546,7 +533,12 @@
@Override
protected void onStop() {
super.onStop();
- Config.sqlMap.getDb().close();
+ VisitorRegisterUploadPhotoDialog.getInstance().hide();
+ VisitorRegisterSelectPhotoDialog.getInstance().hide();
+ AttenderRegisterSelectPhotoDialog.getInstance().hide();
+ AttenderRegisterUploadPhotoDialog.getInstance().hide();
+ //Config.sqlMap.getDb().close();
+// db.close();
}
}
@@ -755,13 +747,14 @@
surveillanceQueryItem.setBitmap(bmp);
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