diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 344d080..7666dff 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -33,7 +33,6 @@ android:name=".NutritionMaster" android:allowBackup="true" - android:hardwareAccelerated="false" android:icon="@mipmap/ic" android:label="@string/app_name" android:roundIcon="@mipmap/ic" diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/camera/ClassifierCamera.java b/app/src/main/java/com/example/ninefourone/nutritionmaster/camera/ClassifierCamera.java index c687da0..3d5014d 100644 --- a/app/src/main/java/com/example/ninefourone/nutritionmaster/camera/ClassifierCamera.java +++ b/app/src/main/java/com/example/ninefourone/nutritionmaster/camera/ClassifierCamera.java @@ -203,10 +203,7 @@ public class ClassifierCamera extends AppCompatActivity { bitmap.compress(Bitmap.CompressFormat.JPEG, 100, bos); bos.flush(); bos.close(); -// bitmap = CompressHelper.getDefault(getApplicationContext()).compressToBitmap(file); -// ByteArrayOutputStream baos = new ByteArrayOutputStream(); -// bitmap.compress(Bitmap.CompressFormat.PNG, 100, baos); -// byte[] dat = baos.toByteArray(); + String imgStr = Base64.encodeToString(data, Base64.DEFAULT); String imgParam = URLEncoder.encode(imgStr, "UTF-8"); final String param = "image=" + imgParam + "&top_num=" + 1;