xuxiuxi
2017-07-23 ec30db486f424d304dc507e0077182404b65f9e6


git-svn-id: http://192.168.1.226/svn/proxy@828 454eff88-639b-444f-9e54-f578c98de674
8个文件已修改
48 ■■■■ 已修改文件
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/SurveillanceQueryItemUtil.java 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/UnknownSurveillanceQueryItemUtil.java 22 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/attendance/AttendanceLeftListView.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/attendance/AttendanceRightListView.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/checkin/CheckInLeftInterviewee.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/checkin/CheckInLeftVisitor.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/phonecall/PhoneCallLeftListView.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/visit/VisitLeftListView.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/SurveillanceQueryItemUtil.java
@@ -21,17 +21,17 @@
    }
    //所有监控图片
    private static List<SurveillanceQueryItem> allItems = new ArrayList<>();
    public static List<SurveillanceQueryItem> allItems = new ArrayList<>();
    //访客选项卡的分类(未注册/人员类型、来访状态、标签状态)
    //考勤选项卡(考勤人员类型:教师、学生、员工,来访状态:签到、签退)
    //第一行显示未注册,第二行显示来访
    private static List<SurveillanceQueryItem> visitorTwoRows = new ArrayList<>();
    public static List<SurveillanceQueryItem> visitorTwoRows = new ArrayList<>();
    //第一行显示签到,第二行显示签退
    private static List<SurveillanceQueryItem> attendanceTwoRows = new ArrayList<>();
    public static List<SurveillanceQueryItem> attendanceTwoRows = new ArrayList<>();
    //未注册的访客列表, 选择时用
    private static List<SurveillanceQueryItem> allUnregisterVisitorTwoRowsForSelect = new ArrayList();
    public static List<SurveillanceQueryItem> allUnregisterVisitorTwoRowsForSelect = new ArrayList();
    //未注册的考勤列表, 选择时用
    private static List<SurveillanceQueryItem> allUnregisterAttenderTwoRowsForSelect = new ArrayList();
    public static List<SurveillanceQueryItem> allUnregisterAttenderTwoRowsForSelect = new ArrayList();
    public void addItems(List<SurveillanceQueryItem> returnItems, List<SurveillanceQueryItem> requestItems, String cameraInOrOut) {
        for ( int i = 0; i < returnItems.size(); i++) {
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/UnknownSurveillanceQueryItemUtil.java
@@ -16,7 +16,7 @@
        return instance;
    }
    List<SurveillanceQueryItem> allItems = new ArrayList<>();
    static List<SurveillanceQueryItem> allItems = new ArrayList<>();
    public void addItems(List<SurveillanceQueryItem> unknownItems) {
        allItems.addAll(unknownItems);
@@ -24,18 +24,20 @@
    }
    public void removeTimeoutItemAndShow() {
        List itemsToRemove = new ArrayList();
        for (SurveillanceQueryItem item : allItems) {
            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;
                if (minutes >= 5) {
                    itemsToRemove.add(item);
        synchronized (this) {
            List itemsToRemove = new ArrayList();
            for (SurveillanceQueryItem item : allItems) {
                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;
                    if (minutes >= 5) {
                        itemsToRemove.add(item);
                    }
                }
            }
            allItems.removeAll(itemsToRemove);
        }
        allItems.removeAll(itemsToRemove);
        MainActivity.getInstance().runOnUiThread(new Runnable() {
            @Override
            public void run() {
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/attendance/AttendanceLeftListView.java
@@ -15,8 +15,8 @@
public class AttendanceLeftListView extends EasyRecyclerView {
    private AttendanceFragment.AttendanceLeftAdapter adapter;
    private Parcelable recyclerViewState;
    private static AttendanceFragment.AttendanceLeftAdapter adapter;
    private static Parcelable recyclerViewState;
    private void initView() {
        adapter = new AttendanceFragment.AttendanceLeftAdapter();
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/attendance/AttendanceRightListView.java
@@ -12,8 +12,8 @@
public class AttendanceRightListView extends EasyRecyclerView {
    private AttendanceFragment.AttendanceRightAdapter adapter;
    private Parcelable recyclerViewState;
    private static AttendanceFragment.AttendanceRightAdapter adapter;
    private static Parcelable recyclerViewState;
    private void initView() {
        adapter = new AttendanceFragment.AttendanceRightAdapter();
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/checkin/CheckInLeftInterviewee.java
@@ -16,7 +16,7 @@
public class CheckInLeftInterviewee extends EasyRecyclerView {
    private CheckInFragment.CheckInLeftIntervieweeAdapter adapter = new CheckInFragment.CheckInLeftIntervieweeAdapter();
    private static CheckInFragment.CheckInLeftIntervieweeAdapter adapter = new CheckInFragment.CheckInLeftIntervieweeAdapter();
    private List list = new ArrayList();
    private Parcelable recyclerViewState;
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/checkin/CheckInLeftVisitor.java
@@ -16,7 +16,7 @@
public class CheckInLeftVisitor extends EasyRecyclerView {
    private CheckInFragment.CheckInLeftVisitorAdapter adapter = new CheckInFragment.CheckInLeftVisitorAdapter();
    private static CheckInFragment.CheckInLeftVisitorAdapter adapter = new CheckInFragment.CheckInLeftVisitorAdapter();
    private List list = new ArrayList();
    private Parcelable recyclerViewState;
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/phonecall/PhoneCallLeftListView.java
@@ -14,7 +14,7 @@
public class PhoneCallLeftListView extends EasyRecyclerView {
    private PhoneCallLeftAdapter adapter ;
    private static PhoneCallLeftAdapter adapter ;
    private Parcelable recyclerViewState;
    private void initView() {
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/visit/VisitLeftListView.java
@@ -14,7 +14,7 @@
public class VisitLeftListView extends EasyRecyclerView {
    private VisitFragment.VisitLeftAdapter adapter;
    private static VisitFragment.VisitLeftAdapter adapter;
    private Parcelable recyclerViewState;
    private void initView() {