summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xhooks/after_prepare/030_android_manifest.js29
-rw-r--r--www/js/EventCtrl.js140
-rw-r--r--www/js/app.js6
3 files changed, 164 insertions, 11 deletions
diff --git a/hooks/after_prepare/030_android_manifest.js b/hooks/after_prepare/030_android_manifest.js
new file mode 100755
index 00000000..c5590376
--- /dev/null
+++ b/hooks/after_prepare/030_android_manifest.js
@@ -0,0 +1,29 @@
+#!/usr/bin/env node
+
+var fs = require('fs');
+var async = require('async');
+var exec = require('child_process').exec;
+var path = require('path');
+
+var root = process.argv[2];
+var androidManifest = path.join(root, 'platforms/android/AndroidManifest.xml');
+fs.exists(path.join(root, 'platforms/android'), function(exists) {
+ if(!exists) return;
+ fs.readFile(androidManifest, 'utf8', function(err, data) {
+ if(err) throw err;
+
+ var lines = data.split('\n');
+ var searchingFor = '<application android:hardwareAccelerated="true"';
+ var newManifest = [];
+ var largeHeap = 'android:largeHeap="true"';
+ lines.forEach(function(line) {
+ if(line.trim().indexOf(searchingFor) != -1 && line.trim().indexOf(largeHeap) == -1) {
+ newManifest.push(line.replace(/\>$/, ' ') + largeHeap + ">");
+ } else {
+ newManifest.push(line);
+ }
+ });
+
+ fs.writeFileSync(androidManifest, newManifest.join('\n'));
+ });
+}); \ No newline at end of file
diff --git a/www/js/EventCtrl.js b/www/js/EventCtrl.js
index 827936d7..c17071ea 100644
--- a/www/js/EventCtrl.js
+++ b/www/js/EventCtrl.js
@@ -1,7 +1,7 @@
/* jshint -W041 */
/*jshint bitwise: false*/
/* jslint browser: true*/
-/* global saveAs, cordova,StatusBar,angular,console,moment, MobileAccessibility, gifshot, ReadableStream , LibraryHelper, GifWriter, NeuQuant*/
+/* global saveAs, cordova,StatusBar,angular,console,moment, MobileAccessibility, gifshot, ReadableStream , LibraryHelper, GifWriter, NeuQuant, LocalFileSystem, FileError*/
// This is the controller for Event view. StateParams is if I recall the monitor ID.
// This was before I got access to the new APIs. FIXME: Revisit this code to see what I am doing with it
@@ -534,20 +534,135 @@ angular.module('zmApp.controllers')
}
+
+
+ function writeFile2( path, file, blob, isAppend)
+ {
+ var csize = 4 * 1024 * 1024; // 4MB
+ var d = $q.defer();
+ NVRDataModel.debug ("Inside writeFile2 with blob size="+blob.size);
+
+ // nothing more to write, so all good?
+ if (!blob.size)
+ {
+ NVRDataModel.debug ("writeFile2 all done");
+ d.resolve(true);
+ return $q.resolve(true);
+ }
+
+
+ if (!isAppend)
+ {
+ // return the delegated promise, even if it fails
+ return $cordovaFile.writeFile(path, file, blob.slice(0,csize), true)
+ .then (function (succ) {
+ return writeFile2(path,file,blob.slice(csize),true);
+ });
+ }
+ else
+ {
+ // return the delegated promise, even if it fails
+ return $cordovaFile.writeExistingFile(path, file, blob.slice(0,csize))
+ .then (function (succ) {
+ return writeFile2(path,file,blob.slice(csize),true);
+ });
+ }
+
+
+ }
+
+ function writeFile(path, __filename, __data){
+ var d = $q.defer();
+ console.log ("inside write file");
+ window.requestFileSystem(LocalFileSystem.TEMPORARY, __data.size+5000, onFileSystemSuccess, fail);
+
+ function fail(e)
+ {
+ var msg = '';
+
+ switch (e.code) {
+ case FileError.QUOTA_EXCEEDED_ERR:
+ msg = 'QUOTA_EXCEEDED_ERR';
+ break;
+ case FileError.NOT_FOUND_ERR:
+ msg = 'NOT_FOUND_ERR';
+ break;
+ case FileError.SECURITY_ERR:
+ msg = 'SECURITY_ERR';
+ break;
+ case FileError.INVALID_MODIFICATION_ERR:
+ msg = 'INVALID_MODIFICATION_ERR';
+ break;
+ case FileError.INVALID_STATE_ERR:
+ msg = 'INVALID_STATE_ERR';
+ break;
+ default:
+ msg = 'Unknown Error';
+ break;
+ }
+
+ console.log('Error: ' + msg);
+ }
+ function onFileSystemSuccess()
+ {
+ console.log ("Got temporary FS");
+ window.resolveLocalFileSystemURL(path, function(dir){
+ dir.getFile(__filename, {create:true}, function(file){
+ file.createWriter(function(fileWriter){
+ //var blob = new Blob([__data], {type:'text/plain'});
+ console.log ("about to write "+__data.size+" bytes");
+ //var blob = new Blob([__data], {type:'text/plain'});
+ fileWriter.write(__data);
+ fileWriter.onwrite = function(e) {
+ NVRDataModel.debug ("write complete");
+ d.resolve();
+ return d.promise;
+ };
+
+ fileWriter.onerror = function(e) {
+ NVRDataModel.debug ("write error in filewriter:"+JSON.stringify(e));
+ d.reject();
+ return d.promise;
+ };
+
+ });
+ });
+
+ },
+ function (err) {
+ d.reject(err);
+ return d.promise;
+ });
+ }
+ return d.promise;
+ }
+
+
function moveImageToGallery(fname)
{
+ // this is https://github.com/terikon/cordova-plugin-photo-library
NVRDataModel.debug("moveImageToGallery called with " + fname);
- LibraryHelper.saveImageToLibrary(onSuccess, onError, fname, "zmNinja");
+ cordova.plugins.photoLibrary.saveImage(fname, "zmNinja",onSuccess, onError);
+ //LibraryHelper.saveImageToLibrary(onSuccess, onError, fname, "zmNinja");
function onSuccess(results)
{
+
NVRDataModel.debug("Removing temp file");
- if ($rootScope.platformOS == 'ios')
- $cordovaFile.removeFile(cordova.file.documentsDirectory, "temp-file.gif");
+ if ($rootScope.platformOS == 'ios') {
+ $cordovaFile.removeFile(cordova.file.documentsDirectory, "temp-file.gif");
+ }
else
$cordovaFile.removeFile(cordova.file.dataDirectory, "temp-file.gif");
+ $ionicLoading.show(
+ {
+ template: $translate.instant('kDone'),
+ noBackdrop: true,
+ duration: 2000
+ });
+
}
@@ -1206,6 +1321,8 @@ angular.module('zmApp.controllers')
});
}
+
+
function downloadAsGif2(e)
{
$rootScope.isDownloading = true;
@@ -1233,6 +1350,8 @@ angular.module('zmApp.controllers')
{
URL.revokeObjectURL(img.src); // Revoke object URL to free memory
var stream = createGif(files, img.width, img.height);
+ //var fileStream = streamSaver.createWriteStream('image.gif');
+
var chunks = [];
var reader = stream.getReader();
@@ -1275,13 +1394,18 @@ angular.module('zmApp.controllers')
template:"writing to file...",
noBackdrop: true,
});
- $cordovaFile.writeFile(tp, "temp-file.gif", blob,true)
+
+ //var bloburl = URL.createObjectURL(blob);
+ //NVRDataModel.debug ("blob-url is:"+bloburl);
+
+ writeFile2(tp,"temp-file.gif",blob,false)
.then (function (succ) {
NVRDataModel.debug ("write to file successful");
+ console.log( "write file successful");
$ionicLoading.hide();
- var ntp;
- ntp = tp.indexOf('file://') === 0 ? tp.slice(7) : tp;
+ var ntp = tp;
+ //ntp = tp.indexOf('file://') === 0 ? tp.slice(7) : tp;
ntp = ntp+"temp-file.gif";
console.log ("ntp="+ntp);
@@ -1292,7 +1416,7 @@ angular.module('zmApp.controllers')
}, function (err) {
$rootScope.isDownloading = false;
$ionicLoading.hide();
- NVRDataModel.debug ("error writing to file "+err);
+ NVRDataModel.debug ("error writing to file "+JSON.stringify(err));
});
diff --git a/www/js/app.js b/www/js/app.js
index d954efd6..34958cbc 100644
--- a/www/js/app.js
+++ b/www/js/app.js
@@ -1,6 +1,6 @@
/* jshint -W041, -W093 */
/* jslint browser: true*/
-/* global cordova,StatusBar,angular,console,alert,PushNotification, moment ,ionic, URI,Packery, ConnectSDK, CryptoJS, ContactFindOptions, localforage,$, Connection, MobileAccessibility */
+/* global cordova,StatusBar,angular,console,alert,PushNotification, moment ,ionic, URI,Packery, ConnectSDK, CryptoJS, ContactFindOptions, localforage,$, Connection, MobileAccessibility, hello */
// For desktop versions, this is replaced
// with actual app version from config.xml by the
@@ -95,7 +95,7 @@ angular.module('zmApp', [
montageQualityLowBW: 50,
eventMontageQualityLowBW: 50,
maxGifCount:60,
- maxGifCount2:500,
+ maxGifCount2:100,
maxGifWidth:800.0,
quantSample:15,
@@ -1356,7 +1356,7 @@ angular.module('zmApp', [
$ionicPlatform.ready(function()
{
-
+
$rootScope.textScaleFactor = 1.0;
$rootScope.db = null;
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-06 22:45:48 +0000