From c769d1392f1b540d61d78027d5a1295fb156bb4f Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期五, 02 六月 2017 16:17:10 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/RtspFaceNative.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 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 8a8b662..8604f22 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,20 +1,15 @@
package cn.com.basic.face.util;
import android.graphics.Bitmap;
-import android.util.Base64;
import android.util.Log;
import android.view.Surface;
-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.BaseApplication;
-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;
/**
@@ -55,7 +50,7 @@
public static native void dbgFaceAdd(NativeImg faceImage);
public static native String dbgGetLog();
-
+ public static native void dbgSetStfaceLicense(String lic);
public static int COMPANY_ID = 1001;
@@ -72,7 +67,7 @@
RefByteArray faceListPb = new RefByteArray();
try {
- COMPANY_ID = Integer.parseInt(BaseApplication.getInstance().getDevice().getDeviceCompanyId());
+ COMPANY_ID = Integer.parseInt(BaseApplication.getInstance().getAndroidDevice().getCompanyId());
} catch (Exception e) {
COMPANY_ID = 0;
}
@@ -115,6 +110,7 @@
}
try{
+
List<SurveillanceQueryItem> bitmapList = new ArrayList();
for (int i = 0; i < faceImages.size(); i++) {
NativeImg item = faceImages.get(i);
@@ -124,7 +120,11 @@
Bitmap bitmap = Bitmap.createBitmap(item.width,item.height, Bitmap.Config.ARGB_8888);
ByteBuffer byteBuffer = ByteBuffer.wrap(item.image, offset, size);
bitmap.copyPixelsFromBuffer(byteBuffer);
-// surveillanceQueryItem.setBase64Image(Base64.encodeToString(item.image, offset, size, Base64.DEFAULT));
+// String str = Base64.encodeToString(item.image, offset, size, Base64.DEFAULT);
+// System.out.println(str.length());
+// System.out.println(str);
+// surveillanceQueryItem.setBase64Image(str);
+ surveillanceQueryItem.setNativeImg(item);
surveillanceQueryItem.setBitmap(bitmap);
surveillanceQueryItem.setWidth(item.width+"");
surveillanceQueryItem.setHeight(item.height+"");
--
Gitblit v1.8.0