From 4dcad62f9276d34d13ff6e35bd8b0a910a1df3f1 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期二, 18 四月 2017 17:05:15 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/SurveillanceFragment.java | 26 +++++++++++++++++---------
1 files changed, 17 insertions(+), 9 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 1b90897..b635a36 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
@@ -1,6 +1,9 @@
package cn.com.basic.face.fragment;
+import android.graphics.Bitmap;
import android.os.Bundle;
+import android.view.Surface;
+import android.view.SurfaceView;
import android.view.View;
import android.widget.RadioButton;
import android.widget.RadioGroup;
@@ -10,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;
@@ -32,9 +36,9 @@
@ViewInject(R.id.fragment_supervisory_bottom_attendance_list_view)
private SurveillanceBottomListView fragment_supervisory_bottom_attendance_list_view;
@ViewInject(R.id.fragment_supervisory_enter_camera)
- VideoView fragment_supervisory_enter_camera;
+ SurfaceView fragment_supervisory_enter_camera;
@ViewInject(R.id.fragment_supervisory_exit_camera)
- VideoView fragment_supervisory_exit_camera;
+ SurfaceView fragment_supervisory_exit_camera;
static boolean useNative = false;
@@ -47,6 +51,7 @@
System.loadLibrary("protoc");
System.loadLibrary("rtspface");
RtspFaceNative.init();
+ RtspFaceNative.setLocalIP("192.168.1.10");
}
}
@@ -75,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) {
@@ -110,7 +118,7 @@
public void setMenuVisibility(boolean menuVisible) {
super.setMenuVisibility(menuVisible);
if (menuVisible && fragment_supervisory_bottom_visit_list_view != null) {
- reloadBottomList();
+ //reloadBottomList();
}
}
--
Gitblit v1.8.0