From 0e32d241f9ddd7e202879230585cb939dd3877b2 Mon Sep 17 00:00:00 2001
From: houxiao <houxiao@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期二, 25 四月 2017 13:00:34 +0800
Subject: [PATCH] bug fix

---
 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/RtspFaceNative.java |   78 +++++++++++++++++++++++++++++---------
 1 files changed, 59 insertions(+), 19 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 9158c6f..2d6c4af 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,6 +1,7 @@
 package cn.com.basic.face.util;
 
 import android.graphics.Bitmap;
+import android.util.Base64;
 import android.util.Log;
 import android.view.Surface;
 
@@ -11,8 +12,13 @@
 import java.util.List;
 
 import cn.com.basic.face.base.MainActivity;
+import cn.com.basic.face.discern.query.item.SurveillanceQueryItem;
 import cn.com.basic.face.fragment.RegisterFragment;
 import cn.com.basic.face.service.SurveillanceMng;
+
+/**
+ * Created by houxiao on 2017/3/21 0021.
+ */
 
 class NativeImgIdx {
     public int offset;
@@ -25,7 +31,18 @@
 class RefByteArray
 {
     public byte[] arr;
+    public byte[][] arr2;
 }
+
+class NativeImg
+{
+    public int size;
+    public int type;
+    public int width;
+    public int height;
+    public byte[] image;
+}
+
 
 public class RtspFaceNative {
 
@@ -41,47 +58,70 @@
     public static native void lockFace(int cameraIdx);
     public static native void releaseFace(int cameraIdx);
     public static native int getFaceList(int cameraIdx, RefByteArray faceListPb);
-    public static native ArrayList<NativeImgIdx> getFaceImages(int cameraIdx, RefByteArray faceImages);
+    //public static native ArrayList<NativeImgIdx> getFaceImages(int cameraIdx, RefByteArray faceImages);
+    public static native ArrayList<NativeImg> getFaceImages(int cameraIdx);
 
-    public static void faceCallBack(int cameraIdx, int count)
+    public static void faceCallBack(int cameraInOrOut, int count)
     {
-        Log.i("@@@", "RtspFaceNative.faceCallBack, cameraIdx=" + cameraIdx + ", count=" + count);
+        Log.i("@@@", "RtspFaceNative.faceCallBack, cameraIdx=" + cameraInOrOut + ", count=" + count);
 
         // something else
         if (count <= 0)
             return;
 
-        lockFace(cameraIdx);
+        lockFace(cameraInOrOut);
 
         RefByteArray faceListPb = new RefByteArray();
-        int s = getFaceList(cameraIdx, faceListPb);
-        Log.i("@@@", "RtspFaceNative.faceCallBack, getFaceList, cameraIdx=" + cameraIdx + ", size=" + s);
+        int s = getFaceList(cameraInOrOut, faceListPb);
+        Log.i("@@@", "RtspFaceNative.faceCallBack, getFaceList, cameraIdx=" + cameraInOrOut + ", size=" + s);
 
-        RefByteArray faceImages = new RefByteArray();
-        ArrayList<NativeImgIdx> faceImagesIdx = getFaceImages(cameraIdx, faceImages);
+        //RefByteArray faceImages = new RefByteArray();
+        //ArrayList<NativeImgIdx> faceImagesIdx = getFaceImages(cameraIdx, faceImages);
+        //int c = 0;
+        //if (faceImagesIdx != null)
+        //    c = faceImagesIdx.size();
+        //Log.i("@@@", "RtspFaceNative.faceCallBack, getFaceImages, cameraIdx=" + cameraIdx + ", count=" + c);
+
+        ArrayList<NativeImg> faceImages = getFaceImages(cameraInOrOut);
         int c = 0;
-        if (faceImagesIdx != null)
-            c = faceImagesIdx.size();
-        Log.i("@@@", "RtspFaceNative.faceCallBack, getFaceImages, cameraIdx=" + cameraIdx + ", count=" + c);
+        if (faceImages != null)
+            c = faceImages.size();
+        Log.i("@@@", "RtspFaceNative.faceCallBack, getFaceImages, cameraIdx=" + cameraInOrOut + ", count=" + c);
+
+        for (int i = 0; i < c; i++)
+        {
+            Log.i("@@@", "cameraIdx=" + cameraInOrOut +
+                    ", i=" + i +
+                    ", size=" + faceImages.get(i).size+
+                    ", w=" + faceImages.get(i).width +
+                    ", h=" + faceImages.get(i).height +
+                    ", image[0]=" + faceImages.get(i).image[0] +
+                    ", image[1]=" + faceImages.get(i).image[1]);
+        }
 
         try{
-            List<Bitmap> bitmapList = new ArrayList();
-            for (int i = 0; i < faceImagesIdx.size(); i++) {
-                NativeImgIdx item = faceImagesIdx.get(i);
-                int offset = item.offset;
+            List<SurveillanceQueryItem> bitmapList = new ArrayList();
+            for (int i = 0; i < faceImages.size(); i++) {
+                NativeImg item = faceImages.get(i);
+                SurveillanceQueryItem surveillanceQueryItem = new SurveillanceQueryItem();
+                int offset = 0;
                 int size = item.size;
                 Bitmap bitmap = Bitmap.createBitmap(item.width,item.height, Bitmap.Config.RGB_565);
-                ByteBuffer byteBuffer = ByteBuffer.wrap(faceImages.arr, offset, size);
+                ByteBuffer byteBuffer = ByteBuffer.wrap(item.image, offset, size);
                 bitmap.copyPixelsFromBuffer(byteBuffer);
-                bitmapList.add(bitmap);
+                surveillanceQueryItem.setBase64Image(Base64.encodeToString(item.image, offset, size, Base64.DEFAULT));
+                surveillanceQueryItem.setBitmap(bitmap);
+                surveillanceQueryItem.setWidth(item.width+"");
+                surveillanceQueryItem.setHeight(item.height+"");
+                bitmapList.add(surveillanceQueryItem);
             }
-            SurveillanceMng.getInstance().addBitmap(bitmapList, faceListPb.arr, s);
+            SurveillanceMng.getInstance().addBitmap(bitmapList, faceListPb.arr, s, cameraInOrOut+"");
 
         }catch(Exception e){
             e.printStackTrace();
         }
 
-        releaseFace(cameraIdx);
+        releaseFace(cameraInOrOut);
     }
 
 }

--
Gitblit v1.8.0