From b1011220d67261ef53aa4000bf3c8d7da987d29b Mon Sep 17 00:00:00 2001 From: AndrazLogar Date: Tue, 9 Jan 2018 20:06:35 +0100 Subject: [PATCH] PodcastList dobi mp3 --- .../pp/podcastplayer/MainActivity.java | 21 ++++++++++++------- .../com/example/pp/podcastplayer/Parser.java | 8 +++---- .../example/pp/podcastplayer/ParserMP3.java | 7 ++++--- .../example/pp/podcastplayer/PodcastList.java | 16 ++++++++------ 4 files changed, 30 insertions(+), 22 deletions(-) diff --git a/app/src/main/java/com/example/pp/podcastplayer/MainActivity.java b/app/src/main/java/com/example/pp/podcastplayer/MainActivity.java index b87d3db..355d079 100644 --- a/app/src/main/java/com/example/pp/podcastplayer/MainActivity.java +++ b/app/src/main/java/com/example/pp/podcastplayer/MainActivity.java @@ -5,6 +5,7 @@ import android.content.pm.PackageManager; import android.os.AsyncTask; import android.os.Bundle; +import android.os.Environment; import android.support.design.widget.NavigationView; import android.support.v4.app.ActivityCompat; import android.support.v4.view.GravityCompat; @@ -21,6 +22,7 @@ import org.xmlpull.v1.XmlPullParserException; +import java.io.File; import java.io.InputStream; import java.net.MalformedURLException; import java.net.URL; @@ -259,26 +261,30 @@ protected Boolean doInBackground(Void... voids) { naslov = data.naslov; opis = data.opis; - urlMP3 = + urlMP3 = url; slika_url = data.slika; Log.d("aaa", slika_url); + slika = slika_url.split("/"); // Zadnji element je ime slike + if (slika_url == null) { slika_url = "https://upload.wikimedia.org/wikipedia/commons/c/c9/Moon.jpg"; slika = slika_url.split("/"); // Zadnji element je ime slike - // String str_result= new Downloadimages().execute(slika_url).get(); - Downloader d = new Downloader(); - String code = d.DownloadFile(slika_url, "downloads/images", slika[slika.length - 1]); + } + - } else { - slika = slika_url.split("/"); - // String str_result= new Downloadimages().execute(slika_url).get(); + String PATH = Environment.getExternalStorageDirectory().toString()+ "/"+"downloads/images+/" + slika; + + File file = new File(PATH); + + if(!file.exists()){ Downloader d = new Downloader(); String code = d.DownloadFile(slika_url, "downloads/images", slika[slika.length - 1]); } + return true; @@ -299,7 +305,6 @@ protected void onPostExecute(Boolean success) { mAdapter = new MyRecyclerViewAdapter(getDataSet()); mRecyclerView.setAdapter(mAdapter); - } } } diff --git a/app/src/main/java/com/example/pp/podcastplayer/Parser.java b/app/src/main/java/com/example/pp/podcastplayer/Parser.java index 42b2538..5969265 100644 --- a/app/src/main/java/com/example/pp/podcastplayer/Parser.java +++ b/app/src/main/java/com/example/pp/podcastplayer/Parser.java @@ -106,13 +106,11 @@ public DataRSS parseData(InputStream inputStream) throws XmlPullParserException, // Log.d("Add", naslov + opis); // Dodamo oddajo samo v primeru da so vse ustrezne znacke pridobljene item = new DataRSS(naslov, slika, opis); - } - naslov = null; - slika = null; - opis = null; + } + Log.d("aaa","Parse konec"); + break; - itemObj = false; } } diff --git a/app/src/main/java/com/example/pp/podcastplayer/ParserMP3.java b/app/src/main/java/com/example/pp/podcastplayer/ParserMP3.java index 68e2fc9..5ec5ad4 100644 --- a/app/src/main/java/com/example/pp/podcastplayer/ParserMP3.java +++ b/app/src/main/java/com/example/pp/podcastplayer/ParserMP3.java @@ -21,7 +21,7 @@ public class ParserMP3 { // Razclenjevanje podatkov - public DataRSSmp3 parseData(InputStream inputStream) throws XmlPullParserException, + public List parseData(InputStream inputStream) throws XmlPullParserException, IOException { String naslov = null; @@ -32,7 +32,7 @@ public DataRSSmp3 parseData(InputStream inputStream) throws XmlPullParserExcepti DataRSSmp3 item = new DataRSSmp3(naslov,mp3,opis); - List items = new ArrayList<>(); + List items = new ArrayList<>(); try { // Uporabimo xmlPullParser @@ -103,6 +103,7 @@ public DataRSSmp3 parseData(InputStream inputStream) throws XmlPullParserExcepti // Log.d("Add", naslov + opis); // Dodamo oddajo samo v primeru da so vse ustrezne znacke pridobljene item = new DataRSSmp3(naslov, mp3, opis); + items.add(item); } naslov = null; @@ -113,7 +114,7 @@ public DataRSSmp3 parseData(InputStream inputStream) throws XmlPullParserExcepti } } - return item; + return items; } finally { inputStream.close(); } diff --git a/app/src/main/java/com/example/pp/podcastplayer/PodcastList.java b/app/src/main/java/com/example/pp/podcastplayer/PodcastList.java index 7d3cde0..2e54ab9 100644 --- a/app/src/main/java/com/example/pp/podcastplayer/PodcastList.java +++ b/app/src/main/java/com/example/pp/podcastplayer/PodcastList.java @@ -23,6 +23,7 @@ import java.net.MalformedURLException; import java.net.URL; import java.util.ArrayList; +import java.util.List; public class PodcastList extends AppCompatActivity { @@ -31,8 +32,6 @@ public class PodcastList extends AppCompatActivity { private RecyclerView.LayoutManager mLayoutManager; private static String LOG_TAG = "CardViewActivity"; - DataRSSmp3 data; - String naslov; String urlMP3; String opis; @@ -40,7 +39,9 @@ public class PodcastList extends AppCompatActivity { String urlRSS; String slika_url; + int i = 0; + List data; @Override protected void onCreate(Bundle savedInstanceState) { @@ -62,6 +63,8 @@ protected void onCreate(Bundle savedInstanceState) { urlRSS = "Bongo"; } else { new PodcastList.FetchFeedTask().execute((Void) null); + + } } } @@ -115,7 +118,7 @@ private class FetchFeedTask extends AsyncTask { // Pridobimo url protected void onPreExecute() { url = urlRSS; - //Log.d("Add", url); + Log.d("Add", url); } @Override @@ -131,9 +134,10 @@ protected Boolean doInBackground(Void... voids) { // Log.d("Add", data.naslov); - naslov = data.naslov; - opis = data.opis; - urlMP3 = data.mp3; + naslov = data.get(0).naslov; + Log.d("Add", naslov); + opis = data.get(0).opis; + urlMP3 = data.get(0).mp3; Log.d("d", urlMP3);