You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by an...@apache.org on 2015/04/21 14:22:50 UTC
[1/2] cordova-plugin-camera git commit: CB-8054 Support taking
pictures from file for WP8
Repository: cordova-plugin-camera
Updated Branches:
refs/heads/master fb8ce2171 -> b13102130
CB-8054 Support taking pictures from file for WP8
codereview
codereview 2
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/commit/0dabe944
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/tree/0dabe944
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/diff/0dabe944
Branch: refs/heads/master
Commit: 0dabe944162a23469759a4153b17164ce8d0da96
Parents: b67e4a0
Author: Murat Sutunc <su...@gmail.com>
Authored: Wed Apr 15 17:20:30 2015 -0700
Committer: Murat Sutunc <su...@gmail.com>
Committed: Thu Apr 16 14:19:01 2015 -0700
----------------------------------------------------------------------
src/windows/CameraProxy.js | 102 ++++++++++++++++++++++++++++++++++------
1 file changed, 88 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/blob/0dabe944/src/windows/CameraProxy.js
----------------------------------------------------------------------
diff --git a/src/windows/CameraProxy.js b/src/windows/CameraProxy.js
index 3d4d24b..9fb2d65 100644
--- a/src/windows/CameraProxy.js
+++ b/src/windows/CameraProxy.js
@@ -53,6 +53,9 @@ module.exports = {
}
};
+// https://msdn.microsoft.com/en-us/library/windows/apps/ff462087(v=vs.105).aspx
+var windowsVideoContainers = [".avi", ".flv", ".asx", ".asf", ".mov", ".mp4", ".mpg", ".rm", ".srt", ".swf", ".wmv", ".vob"];
+var windowsPhoneVideoContainers = [".avi", ".3gp", ".3g2", ".wmv", ".3gp", ".3g2" ".mp4", ".m4v"];
// Resize method
function resizeImage(successCallback, errorCallback, file, targetWidth, targetHeight, encodingType) {
@@ -134,27 +137,99 @@ function resizeImageBase64(successCallback, errorCallback, file, targetWidth, ta
}, function(err) { errorCallback(err); });
}
-function takePictureFromFile(successCallback, errorCallback, mediaType, destinationType, targetWidth, targetHeight, encodingType) {
- // TODO: Add WP8.1 support
- // WP8.1 doesn't allow to use of pickSingleFileAsync method
- // see http://msdn.microsoft.com/en-us/library/windows/apps/br207852.aspx for details
- // replacement of pickSingleFileAsync - pickSingleFileAndContinue method
- // will take application to suspended state and this require additional logic to wake application up
- if (navigator.appVersion.indexOf('Windows Phone 8.1') >= 0 ) {
- errorCallback('Not supported');
- return;
+function takePictureFromFile(successCallback, errorCallback, args) {
+ // Detect Windows Phone
+ if (navigator.appVersion.indexOf('Windows Phone 8.1') >= 0) {
+ takePictureFromFileWP(successCallback, errorCallback, args);
+ } else {
+ takePictureFromFileWindows(successCallback, errorCallback, args);
+ }
+}
+
+function takePictureFromFileWP(successCallback, errorCallback, args) {
+ var mediaType = args[6],
+ destinationType = args[1],
+ targetWidth = args[3],
+ targetHeight = args[4],
+ encodingType = args[5];
+
+ /*
+ Need to add and remove an event listener to catch activation state
+ Using FileOpenPicker will suspend the app and it's required to catch the PickSingleFileAndContinue
+ https://msdn.microsoft.com/en-us/library/windows/apps/xaml/dn631755.aspx
+ */
+ var filePickerActivationHandler = function(eventArgs) {
+ if (eventArgs.kind === Windows.ApplicationModel.Activation.ActivationKind.pickFileContinuation) {
+ var file = eventArgs.files[0];
+ if (!file) {
+ errorCallback("User didn't choose a file.");
+ Windows.UI.WebUI.WebUIApplication.removeEventListener("activated", filePickerActivationHandler);
+ return;
+ }
+ if (destinationType == Camera.DestinationType.FILE_URI || destinationType == Camera.DestinationType.NATIVE_URI) {
+ if (targetHeight > 0 && targetWidth > 0) {
+ resizeImage(successCallback, errorCallback, file, targetWidth, targetHeight, encodingType);
+ }
+ else {
+ var storageFolder = Windows.Storage.ApplicationData.current.localFolder;
+ file.copyAsync(storageFolder, file.name, Windows.Storage.NameCollisionOption.replaceExisting).done(function (storageFile) {
+ successCallback(URL.createObjectURL(storageFile));
+ }, function () {
+ errorCallback("Can't access localStorage folder.");
+ });
+ }
+ }
+ else {
+ if (targetHeight > 0 && targetWidth > 0) {
+ resizeImageBase64(successCallback, errorCallback, file, targetWidth, targetHeight);
+ } else {
+ Windows.Storage.FileIO.readBufferAsync(file).done(function (buffer) {
+ var strBase64 = Windows.Security.Cryptography.CryptographicBuffer.encodeToBase64String(buffer);
+ successCallback(strBase64);
+ }, errorCallback);
+ }
+ }
+ Windows.UI.WebUI.WebUIApplication.removeEventListener("activated", filePickerActivationHandler);
+ }
+ };
+
+ var fileOpenPicker = new Windows.Storage.Pickers.FileOpenPicker();
+ if (mediaType == Camera.MediaType.PICTURE) {
+ fileOpenPicker.fileTypeFilter.replaceAll([".png", ".jpg", ".jpeg"]);
+ fileOpenPicker.suggestedStartLocation = Windows.Storage.Pickers.PickerLocationId.picturesLibrary;
+ }
+ else if (mediaType == Camera.MediaType.VIDEO) {
+ fileOpenPicker.fileTypeFilter.replaceAll(windowsPhoneVideoContainers);
+ fileOpenPicker.suggestedStartLocation = Windows.Storage.Pickers.PickerLocationId.videosLibrary;
}
+ else {
+ fileOpenPicker.fileTypeFilter.replaceAll(["*"]);
+ fileOpenPicker.suggestedStartLocation = Windows.Storage.Pickers.PickerLocationId.documentsLibrary;
+ }
+
+ Windows.UI.WebUI.WebUIApplication.addEventListener("activated", filePickerActivationHandler);
+ fileOpenPicker.pickSingleFileAndContinue();
+}
+
+function takePictureFromFileWindows(successCallback, errorCallback, args) {
+ var mediaType = args[6],
+ destinationType = args[1],
+ targetWidth = args[3],
+ targetHeight = args[4],
+ encodingType = args[5];
var fileOpenPicker = new Windows.Storage.Pickers.FileOpenPicker();
- fileOpenPicker.suggestedStartLocation = Windows.Storage.Pickers.PickerLocationId.picturesLibrary;
if (mediaType == Camera.MediaType.PICTURE) {
fileOpenPicker.fileTypeFilter.replaceAll([".png", ".jpg", ".jpeg"]);
+ fileOpenPicker.suggestedStartLocation = Windows.Storage.Pickers.PickerLocationId.picturesLibrary;
}
else if (mediaType == Camera.MediaType.VIDEO) {
- fileOpenPicker.fileTypeFilter.replaceAll([".avi", ".flv", ".asx", ".asf", ".mov", ".mp4", ".mpg", ".rm", ".srt", ".swf", ".wmv", ".vob"]);
+ fileOpenPicker.fileTypeFilter.replaceAll(windowsVideoContainers);
+ fileOpenPicker.suggestedStartLocation = Windows.Storage.Pickers.PickerLocationId.videosLibrary;
}
else {
fileOpenPicker.fileTypeFilter.replaceAll(["*"]);
+ fileOpenPicker.suggestedStartLocation = Windows.Storage.Pickers.PickerLocationId.documentsLibrary;
}
fileOpenPicker.pickSingleFileAsync().done(function (file) {
@@ -173,7 +248,6 @@ function takePictureFromFile(successCallback, errorCallback, mediaType, destinat
}, function () {
errorCallback("Can't access localStorage folder.");
});
-
}
}
else {
@@ -379,7 +453,7 @@ function takePictureFromCameraWP(successCallback, errorCallback, args) {
};
var savePicker = new Windows.Storage.Pickers.FileSavePicker();
- savePicker.suggestedStartLocation = Windows.Storage.Pickers.PickerLocationId.documentsLibrary;
+ savePicker.suggestedStartLocation = Windows.Storage.Pickers.PickerLocationId.picturesLibrary;
if (encodingType === Camera.EncodingType.PNG) {
savePicker.fileTypeChoices.insert("PNG", [".png"]);
} else {
@@ -475,7 +549,7 @@ function takePictureFromCameraWindows(successCallback, errorCallback, args) {
var savePicker = new Windows.Storage.Pickers.FileSavePicker();
- savePicker.suggestedStartLocation = Windows.Storage.Pickers.PickerLocationId.documentsLibrary;
+ savePicker.suggestedStartLocation = Windows.Storage.Pickers.PickerLocationId.picturesLibrary;
if (encodingType === Camera.EncodingType.PNG) {
savePicker.fileTypeChoices.insert("PNG", [".png"]);
savePicker.suggestedFileName = "photo.png";
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[2/2] cordova-plugin-camera git commit: CB-8054 Support taking
pictures from file for WP8
Posted by an...@apache.org.
CB-8054 Support taking pictures from file for WP8
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/commit/b1310213
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/tree/b1310213
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/diff/b1310213
Branch: refs/heads/master
Commit: b131021303d4ca8dcce458690fcb9c3dddd1fbf1
Parents: fb8ce21 0dabe94
Author: Vladimir Kotikov <an...@ya.ru>
Authored: Tue Apr 21 15:22:40 2015 +0300
Committer: Vladimir Kotikov <an...@ya.ru>
Committed: Tue Apr 21 15:22:40 2015 +0300
----------------------------------------------------------------------
src/windows/CameraProxy.js | 102 ++++++++++++++++++++++++++++++++++------
1 file changed, 88 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/blob/b1310213/src/windows/CameraProxy.js
----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org