From 03584fe5508480698617a4d051fad7c44bd46ed7 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期一, 17 四月 2017 17:09:41 +0800
Subject: [PATCH] 

---
 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/RtspFaceNative.java |   79 ++++++++++++++-------------------------
 1 files changed, 28 insertions(+), 51 deletions(-)

diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/RtspFaceNative.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/RtspFaceNative.java
index f305f04..9158c6f 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/RtspFaceNative.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/RtspFaceNative.java
@@ -1,12 +1,18 @@
 package cn.com.basic.face.util;
 
+import android.graphics.Bitmap;
 import android.util.Log;
 import android.view.Surface;
-import java.util.ArrayList;
 
-/**
- * Created by houxiao on 2017/3/21 0021.
- */
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
+import java.nio.ByteBuffer;
+import java.util.ArrayList;
+import java.util.List;
+
+import cn.com.basic.face.base.MainActivity;
+import cn.com.basic.face.fragment.RegisterFragment;
+import cn.com.basic.face.service.SurveillanceMng;
 
 class NativeImgIdx {
     public int offset;
@@ -26,6 +32,7 @@
     //cn.com.basic.face.util.RtspFaceNative
 
     public static native void init();
+    public static native void setLocalIP(String ipaddr);
     public static native void setSurface(int cameraIdx, Surface surface);
     public static native boolean createPlayer(int cameraIdx, String uri);
     public static native void shutdown(int cameraIdx);
@@ -57,54 +64,24 @@
             c = faceImagesIdx.size();
         Log.i("@@@", "RtspFaceNative.faceCallBack, getFaceImages, cameraIdx=" + cameraIdx + ", count=" + c);
 
+        try{
+            List<Bitmap> bitmapList = new ArrayList();
+            for (int i = 0; i < faceImagesIdx.size(); i++) {
+                NativeImgIdx item = faceImagesIdx.get(i);
+                int offset = item.offset;
+                int size = item.size;
+                Bitmap bitmap = Bitmap.createBitmap(item.width,item.height, Bitmap.Config.RGB_565);
+                ByteBuffer byteBuffer = ByteBuffer.wrap(faceImages.arr, offset, size);
+                bitmap.copyPixelsFromBuffer(byteBuffer);
+                bitmapList.add(bitmap);
+            }
+            SurveillanceMng.getInstance().addBitmap(bitmapList, faceListPb.arr, s);
+
+        }catch(Exception e){
+            e.printStackTrace();
+        }
+
         releaseFace(cameraIdx);
     }
 
 }
-
-
-//    static int i = 1;
-//    public static void faceCallBack(int cameraIdx, int count)
-//    {
-//        lockFace(cameraIdx);
-//
-//        byte[] faceListPb = new byte[1024 * 1024 * 1];
-//        int s = getFaceList(cameraIdx, faceListPb);
-//
-//        //;byte(faceListPb,s)
-//
-//
-//        int[] faceImagesIdx = new int[10];
-//        byte[] faceImages = new byte[1024 * 1024 * 1];
-//        int c = getFaceImages(cameraIdx, faceImagesIdx, faceImages);
-//
-//        try {
-//            File path = BaseApplication.getInstance().getFilesDir();
-//            File f1 = new File(path, ""+i);
-//            if (!f1.exists()) {
-//                f1.createNewFile();
-//            }
-//            FileOutputStream f = new FileOutputStream(f1);
-//            f.write(faceImages);
-//            f.close();
-//            RequestParams params = new RequestParams();
-//            String encodedImage = Base64.encodeToString(faceImages, Base64.DEFAULT);
-//            params.addBodyParameter("choosePhoto", encodedImage);
-//            RegisterMng.getInstance().add(params);
-//        } catch (Exception e) {
-//            e.printStackTrace();
-//        }
-//
-//        releaseFace(cameraIdx);
-//    }
-
-//    public static void init() {};
-//    public static  void setSurface(int cameraIdx, Surface surface){};
-//    public static  boolean createPlayer(int cameraIdx, String uri){return true;};
-//    public static  void shutdown(int cameraIdx){};
-//    // typedef void (* Java_com_example_nativecodec_NativeCodec_FaceCallback_func)(int cameraIdx, int count);
-//    public static  boolean setFaceCallback(int cameraIdx, String func){return true;};
-//    public static  void lockFace(int cameraIdx){};
-//    public static  void releaseFace(int cameraIdx){};
-//    public static  boolean getFaceList(int cameraIdx, byte[] faceListPb){return true;};//浜岃繘鍒�
-//    public static  boolean getFaceImages(int cameraIdx, byte[] faceImagesIdx, byte[] faceImages){return true;};//鍥剧墖

--
Gitblit v1.8.0