Bilderdownload eingebaut, Bildspeicherung in DB vorbereitet
This commit is contained in:
Carsten Hilmer
parent
4554edbc68
commit
f17e877401
@ -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";
|
||||
function downloadimage(){
|
||||
downloadinprogress=true;
|
||||
filename=pokedexid + ".png";
|
||||
|
||||
if (filename.length==5){
|
||||
filename='00' + filename;
|
||||
}
|
||||
if (filename.length==5){
|
||||
filename='00' + filename;
|
||||
}
|
||||
|
||||
if (filename.length==6){
|
||||
filename='0' + filename;
|
||||
}
|
||||
if (filename.length==6){
|
||||
filename='0' + filename;
|
||||
}
|
||||
|
||||
url=baseurl;
|
||||
url=encodeURI(url + filename);
|
||||
targetPath = cordova.file.externalRootDirectory + "/PokedexHelperBilder/" + 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;
|
||||
};
|
||||
|
||||
})
|
||||
|
||||
|
||||
@ -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);
|
||||
|
||||
BIN
www/pokedex.db
BIN
www/pokedex.db
Binary file not shown.
@ -2,18 +2,26 @@
|
||||
<ion-content class="padding">
|
||||
<h2>Pokemon Bilder Download</h2>
|
||||
<p>
|
||||
Pokedex Helper wird aus rechtlichen Gründen ohne Pokemon ™ Bilder angeboten. Wenn du möchtest kann Pokedex Helper aber versuchen diese für dich von den offiziellen Pokemon ™ Webseiten herunterzuladen. Da diese Bilder urheberrechtlich geschützt sind, bitten wir dich dir vorher die entsprechenden <a href="http://www.pokemon.com/de/nutzungsbedingungen/" target="_blank">Nutzungsbedingungen</a> von © 2016 Pokémon/Nintendo aufmerksam durchzulesen.
|
||||
Pokedex Helper wird aus rechtlichen Gründen ohne Pokemon ™ Bilder angeboten. Wenn du möchtest kann Pokedex Helper aber versuchen diese für dich von den offiziellen Pokemon ™ Webseiten herunterzuladen. Da diese Bilder urheberrechtlich geschützt sind, lies dir bitte vorher die entsprechenden <a href="http://www.pokemon.com/de/nutzungsbedingungen/" target="_blank">Nutzungsbedingungen</a> von © 2016 Pokémon/Nintendo aufmerksam durch. Nur wenn du mit diesen einverstanden bist, darfst du die Bilder für eigene Zwecke verwenden.
|
||||
</p>
|
||||
<p>
|
||||
Wichtiger Tipp: <b>Bitte bedenke, dass der Download der Bilder einiges an Internet-Traffic verursacht. Um deinen mobilen Datentarif zu schonen solltest du den Download am besten per Wlan durchführen.</b>
|
||||
</p>
|
||||
|
||||
<p>
|
||||
Mit dem Klick auf den Butten (Bilder herunterladen) akzeptierst du die oben genannten <a href="http://www.pokemon.com/de/nutzungsbedingungen/" target="_blank">Nutzungsbedingungen</a> von © 2016 Pokémon/Nintendo.
|
||||
</p>
|
||||
<button class="button button-full" ng-click="downloadImages()">
|
||||
<button class="button button-full" ng-click="downloadImages()" ng-show="DownloadisVisible">
|
||||
Bilder herunterladen
|
||||
</button>
|
||||
<button class="button button-full" ng-click="downloadabbrechen()" ng-show="AbbrechenisVisible">
|
||||
Download abbrechen
|
||||
</button>
|
||||
<progress id="progressbar" max="721" value="{{ progressval }}"> </progress>
|
||||
<div id="progressbarlabel">{{ progressprozent }} %</div>
|
||||
<div id="currentfile">Aktuelle Datei: {{ currentfile }}</div>
|
||||
<p>
|
||||
|
||||
</p>
|
||||
<p>
|
||||
© 2016 Pokémon. © 1995-2015 Nintendo/Creatures Inc./GAME FREAK inc. TM, ® and Pokémon character names are trademarks of Nintendo.
|
||||
</p>
|
||||
|
||||
@ -14,7 +14,7 @@
|
||||
<ion-list>
|
||||
<ion-item collection-repeat="item in items" ng-model="items">
|
||||
<a class="item item-thumbnail-left" href="#">
|
||||
<img src="img/720.png">
|
||||
<img src="{{item.POKEMONIMAGE}}">
|
||||
<h2>{{item.POKEMONNAME}}</h2>
|
||||
<p>Nine Inch Nails</p>
|
||||
</a>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user