From b5ade4e527bbff041bdb2547f617b03505a7f1f6 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期五, 21 七月 2017 10:59:57 +0800
Subject: [PATCH] 

---
 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/SurveillanceMng.java               |    2 +-
 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/UnknownSurveillanceQueryItemUtil.java |    2 +-
 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/base/MainActivity.java                     |    2 +-
 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/SurveillanceFragment.java          |    7 +++++--
 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/common/CommonVariables.java        |    4 ++--
 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/SurveillanceDao.java        |    1 -
 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/RtspFaceNative.java                   |    2 +-
 7 files changed, 11 insertions(+), 9 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 173e572..a93426f 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
@@ -16,6 +16,7 @@
 
 import java.util.List;
 
+import cn.com.basic.face.base.BaseApplication;
 import cn.com.basic.face.base.MainActivity;
 import cn.com.basic.face.discern.common.CommonVariables;
 import cn.com.basic.face.discern.query.item.CheckInQueryItem;
@@ -282,7 +283,9 @@
             layoutParams.height = (int)MainActivity.getInstance().getResources().getDimension(R.dimen.h127dp);
             layoutParams.width = (int)MainActivity.getInstance().getResources().getDimension(R.dimen.h122dp);
             mLayout.setLayoutParams(layoutParams);
-            if (((SurveillanceQueryItem)getList().get(position)).getRegisterOrCheckIn() != Constant.Surveillance.VISIT_REGISTER_ITEM_TYPE) {
+            SurveillanceQueryItem item1 = ((SurveillanceQueryItem)getList().get(position));
+            if (!(item1.getRegisterOrCheckIn() == Constant.Surveillance.VISIT_REGISTER_ITEM_TYPE
+                    || item1.getRegisterOrCheckIn() == CommonVariables.Surveillance.OFFLINE_SURVEILLANCE_ITEM_TYPE)) {
                 return;
             }
 
@@ -326,7 +329,7 @@
                     }
                 });
 
-                if (item.getImagePath() != null && !item.getImagePath().equals("")) {
+                if (item.getImagePath() != null && !item.getImagePath().equals("") && BaseApplication.getInstance().networkAvailable()) {
                     fragment_surveillance_photo_cell_photo.setImageURI(Uri.parse(AppApi.IMAGE_URL_BASE +item.getImagePath()));
                 } else {
                     if (item.getBitmap() != null) {
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 f02a7c9..2bbcd90 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
@@ -758,8 +758,8 @@
                 surveillanceQueryItem.setBitmap(bmp);
                 surveillanceQueryItem.setWidth("100");
                 surveillanceQueryItem.setHeight("100");
+                surveillanceQueryItem.setRegisterOrCheckIn(CommonVariables.Surveillance.OFFLINE_SURVEILLANCE_ITEM_TYPE);
                 bitmapList.add(surveillanceQueryItem);
-
 
                 if (BaseApplication.getInstance().networkAvailable()) {
                     SurveillanceMng.getInstance().addBitmap(bitmapList, nativeImg.image, 0, CommonVariables.Camera.IN+"", nativeImg.image);
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 1892602..7c9e650 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 OFFLINE_UNKNOWN_ITEM_TYPE = 8;
+        public static final int OFFLINE_SURVEILLANCE_ITEM_TYPE = 8;
 
         public static final int REGISTER_CELL_VIEW_INDEX = 0;
         public static final int CHECK_IN_CELL_VIEW_INDEX = 1;
@@ -111,7 +111,7 @@
         public static final String CAMERA2 = "camera2";
     }
 
-    public static boolean FACE_SERVER = true;
+    public static boolean FACE_SERVER = false;
     public static boolean ID_CARD = false;
     public static boolean EMULATOR = true;
 
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 5299a05..1005c12 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
@@ -140,7 +140,7 @@
             params.addBodyParameter("f0", f0);
             params.addBodyParameter("rawSurveillancePhoto", rawSurveillancePhotoFile);
             params.addBodyParameter("androidCreateTime", item.getCreateTime());
-            params.addBodyParameter("offlineUnknown", CommonVariables.Surveillance.OFFLINE_UNKNOWN_ITEM_TYPE+"");
+            params.addBodyParameter("offlineUnknown", CommonVariables.Surveillance.OFFLINE_SURVEILLANCE_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/service/sqlite/SurveillanceDao.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/SurveillanceDao.java
index 0f9e427..27062f6 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
@@ -46,7 +46,6 @@
             );
             UnknownSurveillanceQueryItemUtil.getInstance().addItems(bitmapList);
 
-            readOfflineUnknownFromLocal();
         } catch (Exception e) {
             e.printStackTrace();
         }
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 2cc89a5..0358c81 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.OFFLINE_UNKNOWN_ITEM_TYPE);
+                    surveillanceQueryItem.setRegisterOrCheckIn(CommonVariables.Surveillance.OFFLINE_SURVEILLANCE_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 1d2fe24..f76e8d8 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.OFFLINE_UNKNOWN_ITEM_TYPE) {
+            if (item.getRegisterOrCheckIn() == CommonVariables.Surveillance.OFFLINE_SURVEILLANCE_ITEM_TYPE) {
                 Date now = new Date();
                 Date createTime = item.getCreateTime();
                 double minutes = (now.getTime() - createTime.getTime())*1.0 / 1000 / 60;

--
Gitblit v1.8.0