From 0abb3d251383bcdf22db67e2b26431b7a7b74148 Mon Sep 17 00:00:00 2001
From: houxiao <houxiao@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期五, 11 八月 2017 14:30:34 +0800
Subject: [PATCH] bug fix
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/RtspFaceNative.java | 179 +++++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 159 insertions(+), 20 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 0746e56..deb6992 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,33 +1,172 @@
package cn.com.basic.face.util;
+import android.util.Log;
import android.view.Surface;
+import android.graphics.Bitmap;
+
+import java.util.Date;
+import java.util.List;
+
+import cn.com.basic.face.base.BaseApplication;
+import cn.com.basic.face.discern.common.CommonVariables;
+import cn.com.basic.face.discern.query.item.SurveillanceQueryItem;
+import cn.com.basic.face.service.SurveillanceMng;
+import cn.com.basic.face.service.sqlite.SurveillanceDao;
+
+import java.nio.ByteBuffer;
+
+import java.util.ArrayList;
/**
- * Created by xiuxi on 2017/3/21.
+ * Created by houxiao on 2017/3/21 0021.
*/
+
+class NativeImgIdx {
+ public int st_track_id;
+ public int offset;
+ public int size;
+ public int type;
+ public int width;
+ public int height;
+}
+
+class RefByteArray
+{
+ public byte[] arr;
+ public byte[][] arr2;
+}
+
public class RtspFaceNative {
-// public static native void init();
-// 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);
-// // typedef void (* Java_com_example_nativecodec_NativeCodec_FaceCallback_func)(int cameraIdx, int count);
-// public static native boolean setFaceCallback(int cameraIdx, String func);
-// public static native void lockFace(int cameraIdx);
-// public static native void releaseFace(int cameraIdx);
-// public static native boolean getFaceList(int cameraIdx, byte[] faceListPb);
-// public static native boolean getFaceImages(int cameraIdx, byte[] faceImagesIdx, byte[] faceImages);
+ //cn.com.basic.face.util.RtspFaceNative
- 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){};
+ public static native void init();
+ public static native void setLocalIP(String ipaddr);
+ public static native void setSurface(int cameraIdx, Surface surfaceRender);
+ public static native boolean createPlayer(int cameraIdx, String uri);
+ public static native 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;};//鍥剧墖
+ public static native boolean setFaceCallback(int cameraIdx, String className, String funcName);
+ public static native void lockFace(int cameraIdx);
+ public static native void releaseFace(int cameraIdx);
+ public static native int getFaceList(int cameraIdx, int dbId, RefByteArray faceListPb);
+ //public static native ArrayList<NativeImgIdx> getFaceImages(int cameraIdx, RefByteArray faceImages);
+ public static native ArrayList<NativeImg> getFaceImages(int cameraIdx);
+
+ public static native void dbgFaceAdd(NativeImg faceImage);
+ public static native String dbgGetLog();
+ public static native void dbgSetStfaceLicense(String lic);
+
+ //public static native void dbgReadTexture();
+
+ public static native void setCaptureSurface(Surface surfaceCapture);
+ public static native void startCapturePlayer(String uri);
+ public static native void stopCapturePlayer();
+ public static native ArrayList<NativeImg> getCaptureImages();
+ public static native void teleCall(String phoneNumber);
+ public static native void teleHang();
+
+ public static native void setFaceLabel(int cameraIdx, int stTrackId, String label);
+
+ public static int COMPANY_ID = 1001;
+
+ public static void faceCallBack(int cameraIdx, int count)
+ {
+ Log.i("@@@", "RtspFaceNative.faceCallBack, cameraIdx=" + cameraIdx + ", count=" + count);
+
+ // something else
+ if (count <= 0)
+ return;
+
+ lockFace(cameraIdx);
+
+ RefByteArray faceListPb = new RefByteArray();
+
+
+ try {
+ COMPANY_ID = Integer.parseInt(BaseApplication.getInstance().getAndroidDevice().getCompanyId());
+ } catch (Exception e) {
+ COMPANY_ID = 0;
+ }
+
+
+ int s = getFaceList(cameraIdx, COMPANY_ID, faceListPb);
+ Log.i("@@@", "RtspFaceNative.faceCallBack, getFaceList, cameraIdx=" + cameraIdx + ", size=" + s);
+
+ //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(cameraIdx);
+ int c = 0;
+ if (faceImages != null)
+ c = faceImages.size();
+ Log.i("@@@", "RtspFaceNative.faceCallBack, getFaceImages, cameraIdx=" + cameraIdx + ", count=" + c);
+
+ for (int i = 0; i < c; i++)
+ {
+ Log.i("@@@", "cameraIdx=" + cameraIdx +
+ ", i=" + i +
+ ", st_track_id=" + faceImages.get(i).st_track_id+
+ ", 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]);
+
+ if (i == 0)
+ {
+ //Bitmap bitmap = Bitmap.createBitmap(faceImages.get(i).width, faceImages.get(i).height, Bitmap.Config.RGB_565);
+ //ByteBuffer byteBuffer = ByteBuffer.wrap(faceImages.get(i).image, 0, faceImages.get(i).size);
+ //bitmap.copyPixelsFromBuffer(byteBuffer);
+ //NativeCodec.setFaceDrawable(bitmap);
+
+ //NativeCodec.setFaceDrawable(faceImages.get(i));
+ }
+ }
+
+ try{
+
+ List<SurveillanceQueryItem> bitmapList = new ArrayList();
+ for (int i = 0; i < faceImages.size(); i++) {
+ NativeImg item = faceImages.get(i);
+ SurveillanceQueryItem surveillanceQueryItem = new SurveillanceQueryItem();
+ surveillanceQueryItem.setStTrackId(item.st_track_id);
+ int offset = 0;
+ int size = item.size;
+ Bitmap bitmap = Bitmap.createBitmap(item.width,item.height, Bitmap.Config.RGB_565);
+ ByteBuffer byteBuffer = ByteBuffer.wrap(item.image, offset, size);
+ //byteBuffer.rewind();
+ bitmap.copyPixelsFromBuffer(byteBuffer);
+// String str = Base64.encodeToString(item.image, offset, size, Base64.DEFAULT);
+// surveillanceQueryItem.setBase64Image(str);
+ surveillanceQueryItem.setNativeImg(item);
+ surveillanceQueryItem.setBitmap(bitmap);
+ surveillanceQueryItem.setWidth(item.width+"");
+ surveillanceQueryItem.setHeight(item.height+"");
+ surveillanceQueryItem.setCreateTime(new Date());
+ surveillanceQueryItem.setInOrOutCamera(cameraIdx+"");
+ if (!BaseApplication.getInstance().networkAvailable()) {
+ surveillanceQueryItem.setRegisterOrCheckIn(CommonVariables.Surveillance.OFFLINE_SURVEILLANCE_ITEM_TYPE);
+ }
+ bitmapList.add(surveillanceQueryItem);
+ }
+ if (BaseApplication.getInstance().networkAvailable()) {
+ SurveillanceMng.getInstance().addBitmap(bitmapList, faceListPb.arr, s, cameraIdx+"", new byte[]{});
+ } else {
+ SurveillanceMng.getInstance().addOfflineBitmap(bitmapList,faceListPb.arr,cameraIdx+"");
+// SurveillanceDao.getInstance().saveOfflineUnknownToLocal(bitmapList, faceListPb.arr, cameraIdx+"");
+ }
+
+ }catch(Exception e){
+ e.printStackTrace();
+ }
+
+ releaseFace(cameraIdx);
+ }
}
--
Gitblit v1.8.0