BTCPrivate
/
copay
mirror of https://github.com/BTCPrivate/copay.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Speed up QR code scanner for iOS

This commit is contained in:
Gustavo Maximiliano Cortez 2016-01-11 10:29:45 -03:00
parent 5f332a2315
commit 5986daf140
No known key found for this signature in database
GPG Key ID: 15EDAD8D9F2EB1AF
4 changed files with 39 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cordova/build.sh
View File

@ -87,6 +87,9 @@ if [ ! -d $PROJECT ]; then
cordova plugin add https://github.com/phonegap/phonegap-plugin-barcodescanner.git
checkOK
cordova plugin add https://github.com/tjwoon/csZBar.git
checkOK
cordova plugin add cordova-plugin-splashscreen
checkOK
@ -138,6 +141,9 @@ if [ ! -d $PROJECT ]; then
cordova plugin add cordova-ios-requires-fullscreen
checkOK
cordova plugin add cordova-plugin-disable-bitcode
checkOK
fi
if $DBGJS

4
package.json
View File

@ -64,6 +64,7 @@
"angular": "^1.3.14",
"angular-mocks": "^1.3.14",
"bhttp": "^1.2.1",
"cordova": "^5.4.1",
"grunt-karma": "^0.10.1",
"grunt-karma-coveralls": "^2.5.3",
"grunt-node-webkit-builder": "^1.0.2",
@ -71,6 +72,7 @@
"karma-cli": "0.0.4",
"karma-coverage": "^0.2.7",
"karma-jasmine": "^0.3.5",
"karma-phantomjs-launcher": "^0.1.4"
"karma-phantomjs-launcher": "^0.1.4",
"xcode": "^0.8.2"
}
}

3
src/js/controllers/walletHome.js
View File

@ -1,6 +1,6 @@
'use strict';
angular.module('copayApp.controllers').controller('walletHomeController', function($scope, $rootScope, $timeout, $filter, $modal, $log, notification, txStatus, isCordova, profileService, lodash, configService, rateService, storageService, bitcore, isChromeApp, gettext, gettextCatalog, nodeWebkit, addressService, ledger, bwsError, confirmDialog, txFormatService, animationService, addressbookService, go, feeService) {
angular.module('copayApp.controllers').controller('walletHomeController', function($scope, $rootScope, $timeout, $filter, $modal, $log, notification, txStatus, isCordova, isMobile, profileService, lodash, configService, rateService, storageService, bitcore, isChromeApp, gettext, gettextCatalog, nodeWebkit, addressService, ledger, bwsError, confirmDialog, txFormatService, animationService, addressbookService, go, feeService) {
var self = this;
$rootScope.hideMenuBar = false;
@ -24,7 +24,6 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
this.blockUx = false;
this.isRateAvailable = false;
this.showScanner = false;
this.isMobile = isMobile.any();
this.addr = {};
this.lockedCurrentFeePerKb = null;

52
src/js/directives/qrScanner.js
View File

@ -1,36 +1,42 @@
'use strict';
angular.module('copayApp.directives')
.directive('qrScanner', ['$rootScope', '$timeout', '$modal', 'isCordova', 'gettextCatalog',
function($rootScope, $timeout, $modal, isCordova, gettextCatalog) {
.directive('qrScanner', ['$rootScope', '$timeout', '$modal', 'isCordova', 'gettextCatalog', 'isMobile',
function($rootScope, $timeout, $modal, isCordova, gettextCatalog, isMobile) {
var controller = function($scope) {
var onSuccess = function(result) {
$timeout(function() {
window.plugins.spinnerDialog.hide();
window.ignoreMobilePause = false;
}, 100);
if (!isMobile.iOS() && result.cancelled) return;
$timeout(function() {
var data = isMobile.iOS() ? result : result.text;
$scope.onScan({ data: data });
}, 1000);
};
var onError = function() {
function onError(error) {
$timeout(function() {
window.ignoreMobilePause = false;
window.plugins.spinnerDialog.hide();
}, 100);
}
};
$scope.cordovaOpenScanner = function() {
window.ignoreMobilePause = true;
window.plugins.spinnerDialog.show(null, gettextCatalog.getString('Preparing camera...'), true);
$timeout(function() {
cordova.plugins.barcodeScanner.scan(
function onSuccess(result) {
$timeout(function() {
window.plugins.spinnerDialog.hide();
window.ignoreMobilePause = false;
}, 100);
if (result.cancelled) return;
$timeout(function() {
var data = result.text;
$scope.onScan({ data: data });
}, 1000);
},
function onError(error) {
$timeout(function() {
window.ignoreMobilePause = false;
window.plugins.spinnerDialog.hide();
}, 100);
alert('Scanning error');
}
);
if (isMobile.iOS()) {
cloudSky.zBar.scan({}, onSuccess, onError)
} else {
cordova.plugins.barcodeScanner.scan(onSuccess, onError);
}
if ($scope.beforeScan) {
$scope.beforeScan();
}