status-im/react-native-camera
1
0
Fork 0
mirror of https://github.com/status-im/react-native-camera.git synced 2026-08-30 21:21:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1356 from cl-will/master

Browse Source 
Fix stream error and date format error
This commit is contained in:
João Guilherme Fidelis
2018-03-18 16:08:04 -03:00
committed by GitHub
parent 1778fbdce9 17eebff45c
commit d5da2ef073
2 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
android/src/main/java/org/reactnative/camera/CameraModule.java
+8 -3
View File
@@ -27,6 +27,8 @@ import java.util.HashMap;
import java.util.Map;
import java.util.Set;
import java.io.ByteArrayOutputStream;
import javax.annotation.Nullable;
public class CameraModule extends ReactContextBaseJavaModule {
@@ -201,9 +203,12 @@ public class CameraModule extends ReactContextBaseJavaModule {
}
} else {
Bitmap image = RNCameraViewHelper.generateSimulatorPhoto(cameraView.getWidth(), cameraView.getHeight());
ByteBuffer byteBuffer = ByteBuffer.allocate(image.getRowBytes() * image.getHeight());
image.copyPixelsToBuffer(byteBuffer);
new ResolveTakenPictureAsyncTask(byteBuffer.array(), promise, options).execute();
ByteArrayOutputStream stream = new ByteArrayOutputStream();
image.compress(Bitmap.CompressFormat.JPEG, 100, stream);
byte[] byteArray = stream.toByteArray();
new ResolveTakenPictureAsyncTask(byteArray, promise, options, cacheDirectory).execute();
}
} catch (Exception e) {
promise.reject("E_CAMERA_BAD_VIEWTAG", "takePictureAsync: Expected a Camera component");
android/src/main/java/org/reactnative/camera/RNCameraViewHelper.java
+6 -2
View File
@@ -292,8 +292,12 @@ public class RNCameraViewHelper {
textPaint.setColor(Color.YELLOW);
textPaint.setTextSize(35);
Calendar calendar = Calendar.getInstance();
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("dd.MM.YY HH:mm:ss", Locale.getDefault());
canvas.drawText(simpleDateFormat.format(calendar.getTime()), width * 0.1f, height * 0.9f, textPaint);
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy.MM.dd G '->' HH:mm:ss z");
canvas.drawText(simpleDateFormat.format(calendar.getTime()), width * 0.1f, height * 0.2f, textPaint);
canvas.drawText(simpleDateFormat.format(calendar.getTime()), width * 0.2f, height * 0.4f, textPaint);
canvas.drawText(simpleDateFormat.format(calendar.getTime()), width * 0.3f, height * 0.6f, textPaint);
canvas.drawText(simpleDateFormat.format(calendar.getTime()), width * 0.4f, height * 0.8f, textPaint);
return fakePhoto;
}
}