kopia lustrzana https://github.com/rt-bishop/Look4Sat
Bumped minSdk to 23 (Android 6.0), fixed AMSat SSL issue
rodzic
a26f881160
commit
d603a343ca
|
@ -11,10 +11,10 @@ android {
|
||||||
|
|
||||||
defaultConfig {
|
defaultConfig {
|
||||||
applicationId "com.rtbishop.look4sat"
|
applicationId "com.rtbishop.look4sat"
|
||||||
minSdkVersion 21
|
minSdkVersion 23
|
||||||
targetSdkVersion 30
|
targetSdkVersion 30
|
||||||
versionCode 252
|
versionCode 253
|
||||||
versionName "2.5.2"
|
versionName "2.5.3"
|
||||||
}
|
}
|
||||||
|
|
||||||
buildTypes {
|
buildTypes {
|
||||||
|
|
|
@ -9,7 +9,8 @@
|
||||||
android:name=".presentation.Look4SatApplication"
|
android:name=".presentation.Look4SatApplication"
|
||||||
android:allowBackup="false"
|
android:allowBackup="false"
|
||||||
android:icon="@mipmap/ic_launcher"
|
android:icon="@mipmap/ic_launcher"
|
||||||
android:label="@string/app_name">
|
android:label="@string/app_name"
|
||||||
|
android:usesCleartextTraffic="true">
|
||||||
<activity
|
<activity
|
||||||
android:name=".presentation.Look4SatActivity"
|
android:name=".presentation.Look4SatActivity"
|
||||||
android:theme="@style/AppTheme.Splash">
|
android:theme="@style/AppTheme.Splash">
|
||||||
|
|
|
@ -37,9 +37,11 @@ import dagger.hilt.InstallIn
|
||||||
import dagger.hilt.android.qualifiers.ApplicationContext
|
import dagger.hilt.android.qualifiers.ApplicationContext
|
||||||
import dagger.hilt.components.SingletonComponent
|
import dagger.hilt.components.SingletonComponent
|
||||||
import kotlinx.coroutines.CoroutineDispatcher
|
import kotlinx.coroutines.CoroutineDispatcher
|
||||||
|
import okhttp3.OkHttpClient
|
||||||
import retrofit2.Retrofit
|
import retrofit2.Retrofit
|
||||||
import retrofit2.converter.moshi.MoshiConverterFactory
|
import retrofit2.converter.moshi.MoshiConverterFactory
|
||||||
import javax.inject.Singleton
|
import javax.inject.Singleton
|
||||||
|
import javax.net.ssl.HostnameVerifier
|
||||||
|
|
||||||
@Module
|
@Module
|
||||||
@InstallIn(SingletonComponent::class)
|
@InstallIn(SingletonComponent::class)
|
||||||
|
@ -109,8 +111,11 @@ object SatDataModule {
|
||||||
|
|
||||||
@Provides
|
@Provides
|
||||||
fun provideSatDataService(): SatDataService {
|
fun provideSatDataService(): SatDataService {
|
||||||
|
val verifier = HostnameVerifier { _, _ -> true }
|
||||||
|
val httpClient = OkHttpClient.Builder().hostnameVerifier(verifier).build()
|
||||||
return Retrofit.Builder()
|
return Retrofit.Builder()
|
||||||
.baseUrl("https://db.satnogs.org/api/")
|
.baseUrl("https://db.satnogs.org/api/")
|
||||||
|
.client(httpClient)
|
||||||
.addConverterFactory(MoshiConverterFactory.create())
|
.addConverterFactory(MoshiConverterFactory.create())
|
||||||
.build()
|
.build()
|
||||||
.create(SatDataService::class.java)
|
.create(SatDataService::class.java)
|
||||||
|
|
|
@ -9,12 +9,12 @@ buildscript {
|
||||||
navigation_version = '2.3.5'
|
navigation_version = '2.3.5'
|
||||||
preference_version = '1.1.1'
|
preference_version = '1.1.1'
|
||||||
room_version = '2.3.0'
|
room_version = '2.3.0'
|
||||||
hilt_version = '2.36'
|
hilt_version = '2.37'
|
||||||
retrofit_version = '2.9.0'
|
retrofit_version = '2.9.0'
|
||||||
osmdroid_version = '6.1.10'
|
osmdroid_version = '6.1.10'
|
||||||
timber_version = '4.7.1'
|
timber_version = '4.7.1'
|
||||||
junit_version = '4.13.2'
|
junit_version = '4.13.2'
|
||||||
mockito_version = '3.10.0'
|
mockito_version = '3.11.1'
|
||||||
leak_canary_version = '2.7'
|
leak_canary_version = '2.7'
|
||||||
}
|
}
|
||||||
repositories {
|
repositories {
|
||||||
|
|
|
@ -19,7 +19,7 @@ package com.rtbishop.look4sat.domain.predict4kotlin
|
||||||
|
|
||||||
import java.util.*
|
import java.util.*
|
||||||
|
|
||||||
class PassPredictor(private val satellite: Satellite, private val gsp: StationPosition) {
|
class PassPredictor(private val satellite: Satellite, private val stationPos: StationPosition) {
|
||||||
|
|
||||||
private val oneQuarterOrbitMin = (24.0 * 60.0 / satellite.tle.meanmo / 4.0).toInt()
|
private val oneQuarterOrbitMin = (24.0 * 60.0 / satellite.tle.meanmo / 4.0).toInt()
|
||||||
private val speedOfLight = 2.99792458E8
|
private val speedOfLight = 2.99792458E8
|
||||||
|
@ -35,7 +35,7 @@ class PassPredictor(private val satellite: Satellite, private val gsp: StationPo
|
||||||
}
|
}
|
||||||
|
|
||||||
fun getSatPos(date: Date): SatPos {
|
fun getSatPos(date: Date): SatPos {
|
||||||
return satellite.getPosition(gsp, date)
|
return satellite.getPosition(stationPos, date)
|
||||||
}
|
}
|
||||||
|
|
||||||
fun getPositions(refDate: Date, stepSec: Int, minBefore: Int, orbits: Double): List<SatPos> {
|
fun getPositions(refDate: Date, stepSec: Int, minBefore: Int, orbits: Double): List<SatPos> {
|
||||||
|
@ -58,7 +58,7 @@ class PassPredictor(private val satellite: Satellite, private val gsp: StationPo
|
||||||
var shouldWindBack = windBack
|
var shouldWindBack = windBack
|
||||||
var lastAosDate: Date
|
var lastAosDate: Date
|
||||||
var count = 0
|
var count = 0
|
||||||
if (satellite.willBeSeen(gsp)) {
|
if (satellite.willBeSeen(stationPos)) {
|
||||||
if (satellite.tle.isDeepspace) {
|
if (satellite.tle.isDeepspace) {
|
||||||
passes.add(nextDeepSpacePass(refDate))
|
passes.add(nextDeepSpacePass(refDate))
|
||||||
} else {
|
} else {
|
||||||
|
|
|
@ -0,0 +1,2 @@
|
||||||
|
Bumped minSdk to 23 (Android 6.0), fixed AMSat SSL issue
|
||||||
|
Dependencies update, fixed issue #58
|
|
@ -1,10 +1,2 @@
|
||||||
Added immediate initial setup
|
Bumped minSdk to 23 (Android 6.0), fixed AMSat SSL issue
|
||||||
Added pass direction arrow to radar view #52
|
Dependencies update, fixed issue #58
|
||||||
Added orientation pointer to radar view
|
|
||||||
Fixed update triggered crash
|
|
||||||
Fixed radar view update bug #51
|
|
||||||
Fixed tle update issue #53
|
|
||||||
Fixed location update bug #54
|
|
||||||
Removed aiming icon without sensors #57
|
|
||||||
Removed satellite list scroll to the top on selection #59
|
|
||||||
Switched to modular architecture
|
|
Ładowanie…
Reference in New Issue