TinyWeatherForecastGermanyGroup/TinyWeatherForecastGermany
2
2
Fork 0
mirror of https://codeberg.org/Starfish/TinyWeatherForecastGermany.git synced 2025-10-06 01:32:39 +02:00
Code Releases Wiki Activity

fix APIReaders.RadarMNSetGeoserverRunnable reporting success multiple times

Browse Source
This commit is contained in:
Starfish
2025-08-03 17:39:12 +02:00
parent 9f75d82571
commit ef54c80abc
2 changed files with 68 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
app/src/main/java/de/kaffeemitkoffein/tinyweatherforecastgermany/APIReaders.java
View File

@@ -941,6 +941,7 @@ public class APIReaders {
long startTime = 0;
private boolean forceUpdate = false;
public boolean ssl_exception = false;
private boolean fetchIsReady = false;
int progress = 0;
int errors = 0;
@@ -1118,19 +1119,24 @@ public class APIReaders {
public void fetchRadarSet(int start, int stop){
// data available for 2h with 5 min steps => 24 data sets at max
for (int i=start; i<=stop; i++){
try {
putRadarMapToCache(getRadarInputStream(startTime+i*TIMESTEP_5MINUTES),i);
incrementProgress();
} catch (IOException e){
incrementErrors();
incrementProgress();
if (!fetchIsReady) {
try {
putRadarMapToCache(getRadarInputStream(startTime+i*TIMESTEP_5MINUTES),i);
incrementProgress();
} catch (IOException e){
incrementErrors();
incrementProgress();
}
} else {
break;
}
}
}
public void incrementProgress(){
progress++;
if (progress>=24){
if ((progress>=24) && (!fetchIsReady)){
fetchIsReady = true;
if (errors>3){
startTime = WeatherSettings.getPrefRadarLastdatapoll(context);
onFinished(startTime,false);
@@ -1148,6 +1154,8 @@ public class APIReaders {
}
private void multiFetchRadarSet(){
progress = 0;
fetchIsReady = false;
// use 0 to 24 for full set
startTime = roundUTCUpToNextFiveMinutes(Calendar.getInstance().getTimeInMillis());
// need to delete if read is incomplete
@@ -1185,6 +1193,7 @@ public class APIReaders {
}
public void onFinished(long startTime, boolean success){
// override to do something with the map
}

74
app/src/main/java/de/kaffeemitkoffein/tinyweatherforecastgermany/WeatherWarningActivity.java
View File

@@ -425,6 +425,14 @@ public class WeatherWarningActivity extends Activity {
gpsProgressHolder = (RelativeLayout) findViewById(R.id.gps_progress_holder);
displayOsmNotice();
radarMNSetGeoserverRunnable = new APIReaders.RadarMNSetGeoserverRunnable(getApplicationContext()){
@Override
public void onStart() {
super.onStart();
validSlideSetObtained = false;
showRainSlideProgressBar();
updateRainSlideProgressBar(0);
}
@Override
public void onProgress(long startTime, final int progress) {
if (progress==1){
@@ -443,11 +451,14 @@ public class WeatherWarningActivity extends Activity {
}
});
}
updateRainSlideProgressBar(progress);
if (progress<=APIReaders.RadarMNSetGeoserverRunnable.DATASET_SIZE){
updateRainSlideProgressBar(progress);
}
}
@Override
public void onFinished(long startTime, boolean success){
super.onFinished(startTime,success);
hideRainSlideProgressBar();
if (success){
validSlideSetObtained = true;
if (precipitationAtPinPointColors!=null){
@@ -476,13 +487,6 @@ public class WeatherWarningActivity extends Activity {
} else {
validSlideSetObtained = false;
}
runOnUiThread(new Runnable() {
@Override
public void run() {
rainSlideProgressBar.setVisibility(View.INVISIBLE);
rainSlideProgressBarText.setVisibility(View.INVISIBLE);
}
});
}
};
weatherLocationManager = new WeatherLocationManager(context){
@@ -694,6 +698,21 @@ public class WeatherWarningActivity extends Activity {
canvas.drawText(text,x,y,paint);
}
public void updateSlideTimeText(){
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("HH:mm", Locale.getDefault());
Date rainSlideDate = new Date(rainSlidesStartTime+(nextRainSlide)*APIReaders.RadarMNSetGeoserverRunnable.TIMESTEP_5MINUTES);
String radartime = simpleDateFormat.format(rainSlideDate);
if (validSlideSetObtained) {
rainSlideTime.setTextColor(Color.WHITE);
if (Calendar.getInstance().getTimeInMillis() > rainSlidesStartTime + 1000*60*60*1.5f){
rainSlideTime.setTextColor(0xfffa7712);
}
} else {
rainSlideTime.setTextColor(Color.YELLOW);
}
rainSlideTime.setText(radartime);
}
@SuppressLint("NewApi")
private void showRainDescription(){
// Determine the height of the info bar
@@ -746,19 +765,7 @@ public class WeatherWarningActivity extends Activity {
radarTextPaint.setTextSize(textsize);
}
radarTextPaint.setColor(Color.WHITE);
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("HH:mm", Locale.getDefault());
Date rainSlideDate = new Date(rainSlidesStartTime+(nextRainSlide)*APIReaders.RadarMNSetGeoserverRunnable.TIMESTEP_5MINUTES);
String radartime = simpleDateFormat.format(rainSlideDate);
float ff=1.1f;
if (validSlideSetObtained) {
rainSlideTime.setTextColor(Color.WHITE);
if (Calendar.getInstance().getTimeInMillis() > rainSlidesStartTime + 1000*60*60*1.5f){
rainSlideTime.setTextColor(0xfffa7712);
}
} else {
rainSlideTime.setTextColor(Color.YELLOW);
}
rainSlideTime.setText(radartime);
radarTextPaint.setColor(Radarmap.RAINCOLORS[2]);
drawStrokedText(canvas,getResources().getString(R.string.radar_rain1),infoBarWidth*0.1f,infoBitmap.getHeight()-radarinfobarResourceBitmap.getHeight()*ff,radarTextPaint);
radarTextPaint.setColor(Radarmap.RAINCOLORS[7]);
@@ -788,14 +795,36 @@ public class WeatherWarningActivity extends Activity {
return bitmap;
}
private void updateRainSlideProgressBar(final int progress){
private void showRainSlideProgressBar(){
runOnUiThread(new Runnable() {
@Override
public void run() {
rainSlideProgressBar.setVisibility(View.VISIBLE);
rainSlideProgressBar.setProgress(progress);
rainSlideProgressBar.invalidate();
rainSlideProgressBarText.setVisibility(View.VISIBLE);
rainSlideProgressBarText.invalidate();
}
});
}
private void hideRainSlideProgressBar(){
runOnUiThread(new Runnable() {
@Override
public void run() {
rainSlideProgressBar.setVisibility(View.INVISIBLE);
rainSlideProgressBar.invalidate();
rainSlideProgressBarText.setVisibility(View.INVISIBLE);
rainSlideProgressBarText.invalidate();
}
});
}
private void updateRainSlideProgressBar(final int progress){
runOnUiThread(new Runnable() {
@Override
public void run() {
rainSlideProgressBar.setProgress(progress);
rainSlideProgressBar.invalidate();
rainSlideProgressBarText.setText(Math.round((float) progress/(float) (APIReaders.RadarMNSetGeoserverRunnable.DATASET_SIZE-1)*100f)+"%");
rainSlideProgressBarText.invalidate();
}
@@ -893,6 +922,7 @@ public class WeatherWarningActivity extends Activity {
canvas.drawBitmap(administrativeBitmap,0,0,cp);
}
if ((!hide_rain) && (radarBitmap!=null)){
updateSlideTimeText();
cp.setXfermode(new PorterDuffXfermode(PorterDuff.Mode.SRC_OVER));
canvas.drawBitmap(radarBitmap, 0,0,cp);
if (!mapIsDrawn){