From 2ae0446917184b36996823e9dbf452dba82e8994 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期五, 21 四月 2017 12:31:44 +0800
Subject: [PATCH] 

---
 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/SurveillanceFragment.java |   57 +++++++++++++++++++++++++++++++++++++++++++++++----------
 1 files changed, 47 insertions(+), 10 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 01b05da..e67aaa7 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,21 +1,29 @@
 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;
+import android.widget.TextView;
 import android.widget.VideoView;
 
 import com.bsk.zhangbo.demoforbsk.R;
 
 import cn.com.basic.face.base.BaseFragment;
 
-import com.bsk.zhangbo.demoforbsk.util.RtspFaceNative;
+import cn.com.basic.face.base.MainActivity;
+import cn.com.basic.face.util.RtspFaceNative;
 
 import cn.com.basic.face.service.SurveillanceMng;
 import cn.com.basic.face.widget.surveilance.SurveillanceBottomListView;
 
 import com.lidroid.xutils.view.annotation.ViewInject;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
 
 public class SurveillanceFragment extends BaseFragment {
 
@@ -32,16 +40,26 @@
     @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;
+    @ViewInject(R.id.fragment_surveillance_enter_timer)
+    private TextView fragment_surveillance_enter_timer;
+    @ViewInject(R.id.fragment_surveillance_exit_timer)
+    private TextView fragment_surveillance_exit_timer;
 
     static boolean useNative = false;
 
     static {
         if (useNative) {
+            System.loadLibrary("cvface_api");
+            System.loadLibrary("opencv_java3");
+            System.loadLibrary("protobuf-lite");
+            System.loadLibrary("protobuf");
+            System.loadLibrary("protoc");
             System.loadLibrary("rtspface");
             RtspFaceNative.init();
+            RtspFaceNative.setLocalIP("192.168.1.10");
         }
     }
 
@@ -70,16 +88,35 @@
             @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");
+                        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) {
                     e.printStackTrace();
+                }
+                try {
+                    final SimpleDateFormat sdf = new SimpleDateFormat("yyyy骞碝M鏈坉d鏃�  HH锛歮m锛歴s鍒�");
+                    while (true) {
+                        Thread.sleep(1000);
+                        MainActivity.getInstance().runOnUiThread(new Runnable() {
+                            @Override
+                            public void run() {
+                                fragment_surveillance_enter_timer.setText(sdf.format(new Date()));
+                                fragment_surveillance_exit_timer.setText(sdf.format(new Date()));
+                            }
+                        });
+                    }
+                } catch (InterruptedException e) {
                 }
             }
         }).start();
@@ -104,12 +141,12 @@
     public void setMenuVisibility(boolean menuVisible) {
         super.setMenuVisibility(menuVisible);
         if (menuVisible && fragment_supervisory_bottom_visit_list_view != null) {
-            reloadBottomList();
+            //reloadBottomList();
         }
     }
 
     private void reloadBottomList() {
-        SurveillanceMng.getInstance().findSupervisoryBottomList(fragment_supervisory_bottom_visitor_radio_button.isChecked());
+        SurveillanceMng.getInstance().findSurveillanceBottomList(fragment_supervisory_bottom_visitor_radio_button.isChecked());
     }
 
 }

--
Gitblit v1.8.0