From 5b110458003bea3eb8365891f186a6ee38a300b1 Mon Sep 17 00:00:00 2001 From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674> Date: 星期三, 19 七月 2017 18:12:28 +0800 Subject: [PATCH] --- VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/SurveillanceMng.java | 3 +++ VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/UnknownSurveillanceQueryItemUtil.java | 2 +- VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/common/CommonVariables.java | 2 +- VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/RtspFaceNative.java | 2 +- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/common/CommonVariables.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/common/CommonVariables.java index 76b8c99..1d500a8 100644 --- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/common/CommonVariables.java +++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/common/CommonVariables.java @@ -73,7 +73,7 @@ public static final int VISIT_ATTENDANCE_IN = 5; public static final int VISIT_ATTENDANCE_OUT = 6; public static final int VISIT_ATTENDANCE_BLANK = 7; - public static final int VISIT_UNKNOWN_ITEM_TYPE = 8; + public static final int OFFLINE_UNKNOWN_ITEM_TYPE = 8; public static final int REGISTER_CELL_VIEW_INDEX = 0; public static final int CHECK_IN_CELL_VIEW_INDEX = 1; 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 cc4343e..5299a05 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 @@ -10,6 +10,7 @@ import cn.com.basic.face.base.BaseApplication; import cn.com.basic.face.base.MainActivity; import cn.com.basic.face.discern.common.BaseCommonCallBack; +import cn.com.basic.face.discern.common.CommonVariables; import cn.com.basic.face.discern.query.item.SurveillanceQueryItem; import cn.com.basic.face.discern.query.item.UnknownQueryItem; import cn.com.basic.face.service.sqlite.SurveillanceDao; @@ -138,6 +139,8 @@ params.setUri(AppApi.BASE_URL + AppApi.SURVEILLANCE_UPLOAD); params.addBodyParameter("f0", f0); params.addBodyParameter("rawSurveillancePhoto", rawSurveillancePhotoFile); + params.addBodyParameter("androidCreateTime", item.getCreateTime()); + params.addBodyParameter("offlineUnknown", CommonVariables.Surveillance.OFFLINE_UNKNOWN_ITEM_TYPE+""); x.http().post(params, new BaseCommonCallBack() { @Override public void success() { diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/RtspFaceNative.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/RtspFaceNative.java index 7ad08d9..2cc89a5 100644 --- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/RtspFaceNative.java +++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/RtspFaceNative.java @@ -151,7 +151,7 @@ surveillanceQueryItem.setCreateTime(new Date()); surveillanceQueryItem.setInOrOutCamera(cameraIdx+""); if (BaseApplication.getInstance().networkNotAvailable()) { - surveillanceQueryItem.setRegisterOrCheckIn(CommonVariables.Surveillance.VISIT_UNKNOWN_ITEM_TYPE); + surveillanceQueryItem.setRegisterOrCheckIn(CommonVariables.Surveillance.OFFLINE_UNKNOWN_ITEM_TYPE); } bitmapList.add(surveillanceQueryItem); } 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 5d83c8a..1d2fe24 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 @@ -24,7 +24,7 @@ public void removeTimeoutItemAndShow() { List itemsToRemove = new ArrayList(); for (SurveillanceQueryItem item : allItems) { - if (item.getRegisterOrCheckIn() == CommonVariables.Surveillance.VISIT_UNKNOWN_ITEM_TYPE) { + if (item.getRegisterOrCheckIn() == CommonVariables.Surveillance.OFFLINE_UNKNOWN_ITEM_TYPE) { Date now = new Date(); Date createTime = item.getCreateTime(); double minutes = (now.getTime() - createTime.getTime())*1.0 / 1000 / 60; -- Gitblit v1.8.0