From 8a6f543ec59cdbc6b95c87562d69407c9c17f5d0 Mon Sep 17 00:00:00 2001
From: Equip de Desenvolupadors de PBE <imanol@imanolbarba.net>
Date: Wed, 28 Nov 2012 14:41:23 +0000
Subject: [PATCH] 

---
 res/layout/dirs.xml                     |  3 ++-
 src/com/upc/pbe/upcnews/Descarrega.java |  2 +-
 src/com/upc/pbe/upcnews/Directoris.java | 67 ++++++++++++++++++++++++++++++++++++++++++++++++++++---------------
 src/com/upc/pbe/upcnews/HTMLParser.java |  2 +-
 src/com/upc/pbe/upcnews/UpcApp.java     |  2 +-
 5 files changed, 57 insertions(+), 19 deletions(-)

diff --git a/res/layout/dirs.xml b/res/layout/dirs.xml
index bc2db93..3fe3157 100644
--- a/res/layout/dirs.xml
+++ b/res/layout/dirs.xml
@@ -7,11 +7,12 @@
     android:orientation="vertical" >
 
     <!-- Vista en llista -->
-
+

     <TextView
         android:id="@+id/textViewTitle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_gravity="left"
         android:layout_marginLeft="14dp"
         android:text="@string/title"
         android:textAppearance="?android:attr/textAppearanceMedium" />
diff --git a/src/com/upc/pbe/upcnews/Descarrega.java b/src/com/upc/pbe/upcnews/Descarrega.java
index f89aeea..ef47caf 100644
--- a/src/com/upc/pbe/upcnews/Descarrega.java
+++ b/src/com/upc/pbe/upcnews/Descarrega.java
@@ -73,7 +73,7 @@ public class Descarrega extends AsyncTask<Object, Object, Object>{
 
 	
 
-	protected Object doInBackground() {
+	protected String doInBackground() {
 		try {
 			URLConnection conn = new URL(url).openConnection();
 			BufferedReader in = new BufferedReader(new InputStreamReader(
diff --git a/src/com/upc/pbe/upcnews/Directoris.java b/src/com/upc/pbe/upcnews/Directoris.java
index 34930b2..3bf840d 100644
--- a/src/com/upc/pbe/upcnews/Directoris.java
+++ b/src/com/upc/pbe/upcnews/Directoris.java
@@ -9,24 +9,30 @@ import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
+import android.view.View.OnClickListener;
 import android.widget.Button;
 
-public class Directoris extends Activity {
+public class Directoris extends Activity implements OnClickListener {
 
 	final static String TAG = "Directoris";
 	String s;
+	Descarrega d;
+	String url; 
+	String file = "ejemplo.xml";
+	String folder = "Environment.getExternalStorageDirectory.getPath()";
 
 	ArrayList<Button> buttons = new ArrayList<Button>();
 	Button button1, button2, button3, button4;
-	
+
 	public void onCreate(Bundle savedInstanceState) {
-		
+
 		Log.d(TAG, "onCreated");
-		
+		url = ((UpcApp) getApplication()).getUrl();
+
 		super.onCreate(savedInstanceState);
 		setContentView(R.layout.dirs);
 
-		this.crearButtons();	
+		this.crearButtons();
 
 		s = ((UpcApp) getApplication()).getDesc();
 		HTMLParser pars = new HTMLParser();
@@ -36,7 +42,7 @@ public class Directoris extends Activity {
 			Log.d(TAG, "Directori " + i);
 			buttons.get(i).setVisibility(View.VISIBLE);
 			buttons.get(i).setText(dirs.get(i));
-			
+
 		}
 
 	}
@@ -61,21 +67,52 @@ public class Directoris extends Activity {
 			return false;
 		}
 	}
-	
-	public void crearButtons(){
-		
-		
-		button1 = (Button)findViewById(R.id.button1);
-		button2 = (Button)findViewById(R.id.button2);
-		button3 = (Button)findViewById(R.id.button3);
-		button4 = (Button)findViewById(R.id.button4);
-		
+
+	public void onClick(View c) {
 		
+		switch (c.getId()) {
+
+		case R.id.button1: {
+			Log.d(TAG, "Click on button1");
+			d = new Descarrega(url + "/" + button1.getText() + "/", file, folder);
+			String str = d.doInBackground();
+			
+			HTMLParser pars = new HTMLParser();
+			String urlvideo = pars.findvideo((String) button1.getText(),
+					str, url + "/" + button1.getText() + "/");
+			
+			Log.d(TAG, urlvideo);
+			
+		}
+		case R.id.button2: {
+			
+		}
+		case R.id.button3: {
+			
+		}
+		case R.id.button4: {
+			
+		}
+		}
+	}
+
+	public void crearButtons() {
+
+		button1 = (Button) findViewById(R.id.button1);
+		button2 = (Button) findViewById(R.id.button2);
+		button3 = (Button) findViewById(R.id.button3);
+		button4 = (Button) findViewById(R.id.button4);
+
 		buttons.add(button1);
 		buttons.add(button2);
 		buttons.add(button3);
 		buttons.add(button4);
 		
+		button1.setOnClickListener(this);
+		button2.setOnClickListener(this);
+		button3.setOnClickListener(this);
+		button4.setOnClickListener(this);
+		
 		button1.setVisibility(View.GONE);
 		button2.setVisibility(View.GONE);
 		button3.setVisibility(View.GONE);
diff --git a/src/com/upc/pbe/upcnews/HTMLParser.java b/src/com/upc/pbe/upcnews/HTMLParser.java
index c410f5f..cb87c93 100644
--- a/src/com/upc/pbe/upcnews/HTMLParser.java
+++ b/src/com/upc/pbe/upcnews/HTMLParser.java
@@ -27,7 +27,7 @@ public class HTMLParser {
     
     public String findvideo(String name, String code, String direccio){
     	String[] split = code.split("\n");
-    	for(int i = 0; i< split.length; i++){
+    	for(int i = 0; i < split.length; i++){
     		if(split[i].contains(".m3u8")){
     			String nomarxiu = split[i].substring((split[i].indexOf("href="))+6, (split[i].indexOf("/\"")));
     			return direccio+nomarxiu+"/";
diff --git a/src/com/upc/pbe/upcnews/UpcApp.java b/src/com/upc/pbe/upcnews/UpcApp.java
index 9ec8651..e871e22 100644
--- a/src/com/upc/pbe/upcnews/UpcApp.java
+++ b/src/com/upc/pbe/upcnews/UpcApp.java
@@ -11,7 +11,7 @@ public class UpcApp extends Application implements OnSharedPreferenceChangeListe
 
 	final static String TAG = "Application";
 	SharedPreferences prefs;
-	String defaultUrl = "imanolbarba.myftp.biz";
+	String defaultUrl = "10.0.2.100";
 	String url = null;
 	String desc;
 	
--
libgit2 0.22.2