From e106dfb541412f60781bf872a24cd85e50f43212 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期二, 18 四月 2017 11:56:26 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/visit/VisitLeftListView.java | 3 +++
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/checkin/CheckInLeftInterviewee.java | 3 +++
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/SurveillanceFragment.java | 16 ++++++++++------
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/attendance/AttendanceLeftListView.java | 3 +++
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/RtspFaceNative.java | 3 +++
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/checkin/CheckInLeftVisitor.java | 26 +++++++++++++++-----------
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/phonecall/PhoneCallLeftListView.java | 3 +++
7 files changed, 40 insertions(+), 17 deletions(-)
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/SurveillanceFragment.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/SurveillanceFragment.java
index 614b248..a903abb 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/SurveillanceFragment.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/SurveillanceFragment.java
@@ -13,6 +13,7 @@
import cn.com.basic.face.base.BaseFragment;
+import cn.com.basic.face.base.MainActivity;
import cn.com.basic.face.util.RtspFaceNative;
import cn.com.basic.face.service.SurveillanceMng;
@@ -79,13 +80,16 @@
@Override
public void run() {
try {
- Thread.sleep(2000);
if (useNative) {
- RtspFaceNative.setSurface(1, fragment_supervisory_enter_camera.getHolder().getSurface());
- //RtspFaceNative.setSurface(2, fragment_supervisory_exit_camera.getHolder().getSurface());
- RtspFaceNative.createPlayer(1, "rtsp://admin:admin12345@192.168.1.70:554/h264/ch1/sub/av_stream");
- //RtspFaceNative.createPlayer(2, "rtsp://admin:admin12345@192.168.1.70:554/h264/ch1/sub/av_stream");
- RtspFaceNative.setFaceCallback(1, "cn/com/basic/face/util/RtspFaceNative", "faceCallBack");
+ MainActivity.getInstance().runOnUiThread(new Runnable() {
+ public void run() {
+ RtspFaceNative.setSurface(1, fragment_supervisory_enter_camera.getHolder().getSurface());
+ //RtspFaceNative.setSurface(2, fragment_supervisory_exit_camera.getHolder().getSurface());
+ RtspFaceNative.createPlayer(1, "rtsp://admin:admin12345@192.168.1.70:554/h264/ch1/sub/av_stream");
+ //RtspFaceNative.createPlayer(2, "rtsp://admin:admin12345@192.168.1.70:554/h264/ch1/sub/av_stream");
+ RtspFaceNative.setFaceCallback(1, "cn/com/basic/face/util/RtspFaceNative", "faceCallBack");
+ }
+ });
} else {
}
} catch (Exception e) {
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 9158c6f..e7601fc 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
@@ -67,6 +67,9 @@
try{
List<Bitmap> bitmapList = new ArrayList();
for (int i = 0; i < faceImagesIdx.size(); i++) {
+ if (i >= 1) {
+ break;
+ }
NativeImgIdx item = faceImagesIdx.get(i);
int offset = item.offset;
int size = item.size;
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/attendance/AttendanceLeftListView.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/attendance/AttendanceLeftListView.java
index 42cfadf..e4bfed8 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/attendance/AttendanceLeftListView.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/attendance/AttendanceLeftListView.java
@@ -48,6 +48,9 @@
}
newList.addAll(adapter.getList());
newList.addAll(list);
+ if (adapter.getList().size() > 0) {
+ this.scrollToPosition(adapter.getList().size()-1);
+ }
adapter.setList(newList);
} else {
adapter.setList(list);
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/checkin/CheckInLeftInterviewee.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/checkin/CheckInLeftInterviewee.java
index c94c67f..20b50cc 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/checkin/CheckInLeftInterviewee.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/checkin/CheckInLeftInterviewee.java
@@ -53,6 +53,9 @@
}
newList.addAll(adapter.getList());
newList.addAll(list);
+ if (adapter.getList().size() > 0) {
+ this.scrollToPosition(adapter.getList().size()-1);
+ }
adapter.setList(newList);
} else {
adapter.setList(list);
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/checkin/CheckInLeftVisitor.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/checkin/CheckInLeftVisitor.java
index 0f1392d..7aac8fd 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/checkin/CheckInLeftVisitor.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/checkin/CheckInLeftVisitor.java
@@ -1,6 +1,7 @@
package cn.com.basic.face.widget.checkin;
import android.content.Context;
+import android.support.v7.widget.RecyclerView;
import android.util.AttributeSet;
import com.camnter.easyrecyclerview.adapter.EasyRecyclerViewAdapter;
@@ -40,24 +41,27 @@
refresh(list, append);
}
- public void refresh(List list, boolean append) {
+ public void refresh(List theNewList, boolean append) {
if (append) {
+ List oldList = adapter.getList();
List newList = new ArrayList();
- if (adapter.getList().size() > 0 && adapter.getList().get(adapter.getList().size()-1) instanceof Integer && ((int)adapter.getList().get(adapter.getList().size()-1))== CommonVariables.Page.hasMorePages) {
- adapter.getList().remove(adapter.getList().size() - 1);
+ if (oldList.size() > 0 && oldList.get(oldList.size()-1) instanceof Integer &&
+ ((int)oldList.get(oldList.size()-1))== CommonVariables.Page.hasMorePages) {
+ oldList.remove(oldList.size() - 1);
}
- if (adapter.getList().size() > 0 && adapter.getList().get(adapter.getList().size()-1) instanceof
- Integer && ((int)adapter.getList().get(adapter.getList().size()-1))== CommonVariables.Page.noMorePage) {
- adapter.getList().remove(adapter.getList().size() - 1);
+ if (oldList.size() > 0 && oldList.get(oldList.size()-1) instanceof
+ Integer && ((int)oldList.get(oldList.size()-1))== CommonVariables.Page.noMorePage) {
+ oldList.remove(oldList.size() - 1);
}
- newList.addAll(adapter.getList());
- newList.addAll(list);
- adapter.setList(newList);
+ if (oldList.size() > 0) {
+ this.scrollToPosition(oldList.size()-1);
+ }
+ oldList.addAll(theNewList);
} else {
- adapter.setList(list);
+ adapter.setList(theNewList);
}
this.setAdapter(adapter);
+ adapter.notifyDataSetChanged();
}
-
}
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/phonecall/PhoneCallLeftListView.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/phonecall/PhoneCallLeftListView.java
index b41b5e3..e6f8075 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/phonecall/PhoneCallLeftListView.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/phonecall/PhoneCallLeftListView.java
@@ -47,6 +47,9 @@
}
newList.addAll(adapter.getList());
newList.addAll(list);
+ if (adapter.getList().size() > 0) {
+ this.scrollToPosition(adapter.getList().size()-1);
+ }
adapter.setList(newList);
} else {
adapter.setList(list);
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/visit/VisitLeftListView.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/visit/VisitLeftListView.java
index 2fd52a9..d4ca6d5 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/visit/VisitLeftListView.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/visit/VisitLeftListView.java
@@ -47,6 +47,9 @@
}
newList.addAll(adapter.getList());
newList.addAll(list);
+ if (adapter.getList().size() > 0) {
+ this.scrollToPosition(adapter.getList().size()-1);
+ }
adapter.setList(newList);
} else {
adapter.setList(list);
--
Gitblit v1.8.0