From 15d0c49e85159b9e27870aff5280c0cd95b103c4 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期四, 04 五月 2017 17:16:56 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/SurveillanceFragment.java | 24 +++++++++++++++++++++---
1 files changed, 21 insertions(+), 3 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 b387c10..27e284a 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,5 +1,6 @@
package cn.com.basic.face.fragment;
+import android.os.Build;
import android.os.Bundle;
import android.view.SurfaceView;
import android.view.View;
@@ -47,9 +48,25 @@
@ViewInject(R.id.fragment_surveillance_exit_timer)
private TextView fragment_surveillance_exit_timer;
- static boolean useNative = false;
+ static boolean useNative = true;
+
+ public static boolean isEmulator() {
+ return Build.FINGERPRINT.startsWith("generic")
+ || Build.FINGERPRINT.startsWith("unknown")
+ || Build.MODEL.contains("google_sdk")
+ || Build.MODEL.contains("Emulator")
+ || Build.MODEL.contains("Android SDK built for x86")
+ || Build.MANUFACTURER.contains("Genymotion")
+ || (Build.BRAND.startsWith("generic") && Build.DEVICE.startsWith("generic"))
+ || "google_sdk".equals(Build.PRODUCT);
+ }
static {
+ if (isEmulator()) {
+ useNative = false;
+ } else {
+ useNative = true;
+ }
if (useNative) {
System.loadLibrary("cvface_api");
System.loadLibrary("opencv_java3");
@@ -58,7 +75,8 @@
System.loadLibrary("protoc");
System.loadLibrary("rtspface");
RtspFaceNative.init();
- RtspFaceNative.setLocalIP("192.168.1.10");
+// RtspFaceNative.setLocalIP("192.168.1.10");
+ RtspFaceNative.setLocalIP("192.168.1.106");//鑷繁鎵嬫満ip
}
}
@@ -93,7 +111,7 @@
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.createPlayer(2, "rtsp://admin:a1234567@192.168.1.68:554/h264/ch1/sub/av_stream");
RtspFaceNative.setFaceCallback(1, "cn/com/basic/face/util/RtspFaceNative", "faceCallBack");
RtspFaceNative.setFaceCallback(2, "cn/com/basic/face/util/RtspFaceNative", "faceCallBack");
}
--
Gitblit v1.8.0