From 3faa0f1156937cc0f19e3893bb04df2b882ea41d Mon Sep 17 00:00:00 2001 From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674> Date: 星期五, 21 七月 2017 11:33:56 +0800 Subject: [PATCH] --- VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/SurveillanceMng.java | 5 +++++ VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/DictionaryDao.java | 28 +++++++++++++--------------- VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/UnknownSurveillanceQueryItemUtil.java | 1 + VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/base/BaseApplication.java | 1 - VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/base/MainActivity.java | 6 +++++- VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/SurveillanceFragment.java | 4 +++- VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/SurveillanceDao.java | 1 - 7 files changed, 27 insertions(+), 19 deletions(-) diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/SurveillanceFragment.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/SurveillanceFragment.java index a93426f..3800a79 100644 --- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/SurveillanceFragment.java +++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/SurveillanceFragment.java @@ -344,7 +344,9 @@ @Override public int getRecycleViewItemType(int position) { - if (((SurveillanceQueryItem)getList().get(position)).getRegisterOrCheckIn() != Constant.Surveillance.VISIT_REGISTER_ITEM_TYPE) { + if (!(((SurveillanceQueryItem)getList().get(position)).getRegisterOrCheckIn() == Constant.Surveillance.VISIT_REGISTER_ITEM_TYPE + || ((SurveillanceQueryItem)getList().get(position)).getRegisterOrCheckIn() == CommonVariables.Surveillance.OFFLINE_SURVEILLANCE_ITEM_TYPE + )) { return 1; } return 0; 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 7e81f63..23f8f25 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 @@ -67,7 +67,6 @@ Fresco.initialize(this); initOkHttpUtils(); application = this; - DeviceMng.getInstance().findDevice(); } 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..dcdfe94 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; @@ -338,6 +340,7 @@ super.onCreate(savedInstanceState); 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; @@ -718,12 +721,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+""); } } diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/SurveillanceMng.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/SurveillanceMng.java index 1005c12..c101c69 100644 --- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/SurveillanceMng.java +++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/SurveillanceMng.java @@ -27,6 +27,11 @@ return instance; } + public void addOfflineBitmap(final List<SurveillanceQueryItem> bitmapList, final byte[] rawData, final String cameraInOrOut) { + SurveillanceDao.getInstance().saveOfflineUnknownToLocal(bitmapList, rawData, cameraInOrOut); + UnknownSurveillanceQueryItemUtil.getInstance().addItems(bitmapList); + } + public static class SurveillanceListThread extends Thread { @Override public void run() { diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/DictionaryDao.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/DictionaryDao.java index 13ef440..b4801e0 100644 --- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/DictionaryDao.java +++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/DictionaryDao.java @@ -23,15 +23,15 @@ public static DictionaryDao getInstance() { return instance; } - private static StringBuffer sb = new StringBuffer("select dict_id, name from dictionary "); - - private static List<Dictionary>load(String type){ List<Dictionary> list = new ArrayList<Dictionary>(); + StringBuffer sb = new StringBuffer("select dict_id, name from dictionary "); try { sb.append("where 1 = 1 and type = "); + sb.append("'"); sb.append(type); + sb.append("'"); Dictionary aqi = null; Cursor c = MainActivity.getInstance().db.rawQuery(sb.toString(), new String[]{}); while (c.moveToNext()) { @@ -113,17 +113,13 @@ return load(CommonVariables.DictionaryType.VISITOR_TYPE); } - - - /** - * 鍔犺浇鑰冨嫟绫诲瀷 - * @return - */ - public List<Dictionary> loadAttenderTypeList() { - return load(CommonVariables.DictionaryType.ATTENDER_TYPE); - } - - + /** + * 鍔犺浇鑰冨嫟绫诲瀷 + * @return + */ + public List<Dictionary> loadAttenderTypeList() { + return load(CommonVariables.DictionaryType.ATTENDER_TYPE); + } public List<Dictionary> addDictionary(String type, String name) { List<Dictionary> list = new ArrayList<Dictionary>(); @@ -131,12 +127,14 @@ StringBuilder sb = new StringBuilder(40); sb.append("insert into dictionary ( dict_id, name) values (") + .append("'") .append(type) + .append("'") .append(" , ") .append(")"); MainActivity.getInstance().db.rawQuery(sb.toString(), new String[]{}); Dictionary aqi = null; - Cursor c = MainActivity.getInstance().db.rawQuery(sb.toString(), new String[]{}); + Cursor c = MainActivity.getInstance().db.rawQuery("select dict_id,name from dictionary", new String[]{}); while (c.moveToNext()) { aqi = new Dictionary(); aqi.setDictId(c.getString(c.getColumnIndex("dict_id"))); diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/SurveillanceDao.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/SurveillanceDao.java index 27062f6..f8ff6d0 100644 --- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/SurveillanceDao.java +++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/SurveillanceDao.java @@ -44,7 +44,6 @@ cameraInOrOut + "','" + createTime + "'" +")" ); - UnknownSurveillanceQueryItemUtil.getInstance().addItems(bitmapList); } catch (Exception e) { e.printStackTrace(); diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/UnknownSurveillanceQueryItemUtil.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/UnknownSurveillanceQueryItemUtil.java index f76e8d8..3d4481f 100644 --- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/UnknownSurveillanceQueryItemUtil.java +++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/UnknownSurveillanceQueryItemUtil.java @@ -19,6 +19,7 @@ public void addItems(List<SurveillanceQueryItem> unknownItems) { allItems.addAll(unknownItems); + removeTimeoutItemAndShow(); } public void removeTimeoutItemAndShow() { -- Gitblit v1.8.0