From 000e28ecb7a6b3425510bca7659a9e931eecda59 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期二, 09 五月 2017 11:09:24 +0800
Subject: [PATCH] 

---
 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/SurveillanceFragment.java |   26 +++++++++++++++++++++++---
 1 files changed, 23 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..7df78f8 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;
@@ -12,6 +13,7 @@
 import cn.com.basic.face.base.BaseFragment;
 
 import cn.com.basic.face.base.MainActivity;
+import cn.com.basic.face.service.DeviceMng;
 import cn.com.basic.face.util.RtspFaceNative;
 
 import cn.com.basic.face.service.SurveillanceMng;
@@ -49,7 +51,23 @@
 
     static boolean useNative = false;
 
+    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 +76,9 @@
             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
+            RtspFaceNative.setLocalIP("192.168.1.203");
         }
     }
 
@@ -92,8 +112,8 @@
                             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.createPlayer(1, DeviceMng.getInstance().getCamera1Address());
+                                RtspFaceNative.createPlayer(2, DeviceMng.getInstance().getCamera2Address());
                                 RtspFaceNative.setFaceCallback(1, "cn/com/basic/face/util/RtspFaceNative", "faceCallBack");
                                 RtspFaceNative.setFaceCallback(2, "cn/com/basic/face/util/RtspFaceNative", "faceCallBack");
                             }

--
Gitblit v1.8.0