From fb151d762312a93fd33a44b9e14e1bdfa31e331e Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期三, 03 五月 2017 14:21:09 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/SurveillanceMng.java | 4 ++--
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/RegisterFragment.java | 17 +++++++++--------
VisitFace/DemoForBsk/app/src/main/AndroidManifest.xml | 5 ++++-
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/SurveillanceQueryItem.java | 21 ++++++++++++++++++++-
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/RtspFaceNative.java | 2 +-
5 files changed, 36 insertions(+), 13 deletions(-)
diff --git a/VisitFace/DemoForBsk/app/src/main/AndroidManifest.xml b/VisitFace/DemoForBsk/app/src/main/AndroidManifest.xml
index dadf198..6996058 100644
--- a/VisitFace/DemoForBsk/app/src/main/AndroidManifest.xml
+++ b/VisitFace/DemoForBsk/app/src/main/AndroidManifest.xml
@@ -14,7 +14,10 @@
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:supportsRtl="true"
- android:theme="@style/AppTheme">
+ android:theme="@style/AppTheme"
+ android:largeHeap="true"
+ android:hardwareAccelerated="false"
+ >
<activity
android:name="cn.com.basic.face.base.MainActivity"
android:screenOrientation="landscape"
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/SurveillanceQueryItem.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/SurveillanceQueryItem.java
index 4b5b712..96ed452 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/SurveillanceQueryItem.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/SurveillanceQueryItem.java
@@ -2,6 +2,11 @@
import android.graphics.Bitmap;
+import java.io.ByteArrayOutputStream;
+
+import android.net.Uri;
+import android.util.Base64;
+
public class SurveillanceQueryItem {
// 浜哄憳涓婚敭
@@ -32,6 +37,8 @@
private String width;
private String height;
+
+ private Uri localUri;
/**
* Get 浜哄憳涓婚敭
@@ -173,7 +180,11 @@
}
public String getBase64Image() {
- return base64Image;
+ ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
+ bitmap.compress(Bitmap.CompressFormat.JPEG, 100, byteArrayOutputStream);
+ byte[] imageBytes = byteArrayOutputStream.toByteArray();
+ String encodedImage = Base64.encodeToString(imageBytes, Base64.DEFAULT);
+ return encodedImage;
}
public void setBase64Image(String base64Image) {
@@ -187,4 +198,12 @@
public void setStatus(String status) {
this.status = status;
}
+
+ public Uri getLocalUri() {
+ return localUri;
+ }
+
+ public void setLocalUri(Uri localUri) {
+ this.localUri = localUri;
+ }
}
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/RegisterFragment.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/RegisterFragment.java
index a83e7c3..36303ea 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/RegisterFragment.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/RegisterFragment.java
@@ -204,8 +204,8 @@
if (surveillanceQueryItem != null) {
params.addBodyParameter("width", surveillanceQueryItem.getWidth());
params.addBodyParameter("height", surveillanceQueryItem.getHeight());
- params.addBodyParameter("base64Image", surveillanceQueryItem.getBase64Image());
fragment_register_surveillance_photo_img = surveillanceQueryItem.getBitmap();
+ params.addBodyParameter("base64Image", surveillanceQueryItem.getBase64Image());
}
if (fragment_register_surveillance_photo_img != null) {
@@ -257,22 +257,23 @@
try {
Bitmap bitmap = MediaStore.Images.Media.getBitmap(getActivity().getContentResolver(), uri);
fragment_register_upload_custom_photo.setImageBitmap(bitmap);
- fragment_register_upload_custom_photo_img = bitmap;
+ //fragment_register_upload_custom_photo_img = bitmap;
fragment_register_upload_custom_photo_placeholder_image.setVisibility(View.INVISIBLE);
fragment_register_upload_custom_photo_placeholder_text_view.setVisibility(View.INVISIBLE);
List<SurveillanceQueryItem> bitmapList = new ArrayList<>();
SurveillanceQueryItem item = new SurveillanceQueryItem();
- item.setBitmap(bitmap);
+// item.setBitmap(bitmap);
item.setWidth(bitmap.getWidth()+"");
item.setHeight(bitmap.getHeight()+"");
+ item.setLocalUri(uri);
- ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
- bitmap.compress(Bitmap.CompressFormat.JPEG, 100, byteArrayOutputStream);
- byte[] imageBytes = byteArrayOutputStream.toByteArray();
- String encodedImage = Base64.encodeToString(imageBytes, Base64.DEFAULT);
- item.setBase64Image(encodedImage);
+// ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
+// bitmap.compress(Bitmap.CompressFormat.JPEG, 100, byteArrayOutputStream);
+// byte[] imageBytes = byteArrayOutputStream.toByteArray();
+// String encodedImage = Base64.encodeToString(imageBytes, Base64.DEFAULT);
+// item.setBase64Image(encodedImage);
setSurveillanceQueryItem(item);
bitmapList.add(item);
bitmapList.add(item);
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/SurveillanceMng.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/SurveillanceMng.java
index 2286421..c9efe5a 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/SurveillanceMng.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/SurveillanceMng.java
@@ -61,7 +61,7 @@
if (i < bitmapList.size()) {
SurveillanceQueryItem surveillanceQueryItem = bitmapList.get(i);
item.setBitmap(surveillanceQueryItem.getBitmap());
- item.setBase64Image(surveillanceQueryItem.getBase64Image());
+// item.setBase64Image(surveillanceQueryItem.getBase64Image());
item.setWidth(surveillanceQueryItem.getWidth());
item.setHeight(surveillanceQueryItem.getHeight());
}
@@ -71,7 +71,7 @@
if (i < bitmapList.size()) {
SurveillanceQueryItem surveillanceQueryItem = bitmapList.get(i);
item.setBitmap(surveillanceQueryItem.getBitmap());
- item.setBase64Image(surveillanceQueryItem.getBase64Image());
+// item.setBase64Image(surveillanceQueryItem.getBase64Image());
item.setWidth(surveillanceQueryItem.getWidth());
item.setHeight(surveillanceQueryItem.getHeight());
}
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 799349e..8a8b662 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
@@ -124,7 +124,7 @@
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));
+// surveillanceQueryItem.setBase64Image(Base64.encodeToString(item.image, offset, size, Base64.DEFAULT));
surveillanceQueryItem.setBitmap(bitmap);
surveillanceQueryItem.setWidth(item.width+"");
surveillanceQueryItem.setHeight(item.height+"");
--
Gitblit v1.8.0