xuxiuxi
2017-05-11 48f6bbfd957f1aba067d6ccf8e4bb00f811d35c8


git-svn-id: http://192.168.1.226/svn/proxy@620 454eff88-639b-444f-9e54-f578c98de674
1个文件已添加
5个文件已修改
66 ■■■■ 已修改文件
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/SurveillanceQueryItem.java 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/CheckInFragment.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/SurveillanceFragment.java 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/SurveillanceMng.java 35 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/res/drawable/bg_shadow.9.png 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/res/layout/fragment_surveillance.xml 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/SurveillanceQueryItem.java
@@ -3,6 +3,7 @@
import android.graphics.Bitmap;
import java.io.ByteArrayOutputStream;
import java.util.Date;
import android.net.Uri;
import android.util.Base64;
@@ -45,6 +46,8 @@
    private boolean surveillancePhotoSelected;
    private NativeImg nativeImg;
    private Date createTime;
    /**
     * Get 人员主键
@@ -228,4 +231,13 @@
    public void setNativeImg(NativeImg nativeImg) {
        this.nativeImg = nativeImg;
    }
    public Date getCreateTime() {
        return createTime;
    }
    public void setCreateTime(Date createTime) {
        this.createTime = createTime;
    }
}
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/CheckInFragment.java
@@ -225,6 +225,7 @@
    public void fragment_check_in_right_visitor_reason_click(View view) {
    }
    @OnClick(R.id.fragment_check_in_right_visitor_reason_more)
    public void fragment_check_in_right_visitor_reason_more_click(View view) {
        InputMethodManager imm = (InputMethodManager)MainActivity.getInstance().getSystemService(
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/SurveillanceFragment.java
@@ -1,5 +1,7 @@
package cn.com.basic.face.fragment;
import android.graphics.ImageFormat;
import android.media.ImageReader;
import android.os.Build;
import android.os.Bundle;
import android.view.SurfaceView;
@@ -63,11 +65,12 @@
    }
    static {
//        if (isEmulator()) {
//            useNative = false;
//        } else {
//            useNative = true;
//        }
        ImageReader imageReader = ImageReader.newInstance(100, 100, ImageFormat.JPEG, 3);
        if (isEmulator()) {
            useNative = false;
        } else {
            useNative = true;
        }
        if (useNative) {
            System.loadLibrary("cvface_api");
            System.loadLibrary("opencv_java3");
@@ -141,6 +144,7 @@
            }
        }).start();
        reloadBottomList();
        new SurveillanceMng.SurveillanceListThread().start();
    }
    @OnClick(R.id.fragment_supervisory_bottom_visitor_radio_button)
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/SurveillanceMng.java
@@ -6,12 +6,12 @@
import org.xutils.x;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
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;
@@ -33,6 +33,39 @@
        }
    }
    public static class SurveillanceListThread extends Thread {
        @Override
        public void run() {
            try {
                List prevList = SurveillanceMng.getInstance().removeTimeoutItem(null);
                SurveillanceMng.getInstance().registerTopAndCheckInBottom(prevList);
                SurveillanceFragment.getInstance().get_fragment_supervisory_bottom_visitor_list_view().show(prevList);
                Thread.sleep(1000*60*10);
            } catch (Exception e) {
                e.printStackTrace();
            }
        }
    }
    private List<SurveillanceQueryItem> removeTimeoutItem(List<SurveillanceQueryItem> prevList) {
        if (prevList == null) {
            prevList = SurveillanceFragment.getInstance().get_fragment_supervisory_bottom_visitor_list_view().getPrevList();
        }
        List<SurveillanceQueryItem> newPrevList = new ArrayList();
        for (SurveillanceQueryItem item : prevList) {
            if (item.getRegisterOrCheckIn() == CommonVariables.Surveillance.VISIT_REGISTER_ITEM_TYPE) {
                Date now = new Date();
                Date createTime = item.getCreateTime();
                long minutes = (now.getTime() - createTime.getTime()) / 1000 / 60;
                if (minutes*1.0 / 10 >= 1) {
                    continue;
                }
                newPrevList.add(item);
            }
        }
        return newPrevList;
    }
    public void addBitmap(final List<SurveillanceQueryItem> bitmapList, byte[] byteArray, int len, String cameraInOrOut) {
        if (!BaseApplication.deviceAvailable) {
            return;
VisitFace/DemoForBsk/app/src/main/res/drawable/bg_shadow.9.png
VisitFace/DemoForBsk/app/src/main/res/layout/fragment_surveillance.xml
@@ -40,8 +40,8 @@
            android:layout_weight="1"
            >
            <SurfaceView
                android:layout_width="640px"
                android:layout_height="480px"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:id="@+id/fragment_supervisory_enter_camera" />
            <RelativeLayout
                android:layout_width="match_parent"