Author: jerome
Date: 2009-04-10 11:53:18 +0200 (Fri, 10 Apr 2009)
New Revision: 4454
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/GadgetProgramsTvBeDu.java
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/programs/SimplePrograms.java
Log:
* Fixed a bug with now playing function.
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-10 09:10:28 UTC (rev 4453)
+++
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/gadget/Configuration.java
2009-04-10 09:53:18 UTC (rev 4454)
@@ -25,7 +25,7 @@
public class Configuration extends SimpleGadgetConfiguration{
- private String channel = "RTL-TVI";
+ private String channel = "Eén";
private boolean giveProgramDescription = true;
private boolean giveMorning = true;
private boolean giveAfternoon = 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-10 09:10:28 UTC (rev 4453)
+++
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/gadget/GadgetProgramsTvBeDu.java
2009-04-10 09:53:18 UTC (rev 4454)
@@ -69,6 +69,7 @@
}
catch(Exception error)
{
+ error.printStackTrace();
this.loadError(null);
}
}
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-10 09:10:28 UTC (rev 4453)
+++
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/programs/SimplePrograms.java
2009-04-10 09:53:18 UTC (rev 4454)
@@ -84,7 +84,6 @@
}
else
{
-
this.triggerError();
}
}
@@ -556,17 +555,13 @@
//Searching backwards.
if( nowPlaying == null )
{
- for(int i=0; i < program.size(); i++)
+ while(true)
{
- int pHour =
Integer.valueOf(program.get(i).getStartTime().substring(0, 2)).intValue();
- int pMin =
Integer.valueOf(program.get(i).getStartTime().substring(3)).intValue();
+ int result =
SimplePrograms.checkbackward(hour--, minutes, program);
- if(pHour == ( hour -1 ))
+ if(result != -1)
{
- if(pMin == minutes)
- {
- nowPlaying = program.get(i);
- }
+ return program.get(result);
}
}
}
@@ -574,4 +569,31 @@
return nowPlaying;
}
+
+ /**
+ * Check backward for matching program.
+ * @param hour
+ * @return
+ */
+ private static int checkbackward(int hour, int minute, Vector<Program>
program)
+ {
+ for( int i = program.size() -1 ; i >= 0 ; 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)
+ {
+
+ if(pMin < minute)
+ {
+ return i;
+ }
+ }
+
+ }
+
+ return -1;
+ }
+
}
------------------------------------------------------------------------------
This SF.net email is sponsored by:
High Quality Requirements in a Collaborative Environment.
Download a free trial of Rational Requirements Composer Now!
http://p.sf.net/sfu/www-ibm-com
_______________________________________________
Tux-droid-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tux-droid-svn
