From 3a5f09c61a87adb8dba2cc4a5366893886ba1c1d Mon Sep 17 00:00:00 2001
From: dupengyue <dupengyue@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期四, 20 七月 2017 17:31:40 +0800
Subject: [PATCH] 接口初步完成
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/SurveillanceFragment.java | 10 +++++++++-
1 files changed, 9 insertions(+), 1 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 7fb2382..0ed7ded 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
@@ -11,6 +11,7 @@
import android.view.SurfaceHolder;
import android.view.SurfaceView;
import android.view.View;
+import android.widget.LinearLayout;
import android.widget.ProgressBar;
import android.widget.RadioButton;
import android.widget.RadioGroup;
@@ -69,6 +70,9 @@
private RelativeLayout fragment_supervisory_exit_camera_relative_layout;
@ViewInject(R.id.fragment_supervisory_enter_camera_relative_layout)
private RelativeLayout fragment_supervisory_enter_camera_relative_layout;
+ @ViewInject(R.id.fragment_surveillance_bottom_linear_layout)
+ private LinearLayout fragment_surveillance_bottom_linear_layout;
+
static boolean useNative = false;
@@ -93,6 +97,9 @@
useNative = false;
}
//useNative = false;
+ if (CommonVariables.EMULATOR) {
+ useNative = false;
+ }
if (useNative) {
System.loadLibrary("cvface_api");
System.loadLibrary("opencv_java3");
@@ -169,7 +176,8 @@
if (CommonVariables.FACE_SERVER) {
fragment_supervisory_enter_camera_relative_layout.addView(MainActivity.getInstance().mPreview);
fragment_supervisory_enter_camera_relative_layout.addView(MainActivity.getInstance().mDraw);
-
+ //fragment_supervisory_exit_camera_relative_layout.setVisibility(View.GONE);
+ //fragment_surveillance_bottom_linear_layout.setVisibility(View.GONE);
}
fragment_supervisory_enter_camera.getHolder().addCallback(new SurfaceHolder.Callback() {
public void surfaceCreated(SurfaceHolder holder) {
--
Gitblit v1.8.0