mirror
/
Look4Sat
kopia lustrzana https://github.com/rt-bishop/Look4Sat
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Now correctly using the hours ahead setting #66

pull/70/head
Arty Bishop 2021-09-18 17:00:59 +01:00
rodzic fa0f300dcd
commit 08b4274ca2
1 zmienionych plików z 16 dodań i 3 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

19
app/src/main/java/com/rtbishop/look4sat/presentation/passesScreen/PassesViewModel.kt
Wyświetl plik

@ -29,6 +29,7 @@ import com.rtbishop.look4sat.framework.model.Result
import dagger.hilt.android.lifecycle.HiltViewModel
import kotlinx.coroutines.*
import kotlinx.coroutines.flow.collect
import java.util.*
import javax.inject.Inject
@HiltViewModel
@ -48,8 +49,12 @@ class PassesViewModel @Inject constructor(
if (preferencesSource.isSetupDone()) {
viewModelScope.launch {
_passes.postValue(Result.InProgress)
val dateNow = Date()
val satellites = satelliteRepo.getSelectedSatellites()
val stationPos = preferencesSource.loadStationPosition()
predictor.triggerCalculation(satelliteRepo.getSelectedSatellites(), stationPos)
val hoursAhead = preferencesSource.getHoursAhead()
val minElev = preferencesSource.getMinElevation()
predictor.triggerCalculation(satellites, stationPos, dateNow, hoursAhead, minElev)
}
} else {
_isFirstLaunchDone.value = false
@ -67,10 +72,14 @@ class PassesViewModel @Inject constructor(
viewModelScope.launch {
_passes.postValue(Result.InProgress)
val defaultCatNums = listOf(43700, 25544, 25338, 28654, 33591, 40069, 27607, 24278)
val dateNow = Date()
val satellites = satelliteRepo.getSelectedSatellites()
val stationPos = preferencesSource.loadStationPosition()
val hoursAhead = preferencesSource.getHoursAhead()
val minElev = preferencesSource.getMinElevation()
satelliteRepo.updateEntriesFromWeb(preferencesSource.loadDefaultSources())
satelliteRepo.updateEntriesSelection(defaultCatNums, true)
predictor.forceCalculation(satelliteRepo.getSelectedSatellites(), stationPos)
predictor.forceCalculation(satellites, stationPos, dateNow, hoursAhead, minElev)
preferencesSource.setSetupDone()
_isFirstLaunchDone.value = true
}
@ -80,8 +89,12 @@ class PassesViewModel @Inject constructor(
viewModelScope.launch {
_passes.postValue(Result.InProgress)
passesProcessing?.cancelAndJoin()
val dateNow = Date()
val satellites = satelliteRepo.getSelectedSatellites()
val stationPos = preferencesSource.loadStationPosition()
predictor.forceCalculation(satelliteRepo.getSelectedSatellites(), stationPos)
val hoursAhead = preferencesSource.getHoursAhead()
val minElev = preferencesSource.getMinElevation()
predictor.forceCalculation(satellites, stationPos, dateNow, hoursAhead, minElev)
}
}