Raataar/pokedex
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Bilderdownload eingebaut, Bildspeicherung in DB vorbereitet

Browse Source
This commit is contained in:
Carsten Hilmer
2016-08-12 02:17:21 +02:00
parent 4554edbc68
commit f17e877401
5 changed files with 97 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

99
www/js/controllers.js
View File

@@ -150,11 +150,18 @@ $scope.$on("$ionicSlides.slideChangeEnd", function(event, data){
$scope.progressval = 0;
$scope.currentfile = '';
$scope.progressprozent = 0;
$scope.DownloadisVisible=true;
$scope.AbbrechenisVisible=false;
$scope.startdownloadtimer=false;
// Open our new task modal
$scope.downloadImages = function() {
$ionicPlatform.ready(function() {
$scope.startdownloadtimer=true;
$scope.DownloadisVisible=false;
$scope.AbbrechenisVisible=true;
//$ionicPlatform.ready(function() {
//$scope.taskModal.show();
var baseurl = "http://assets.pokemon.com/assets/cms2/img/pokedex/full/";
var url="";
@@ -162,6 +169,8 @@ $scope.$on("$ionicSlides.slideChangeEnd", function(event, data){
var targetPath = "";
var downloadprogress = 0;
var pokedexid=1;
var downloadinprogress=false;
//Ordner erstellen auf SD-Karte
$cordovaFile.createDir(cordova.file.externalRootDirectory, "PokedexHelperBilder", false)
@@ -173,42 +182,82 @@ $scope.$on("$ionicSlides.slideChangeEnd", function(event, data){
console.log('Error bei Ordnererstellung. ' + error);
});
do {
filename=pokedexid + ".png";
if (filename.length==5){
filename='00' + filename;
}
function downloadimage(){
downloadinprogress=true;
filename=pokedexid + ".png";
if (filename.length==5){
filename='00' + filename;
}
if (filename.length==6){
filename='0' + filename;
}
url=baseurl;
url=encodeURI(url + filename);
targetPath = cordova.file.externalRootDirectory + "/PokedexHelperBilder/" + filename;
if (filename.length==6){
filename='0' + filename;
}
url=baseurl;
url=encodeURI(url + filename);
targetPath = cordova.file.externalRootDirectory + "/PokedexHelperBilder/" + filename;
//Bild Download
$cordovaFileTransfer.download(url, targetPath, {Connection: "close"}, true).then(function (result) {
//Bild Download
$cordovaFileTransfer.download(url, targetPath, {Connection: "close"}, true).then(function (result) {
$scope.currentfile=filename;
$database.setPokemonImage(targetPath,pokedexid);
console.log(filename + ' heruntergeladen.' + result);
pokedexid=pokedexid + 1;
console.log(result);
downloadinprogress=false;
}, function (error) {
console.log('Error. ' + error.code + ' ' + error.constant);
}, function (progress) {
downloadprogress=(progress.loaded / progress.total) * 100;
//downloadprogress=(progress.loaded / progress.total) * 100;
$scope.progressprozent = Math.round(pokedexid / 721 * 100);
$scope.progressval = pokedexid;
$scope.currentfile=filename + downloadprogress;
$scope.currentfile=filename; //+ downloadprogress;
});
console.log(pokedexid);
} while (pokedexid <= 720);
console.log(pokedexid);
});
console.log(pokedexid);
if (pokedexid<721){
downloadtimer();
}
else{
$scope.progressprozent = 'Download abgeschlossen! ' + $scope.progressprozent;
$scope.DownloadisVisible=true;
$scope.AbbrechenisVisible=false;
}
if ( $scope.startdownloadtimer==false){
$scope.progressprozent = 'Download Abgebrochen! ' + $scope.progressprozent;
}
}
//});
function downloadtimer(){
if ($scope.startdownloadtimer==true){
$timeout(function(){
if (downloadinprogress==false){
downloadimage();
console.log("downinprogress ist false");
}else{
console.log("downinprogress ist true");
downloadtimer();
}
}, 500);
}
}
downloadtimer();
};
$scope.downloadabbrechen = function() {
$scope.DownloadisVisible=true;
$scope.AbbrechenisVisible=false;
$scope.startdownloadtimer=false;
};
})

11
www/js/services.js
View File

@@ -81,6 +81,16 @@ angular.module('starter.services', [])
console.error(error);
});
},
setPokemonImage: function(Image,Pokedexid) {
query="UPDATE tblPokemon Set POKEMONIMAGE = ? WHERE POKEDEXID = ?;";
return $cordovaSQLite.execute(self.db,query,[Image,Pokedexid]).
then(function(result) {
console.log("Update erfolge auf " + Pokedexid + ' mit ' + Image);
query=null;
}, function(error) {
console.error(error);
});
},
getAllPokemon: function(){
var ArrayQ=[];
query="SELECT * FROM tblPokemon order by POKEDEXID ASC";
@@ -93,6 +103,7 @@ angular.module('starter.services', [])
List.POKEMONNAME=result.rows.item(j).POKEMONNAME;
List.POKEMONTYPA=result.rows.item(j).POKEMONTYPA;
List.POKEMONTYPB=result.rows.item(j).POKEMONTYPB;
List.POKEMONIMAGE=result.rows.item(j).POKEMONTYPB;
ArrayQ.push(List);
}
//console.log(ArrayQ);