demus/Gadgetbridge
1
0
Fork 0
mirror of https://codeberg.org/Freeyourgadget/Gadgetbridge.git synced 2025-01-10 17:11:56 +01:00
Code Issues 1 Packages Projects Releases Wiki Activity

Garmin: Fix daily weather missing current day

Browse Source
This commit is contained in:
José Rebelo 2024-09-03 23:03:46 +01:00
parent c04d3adf7c
commit bd5b54c3b4
2 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/WeatherSpec.java
View File

@ -200,6 +200,30 @@ public class WeatherSpec implements Parcelable, Serializable {
dest.writeList(hourly); dest.writeList(hourly);
} }
/**
* Convert the current day's forecast to a {@link Daily} object.
*/
public Daily todayAsDaily() {
final Daily daily = new Daily();
daily.minTemp = this.todayMinTemp;
daily.maxTemp = this.todayMaxTemp;
daily.conditionCode = this.currentConditionCode;
daily.humidity = this.currentHumidity;
daily.windSpeed = this.windSpeed;
daily.windDirection = this.windDirection;
daily.uvIndex = this.uvIndex;
daily.precipProbability = this.precipProbability;
daily.sunRise = this.sunRise;
daily.sunSet = this.sunSet;
daily.moonRise = this.moonRise;
daily.moonSet = this.moonSet;
daily.moonPhase = this.moonPhase;
daily.airQuality = this.airQuality;
return daily;
}
@Deprecated // kept for backwards compatibility with old weather apps @Deprecated // kept for backwards compatibility with old weather apps
public static class Forecast implements Parcelable, Serializable { public static class Forecast implements Parcelable, Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;

3
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/garmin/http/WeatherHandler.java
View File

@ -57,7 +57,8 @@ public class WeatherHandler {
final List<WeatherForecastDay> ret = new ArrayList<>(duration); final List<WeatherForecastDay> ret = new ArrayList<>(duration);
final GregorianCalendar date = new GregorianCalendar(); final GregorianCalendar date = new GregorianCalendar();
date.setTime(new Date(weatherSpec.timestamp * 1000L)); date.setTime(new Date(weatherSpec.timestamp * 1000L));
for (int i = 0; i < Math.min(duration, weatherSpec.forecasts.size()); i++) { ret.add(new WeatherForecastDay(date, weatherSpec.todayAsDaily(), tempUnit, speedUnit));
for (int i = 0; i < Math.min(duration, weatherSpec.forecasts.size()) - 1; i++) {
date.add(Calendar.DAY_OF_MONTH, 1); date.add(Calendar.DAY_OF_MONTH, 1);
ret.add(new WeatherForecastDay(date, weatherSpec.forecasts.get(i), tempUnit, speedUnit)); ret.add(new WeatherForecastDay(date, weatherSpec.forecasts.get(i), tempUnit, speedUnit));
} }