Author: jerome
Date: 2009-04-06 10:00:19 +0200 (Mon, 06 Apr 2009)
New Revision: 4345
Modified:
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/HTMLUtils.java
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/gadget/Configuration.java
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/gadget/GadgetProgramsTvBeDu.java
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/programs/SimplePrograms.java
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/programs/french/FrenchPrograms.java
Log:
* Added now playing function.
Modified:
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/HTMLUtils.java
===================================================================
---
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/HTMLUtils.java
2009-04-06 07:35:57 UTC (rev 4344)
+++
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/HTMLUtils.java
2009-04-06 08:00:19 UTC (rev 4345)
@@ -25,6 +25,7 @@
import java.io.DataInputStream;
import java.net.HttpURLConnection;
import java.net.URL;
+import java.net.UnknownHostException;
public class HTMLUtils {
@@ -123,7 +124,8 @@
}
catch (Exception e)
{
- e.printStackTrace();
+ //Handle connections errors too.
+ return null;
}
return result;
Modified:
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/gadget/Configuration.java
===================================================================
---
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/gadget/Configuration.java
2009-04-06 07:35:57 UTC (rev 4344)
+++
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/gadget/Configuration.java
2009-04-06 08:00:19 UTC (rev 4345)
@@ -27,9 +27,9 @@
private String channel = "LA UNE";
private boolean giveProgramDescription = true;
- private boolean giveMorning = false;
- private boolean giveAfternoon = false;
- private boolean giveEvening = false;
+ private boolean giveMorning = true;
+ private boolean giveAfternoon = true;
+ private boolean giveEvening = true;
private boolean giveNowPlaying = true;
Modified:
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/gadget/GadgetProgramsTvBeDu.java
===================================================================
---
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/gadget/GadgetProgramsTvBeDu.java
2009-04-06 07:35:57 UTC (rev 4344)
+++
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/gadget/GadgetProgramsTvBeDu.java
2009-04-06 08:00:19 UTC (rev 4345)
@@ -65,6 +65,7 @@
@Override
public void loadError(String url)
{
+ throwMessage("Error while loading the TV program");
this.quiGadget();
}
@@ -76,6 +77,7 @@
public void loaded(Vector<Program> completeProgram)
{
+ //Morning program.
if(this.configuration().getGiveMorning())
{
Vector<Program> morning =
BelgianDutch.sortMorning(completeProgram);
@@ -93,6 +95,7 @@
}
}
+ //Afternoon program.
if (this.configuration().getGiveAfternoon())
{
Vector<Program> afternoon =
BelgianDutch.sortAfternoon(completeProgram);
@@ -109,6 +112,7 @@
}
}
+ //Evening program.
if(this.configuration().getGiveEvening())
{
Vector<Program> evening =
BelgianDutch.sortEvening(completeProgram);
@@ -125,9 +129,11 @@
}
}
+ //Give now playing program.
if(this.configuration().getGiveNowPlaying())
{
-
System.out.println(BelgianDutch.getNowPlaying(completeProgram));
+ Program nowPlaying =
BelgianDutch.getNowPlaying(completeProgram);
+ throwMessage("Now playing {0} on {1}",
nowPlaying.getTitle(), nowPlaying.getChannel());
}
}
Modified:
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/programs/SimplePrograms.java
===================================================================
---
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/programs/SimplePrograms.java
2009-04-06 07:35:57 UTC (rev 4344)
+++
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/programs/SimplePrograms.java
2009-04-06 08:00:19 UTC (rev 4345)
@@ -297,12 +297,42 @@
int hour = Calendar.getInstance().get(Calendar.HOUR_OF_DAY);
int minutes = Calendar.getInstance().get(Calendar.MINUTE);
+ Program nowPlaying = null;
+
for( int i = 0 ; i < program.size(); i++ )
{
- //TODO
+ int pHour =
Integer.valueOf(program.get(i).getStartTime().substring(0, 2)).intValue();
+ int pMin =
Integer.valueOf(program.get(i).getStartTime().substring(3)).intValue();
+
+ if(pHour == hour)
+ {
+
+ if(pMin < minutes)
+ {
+ nowPlaying = program.get(i);
+ }
+ }
}
+
+ //Searching backwards.
+ if( nowPlaying == null )
+ {
+ for(int i=0; i < program.size(); i++)
+ {
+ int pHour =
Integer.valueOf(program.get(i).getStartTime().substring(0, 2)).intValue();
+ int pMin =
Integer.valueOf(program.get(i).getStartTime().substring(3)).intValue();
+
+ if(pHour == ( hour -1 ))
+ {
+ if(pMin == minutes)
+ {
+ nowPlaying = program.get(i);
+ }
+ }
+ }
+ }
- return null;
+ return nowPlaying;
}
}
Modified:
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/programs/french/FrenchPrograms.java
===================================================================
---
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/programs/french/FrenchPrograms.java
2009-04-06 07:35:57 UTC (rev 4344)
+++
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/programs/french/FrenchPrograms.java
2009-04-06 08:00:19 UTC (rev 4345)
@@ -63,6 +63,10 @@
{
this.getPrograms(0);
}
+ else
+ {
+ this.triggerError();
+ }
recoded = HTMLUtils.getPage(this.url, this.channel + "/2.php");
if(recoded != null)
@@ -79,6 +83,10 @@
{
this.getPrograms(2);
}
+ else
+ {
+ this.triggerError();
+ }
recoded = HTMLUtils.getPage(this.url, this.channel + "/4.php");
if(recoded != null)
------------------------------------------------------------------------------
_______________________________________________
Tux-droid-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tux-droid-svn
