From f78d6020a2750ca0d764d3013755710341fb8aa2 Mon Sep 17 00:00:00 2001
From: pans <pans@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期三, 09 八月 2017 17:38:21 +0800
Subject: [PATCH] capnproto add lib
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/base/MainActivity.java | 26 ++++++++++++++++++++++++++
1 files changed, 26 insertions(+), 0 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 4360998..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
@@ -53,6 +53,10 @@
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantLock;
+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;
@@ -63,9 +67,11 @@
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;
@@ -77,6 +83,15 @@
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();
@@ -93,6 +108,7 @@
mViewPager = (ViewPager) findViewById(R.id.viewpager);
mTabLayout.setTabGravity(TabLayout.GRAVITY_FILL);
instance = this;
+ internetAccessThread.start();
}
public MyFragmentPagerAdapter myFragmentPagerAdapter;
@@ -334,6 +350,8 @@
public static float sDensity = 1.0f;
+ InternetAccessThread internetAccessThread = new InternetAccessThread();
+
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
@@ -449,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
@@ -511,6 +533,10 @@
@Override
protected void onStop() {
super.onStop();
+ VisitorRegisterUploadPhotoDialog.getInstance().hide();
+ VisitorRegisterSelectPhotoDialog.getInstance().hide();
+ AttenderRegisterSelectPhotoDialog.getInstance().hide();
+ AttenderRegisterUploadPhotoDialog.getInstance().hide();
//Config.sqlMap.getDb().close();
// db.close();
}
--
Gitblit v1.8.0