Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
c9d87be289 | ||
|
|
012ea1eeb6 | ||
|
|
920af7bde2 | ||
|
|
88a8e795d1 | ||
|
|
44ae5cef5d | ||
|
|
518d9a4d22 | ||
|
|
72f507163a | ||
|
|
f7a3dbaa2d | ||
|
|
c525f3a11f | ||
|
|
2777607ab5 | ||
|
|
a222cbb839 | ||
|
|
0ef8f05dc4 | ||
|
|
f7402a3531 | ||
|
|
418a05e343 |
No files matched your search
@@ -18,6 +18,12 @@ android {
|
||||
abiFilters += listOf("armeabi-v7a")
|
||||
}
|
||||
}
|
||||
androidResources {
|
||||
// 显式保留全部语言(防 shrinkResources 丢弃 in/id 印尼语配置); AGP 9 用 localeFilters
|
||||
localeFilters += listOf(
|
||||
"en", "zh", "tr", "in", "id", "es", "ru", "si", "uk"
|
||||
)
|
||||
}
|
||||
signingConfigs {
|
||||
if (keystoreProperties["storeFile"] != null) {
|
||||
create("release") {
|
||||
|
||||
@@ -14,7 +14,10 @@
|
||||
<uses-permission android:name="android.permission.INTERNET" />
|
||||
<uses-permission android:name="android.permission.RECORD_AUDIO" />
|
||||
|
||||
<application
|
||||
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
|
||||
<uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC" />
|
||||
<uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
|
||||
<application
|
||||
android:name=".MainApplication"
|
||||
android:allowBackup="false"
|
||||
android:icon="@mipmap/ic_launcher"
|
||||
@@ -45,5 +48,9 @@
|
||||
android:name="android.telephony.PROPERTY_SATELLITE_DATA_OPTIMIZED"
|
||||
android:value="com.rtbishop.look4sat.bg7nta" />
|
||||
|
||||
<service
|
||||
android:name="com.rtbishop.look4sat.app.AprsForegroundService"
|
||||
android:exported="false"
|
||||
android:foregroundServiceType="dataSync" />
|
||||
</application>
|
||||
</manifest>
|
||||
@@ -0,0 +1,190 @@
|
||||
package com.rtbishop.look4sat.app
|
||||
|
||||
import android.app.Notification
|
||||
import android.app.NotificationChannel
|
||||
import android.app.NotificationManager
|
||||
import android.app.PendingIntent
|
||||
import android.app.Service
|
||||
import android.content.Context
|
||||
import android.content.Intent
|
||||
import android.content.SharedPreferences
|
||||
import android.widget.Toast
|
||||
import android.content.pm.ServiceInfo
|
||||
import android.os.Build
|
||||
import android.os.IBinder
|
||||
import com.rtbishop.look4sat.MainApplication
|
||||
import com.rtbishop.look4sat.core.presentation.R
|
||||
import com.rtbishop.look4sat.core.data.aprs.AprsConfig
|
||||
import com.rtbishop.look4sat.core.data.aprs.AprsStore
|
||||
import com.rtbishop.look4sat.core.data.aprs.AprsReporter
|
||||
import com.rtbishop.look4sat.core.data.aprs.AprsState
|
||||
import kotlinx.coroutines.CoroutineScope
|
||||
import kotlinx.coroutines.Dispatchers
|
||||
import kotlinx.coroutines.SupervisorJob
|
||||
import kotlinx.coroutines.launch
|
||||
|
||||
/**
|
||||
* APRS 前台服务:系统通知保活,切换页面不断线。
|
||||
* START_STICKY:被系统杀掉后自动重启(APRSdroid 同款策略)。
|
||||
*/
|
||||
class AprsForegroundService : Service() {
|
||||
|
||||
companion object {
|
||||
const val ACTION_START = AprsStore.ACTION_START
|
||||
const val ACTION_STOP = AprsStore.ACTION_STOP
|
||||
const val ACTION_REPORT_NOW = AprsStore.ACTION_REPORT_NOW
|
||||
const val CHANNEL_ID = "aprs_service"
|
||||
const val NOTIF_ID = 101
|
||||
}
|
||||
|
||||
private val scope = CoroutineScope(SupervisorJob() + Dispatchers.IO)
|
||||
private var reporter: AprsReporter? = null
|
||||
private var lastState: AprsState = AprsState.Idle
|
||||
|
||||
override fun onBind(intent: Intent?): IBinder? = null
|
||||
|
||||
override fun onCreate() {
|
||||
super.onCreate()
|
||||
createChannel()
|
||||
}
|
||||
|
||||
override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
|
||||
when (intent?.action) {
|
||||
ACTION_STOP -> stopReporting()
|
||||
ACTION_REPORT_NOW -> {
|
||||
if (reporter == null) {
|
||||
// 服务没在跑:先启动(未配置会 Toast 提示)
|
||||
startReporting()
|
||||
}
|
||||
reporter?.reportNow()
|
||||
}
|
||||
else -> startReporting()
|
||||
}
|
||||
return START_STICKY
|
||||
}
|
||||
|
||||
private fun startReporting() {
|
||||
val cfg = AprsStore.loadConfig(this)
|
||||
if (!cfg.enabled || cfg.callsign.isBlank()) {
|
||||
runCatching {
|
||||
Toast.makeText(this, getString(R.string.aprs_toast_not_configured), Toast.LENGTH_SHORT).show()
|
||||
}
|
||||
stopSelf()
|
||||
return
|
||||
}
|
||||
startForegroundWithNotification(cfg)
|
||||
val rep = AprsReporter(
|
||||
configProvider = { AprsStore.loadConfig(this) },
|
||||
positionProvider = { stationPosition() },
|
||||
onState = { lastState = it },
|
||||
onReport = { report ->
|
||||
AprsStore.saveLastReport(this, report.ok, report.detail)
|
||||
updateNotification(cfg)
|
||||
// 上报结果必达:成功 Toast 短显,失败 Toast 长显+原因
|
||||
val msg = if (report.ok) {
|
||||
getString(R.string.aprs_toast_ok)
|
||||
} else {
|
||||
getString(R.string.aprs_toast_fail, report.detail)
|
||||
}
|
||||
runCatching {
|
||||
Toast.makeText(this, msg,
|
||||
if (report.ok) Toast.LENGTH_SHORT else Toast.LENGTH_LONG).show()
|
||||
}
|
||||
}
|
||||
)
|
||||
reporter = rep
|
||||
rep.start()
|
||||
}
|
||||
|
||||
private fun stopReporting() {
|
||||
reporter?.stop()
|
||||
reporter = null
|
||||
stopForeground(STOP_FOREGROUND_REMOVE)
|
||||
stopSelf()
|
||||
}
|
||||
|
||||
private fun startForegroundWithNotification(cfg: AprsConfig) {
|
||||
try {
|
||||
val notif = buildNotification(cfg)
|
||||
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
|
||||
startForeground(NOTIF_ID, notif, ServiceInfo.FOREGROUND_SERVICE_TYPE_DATA_SYNC)
|
||||
} else {
|
||||
startForeground(NOTIF_ID, notif)
|
||||
}
|
||||
} catch (e: Exception) {
|
||||
// 厂商 ROM / 旧系统兼容兜底:启动前台失败只停服务,不崩进程
|
||||
stopSelf()
|
||||
}
|
||||
}
|
||||
|
||||
private fun buildNotification(cfg: AprsConfig): Notification {
|
||||
val pi = PendingIntent.getActivity(
|
||||
this, 0, packageManager.getLaunchIntentForPackage(packageName),
|
||||
PendingIntent.FLAG_IMMUTABLE
|
||||
)
|
||||
val stopPi = PendingIntent.getService(
|
||||
this, 1, Intent(this, AprsForegroundService::class.java).setAction(ACTION_STOP),
|
||||
PendingIntent.FLAG_IMMUTABLE
|
||||
)
|
||||
val stateText = when (lastState) {
|
||||
AprsState.Connected -> getString(R.string.aprs_notif_connected)
|
||||
AprsState.Error -> getString(R.string.aprs_notif_error)
|
||||
else -> getString(R.string.aprs_notif_running)
|
||||
}
|
||||
return Notification.Builder(this, CHANNEL_ID)
|
||||
.setSmallIcon(R.drawable.ic_radios)
|
||||
.setContentTitle(getString(R.string.aprs_notif_title, cfg.callsign))
|
||||
.setContentText(stateText)
|
||||
.setContentIntent(pi)
|
||||
.setOngoing(true)
|
||||
.addAction(0, getString(R.string.aprs_notif_stop), stopPi)
|
||||
.build()
|
||||
}
|
||||
|
||||
private fun updateNotification(cfg: AprsConfig) {
|
||||
val nm = getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
|
||||
nm.notify(NOTIF_ID, buildNotification(cfg))
|
||||
}
|
||||
|
||||
/** 上报位置:优先用设置里的站位(用户拍板);站位无效时实时 GPS 兜底 */
|
||||
private fun stationPosition(): Pair<Double, Double>? {
|
||||
// ① 站位(设置页设置的位置)
|
||||
val station = runCatching {
|
||||
val container = (application as MainApplication).getMainContainer()
|
||||
container.settingsRepo.stationPosition.value
|
||||
}.getOrNull()
|
||||
if (station != null && (station.latitude != 0.0 || station.longitude != 0.0)) {
|
||||
return Pair(station.latitude, station.longitude)
|
||||
}
|
||||
// ② 兜底:实时 GPS 最后位置
|
||||
return runCatching {
|
||||
val lm = getSystemService(Context.LOCATION_SERVICE) as android.location.LocationManager
|
||||
val providers = listOf(
|
||||
android.location.LocationManager.GPS_PROVIDER,
|
||||
android.location.LocationManager.NETWORK_PROVIDER
|
||||
)
|
||||
for (p in providers) {
|
||||
val loc = lm.getLastKnownLocation(p) ?: continue
|
||||
if (loc.latitude != 0.0 || loc.longitude != 0.0) {
|
||||
return Pair(loc.latitude, loc.longitude)
|
||||
}
|
||||
}
|
||||
null
|
||||
}.getOrNull()
|
||||
}
|
||||
|
||||
private fun createChannel() {
|
||||
val nm = getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
|
||||
val channel = NotificationChannel(
|
||||
CHANNEL_ID, getString(R.string.aprs_notif_channel),
|
||||
NotificationManager.IMPORTANCE_LOW
|
||||
)
|
||||
nm.createNotificationChannel(channel)
|
||||
}
|
||||
|
||||
override fun onDestroy() {
|
||||
reporter?.stop()
|
||||
reporter = null
|
||||
super.onDestroy()
|
||||
}
|
||||
}
|
||||
@@ -30,10 +30,29 @@ class MainApplication : Application(), IContainerProvider {
|
||||
|
||||
private lateinit var container: IMainContainer
|
||||
|
||||
/** 全局崩溃捕获:堆栈写入 files/crash_log.txt,重启后可查看(用户要求错误报告) */
|
||||
private fun installCrashHandler() {
|
||||
val defaultHandler = Thread.getDefaultUncaughtExceptionHandler()
|
||||
Thread.setDefaultUncaughtExceptionHandler { thread, throwable ->
|
||||
runCatching {
|
||||
val log = StringBuilder()
|
||||
log.append("=== Crash ${System.currentTimeMillis()} ===\n")
|
||||
log.append("Thread: ").append(thread.name).append("\n")
|
||||
val sw = java.io.StringWriter()
|
||||
throwable.printStackTrace(java.io.PrintWriter(sw))
|
||||
log.append(sw.toString()).append("\n")
|
||||
val file = java.io.File(filesDir, "crash_log.txt")
|
||||
file.appendText(log.toString())
|
||||
}
|
||||
defaultHandler?.uncaughtException(thread, throwable)
|
||||
}
|
||||
}
|
||||
|
||||
override fun getMainContainer(): IMainContainer = container
|
||||
|
||||
override fun onCreate() {
|
||||
super.onCreate()
|
||||
installCrashHandler()
|
||||
container = MainContainer(this)
|
||||
// trigger automatic update every 48 hours
|
||||
container.appScope.launch { checkAutoUpdate() }
|
||||
|
||||
@@ -97,6 +97,7 @@ import com.rtbishop.look4sat.feature.mutual.MutualViewModel
|
||||
import com.rtbishop.look4sat.feature.passes.PassesDestination
|
||||
import com.rtbishop.look4sat.feature.radar.RadarDestination
|
||||
import com.rtbishop.look4sat.feature.radar.WavelogLogScreen
|
||||
import com.rtbishop.look4sat.feature.status.SatStatusScreen
|
||||
import com.rtbishop.look4sat.feature.roaming.RoamingScreen
|
||||
import com.rtbishop.look4sat.feature.satellites.SatellitesDestination
|
||||
import com.rtbishop.look4sat.feature.settings.SettingsDestination
|
||||
@@ -148,7 +149,7 @@ fun MainScreen(navigateToRadar: () -> Unit = {}) {
|
||||
val trackingState by container.radioTrackingService.state.collectAsStateWithLifecycle()
|
||||
val otherSettings by container.settingsRepo.otherSettings.collectAsStateWithLifecycle()
|
||||
// UI 设置: 按 screenOrder 排序(空 = 默认顺序), 再按 hiddenScreens 过滤(设置页固定保留)
|
||||
val allNavItems = listOf(Screen.Satellites, Screen.Passes, Screen.Radar, Screen.Mutual, Screen.Roaming, Screen.CwDecode, Screen.WavelogLog, Screen.Map, Screen.Settings)
|
||||
val allNavItems = listOf(Screen.Satellites, Screen.Passes, Screen.Radar, Screen.Mutual, Screen.Roaming, Screen.CwDecode, Screen.WavelogLog, Screen.AmSat, Screen.Map, Screen.Settings)
|
||||
.sortedBy { screen ->
|
||||
// 未知(新页面如 CwDecode 不在旧持久化顺序里): 用默认顺序位置(漫游↔地图), 再兜底最后
|
||||
val idx = otherSettings.screenOrder.indexOf(screen.screenId)
|
||||
@@ -162,6 +163,7 @@ fun MainScreen(navigateToRadar: () -> Unit = {}) {
|
||||
// 老用户迁移: 已持久化的 subMenuOrder 不含新页面 WavelogLog → 追加到子菜单尾部
|
||||
val subOrder = (otherSettings.subMenuOrder.ifEmpty { com.rtbishop.look4sat.core.presentation.defaultSubMenuOrder })
|
||||
.let { list -> if ("WavelogLog" in list) list else list + "WavelogLog" }
|
||||
.let { list -> if ("AMSAT" in list) list else list + "AMSAT" }
|
||||
val mainNavItems = remember(allNavItems, subOrder) {
|
||||
allNavItems.filter { it.screenId !in subOrder }.take(5)
|
||||
}
|
||||
@@ -193,6 +195,7 @@ fun MainScreen(navigateToRadar: () -> Unit = {}) {
|
||||
is Screen.Mutual -> screen is Screen.Mutual
|
||||
is Screen.CwDecode -> screen is Screen.CwDecode
|
||||
is Screen.WavelogLog -> screen is Screen.WavelogLog
|
||||
is Screen.AmSat -> screen is Screen.AmSat
|
||||
is Screen.Map -> screen is Screen.Map
|
||||
is Screen.Settings -> screen is Screen.Settings
|
||||
else -> false
|
||||
@@ -283,6 +286,9 @@ fun MainScreen(navigateToRadar: () -> Unit = {}) {
|
||||
entry<Screen.CwDecode> {
|
||||
CwDecodeScreen()
|
||||
}
|
||||
entry<Screen.AmSat> {
|
||||
SatStatusScreen(container = container)
|
||||
}
|
||||
entry<Screen.WavelogLog> {
|
||||
WavelogLogScreen(queue = container.wavelogQueue)
|
||||
}
|
||||
|
||||
+1
@@ -39,6 +39,7 @@ internal class ApplicationPlugin : Plugin<Project> {
|
||||
implementation(project(":feature:roaming"))
|
||||
implementation(project(":feature:satellites"))
|
||||
implementation(project(":feature:settings"))
|
||||
implementation(project(":feature:status"))
|
||||
implementation(libs.androidx.core.splashscreen)
|
||||
implementation(libs.compose.material3.adaptive)
|
||||
implementation(libs.compose.navigation3)
|
||||
|
||||
@@ -0,0 +1,106 @@
|
||||
package com.rtbishop.look4sat.core.data.aprs
|
||||
|
||||
import com.rtbishop.look4sat.core.domain.aprs.AprsPacket
|
||||
import java.io.BufferedReader
|
||||
import java.io.InputStreamReader
|
||||
import java.io.OutputStreamWriter
|
||||
import java.io.PrintWriter
|
||||
import java.net.InetSocketAddress
|
||||
import java.net.Socket
|
||||
|
||||
/**
|
||||
* APRS-IS TCP 客户端(从 APRSdroid TcpUploader.scala 逆向移植)。
|
||||
* 纯文本协议:登录一行 + 每行一个包;断线 30 秒重连。
|
||||
*/
|
||||
class AprsIsClient(
|
||||
private val host: String,
|
||||
private val port: Int,
|
||||
private val callsign: String,
|
||||
private val ssid: String,
|
||||
private val passcode: Int,
|
||||
private val version: String,
|
||||
private val filter: String = "",
|
||||
private val timeoutSec: Int = 120
|
||||
) {
|
||||
private var socket: Socket? = null
|
||||
private var writer: PrintWriter? = null
|
||||
private var reader: BufferedReader? = null
|
||||
private val lock = Any()
|
||||
|
||||
val isConnected: Boolean
|
||||
get() = synchronized(lock) { socket?.isConnected == true && !socket!!.isClosed }
|
||||
|
||||
/** 建立连接 + 登录(同步阻塞,调用方放后台线程) */
|
||||
@Throws(Exception::class)
|
||||
fun connect() {
|
||||
disconnect()
|
||||
val s = Socket()
|
||||
s.connect(InetSocketAddress(host, port), 30_000)
|
||||
s.soTimeout = timeoutSec * 1000
|
||||
s.tcpNoDelay = true
|
||||
synchronized(lock) {
|
||||
socket = s
|
||||
writer = PrintWriter(OutputStreamWriter(s.getOutputStream(), Charsets.ISO_8859_1), true)
|
||||
reader = BufferedReader(InputStreamReader(s.getInputStream(), Charsets.ISO_8859_1), 256)
|
||||
}
|
||||
// 登录行
|
||||
val login = AprsPacket.formatLogin(callsign, ssid, passcode, version) + filter
|
||||
writer?.println(login)
|
||||
// 读登录响应(aprsc 返回 # logresp ... verified/unverified)
|
||||
runCatching {
|
||||
s.soTimeout = 8000
|
||||
val resp = reader?.readLine()
|
||||
if (resp != null && (resp.contains("Invalid", ignoreCase = true) ||
|
||||
resp.contains("unverified", ignoreCase = true))) {
|
||||
throw IllegalArgumentException(resp.trim())
|
||||
}
|
||||
// 恢复超时
|
||||
s.soTimeout = timeoutSec * 1000
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 发送一个 APRS 包(一行)并尝试读服务器确认。
|
||||
* 返回 null=发送失败;Pair(ok, detail)=发送结果(服务器错误原文在 detail)
|
||||
*/
|
||||
fun sendPacket(packetLine: String): Pair<Boolean, String>? {
|
||||
synchronized(lock) {
|
||||
val w = writer ?: return null
|
||||
w.println(packetLine)
|
||||
if (w.checkError()) return Pair(false, "write failed")
|
||||
}
|
||||
// 尝试读服务器响应(短超时 3s;APRS-IS 对格式错误会回错误行)
|
||||
return runCatching {
|
||||
val s = socket ?: return@runCatching Pair(true, "OK")
|
||||
val oldTimeout = s.soTimeout
|
||||
s.soTimeout = 3000
|
||||
try {
|
||||
val resp = reader?.readLine()
|
||||
if (resp != null && (resp.contains("Invalid", ignoreCase = true) ||
|
||||
resp.contains("error", ignoreCase = true))) {
|
||||
Pair(false, resp.trim())
|
||||
} else {
|
||||
Pair(true, if (resp.isNullOrBlank()) "OK" else resp.trim())
|
||||
}
|
||||
} finally {
|
||||
s.soTimeout = oldTimeout
|
||||
}
|
||||
}.getOrElse { Pair(true, "OK") }
|
||||
}
|
||||
|
||||
/** 读一行(服务器响应,超时抛异常) */
|
||||
fun readLine(): String? {
|
||||
return reader?.readLine()
|
||||
}
|
||||
|
||||
fun disconnect() {
|
||||
synchronized(lock) {
|
||||
runCatching { writer?.close() }
|
||||
runCatching { reader?.close() }
|
||||
runCatching { socket?.close() }
|
||||
writer = null
|
||||
reader = null
|
||||
socket = null
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,126 @@
|
||||
package com.rtbishop.look4sat.core.data.aprs
|
||||
|
||||
import com.rtbishop.look4sat.core.domain.aprs.AprsPacket
|
||||
import com.rtbishop.look4sat.core.domain.aprs.AprsPosition
|
||||
import kotlinx.coroutines.CoroutineScope
|
||||
import kotlinx.coroutines.Dispatchers
|
||||
import kotlinx.coroutines.Job
|
||||
import kotlinx.coroutines.SupervisorJob
|
||||
import kotlinx.coroutines.delay
|
||||
import kotlinx.coroutines.isActive
|
||||
import kotlinx.coroutines.launch
|
||||
|
||||
/** APRS 连接状态 */
|
||||
enum class AprsState { Idle, Connecting, Connected, Disconnected, Error }
|
||||
|
||||
/** APRS 配置(SharedPreferences 持久化,填入即保存) */
|
||||
data class AprsConfig(
|
||||
val enabled: Boolean = false,
|
||||
val server: String = "euro.aprs2.net",
|
||||
val port: Int = 14580,
|
||||
val callsign: String = "",
|
||||
val ssid: String = "",
|
||||
val passcode: String = "",
|
||||
val intervalMin: Int = 5,
|
||||
val statusText: String = "Look4Sat APRS",
|
||||
val symbolTable: String = "/",
|
||||
val symbolCode: String = ">",
|
||||
val includeCourseSpeed: Boolean = true,
|
||||
val includeAltitude: Boolean = true
|
||||
)
|
||||
|
||||
/** APRS 上报结果 */
|
||||
data class AprsReport(
|
||||
val timestamp: Long,
|
||||
val packet: String,
|
||||
val ok: Boolean,
|
||||
val detail: String
|
||||
)
|
||||
|
||||
/** 上报调度器(周期上报 + 手动触发),连接管理放在前台服务 */
|
||||
class AprsReporter(
|
||||
private val configProvider: () -> AprsConfig,
|
||||
private val positionProvider: () -> Pair<Double, Double>? = { null },
|
||||
private val onState: (AprsState) -> Unit = {},
|
||||
private val onReport: (AprsReport) -> Unit = {}
|
||||
) {
|
||||
private val scope = CoroutineScope(SupervisorJob() + Dispatchers.IO)
|
||||
private var client: AprsIsClient? = null
|
||||
private var job: Job? = null
|
||||
private var manualJob: Job? = null
|
||||
|
||||
val isRunning: Boolean get() = job?.isActive == true
|
||||
|
||||
/** 启动周期上报(前台服务调用) */
|
||||
fun start() {
|
||||
stop()
|
||||
val cfg = configProvider()
|
||||
if (!cfg.enabled || cfg.callsign.isBlank()) {
|
||||
onState(AprsState.Error)
|
||||
return
|
||||
}
|
||||
job = scope.launch {
|
||||
while (isActive) {
|
||||
reportOnce()
|
||||
delay(cfg.intervalMin.coerceAtLeast(1) * 60_000L)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fun stop() {
|
||||
job?.cancel()
|
||||
job = null
|
||||
runCatching { client?.disconnect() }
|
||||
client = null
|
||||
onState(AprsState.Idle)
|
||||
}
|
||||
|
||||
/** 手动触发一次(立即上报,不等待周期) */
|
||||
fun reportNow() {
|
||||
manualJob?.cancel()
|
||||
manualJob = scope.launch { reportOnce() }
|
||||
}
|
||||
|
||||
private suspend fun reportOnce() {
|
||||
val cfg = configProvider()
|
||||
if (!cfg.enabled || cfg.callsign.isBlank()) return
|
||||
onState(AprsState.Connecting)
|
||||
try {
|
||||
val c = client ?: AprsIsClient(
|
||||
host = cfg.server,
|
||||
port = cfg.port,
|
||||
callsign = cfg.callsign,
|
||||
ssid = cfg.ssid,
|
||||
passcode = cfg.passcode.toIntOrNull()?.takeIf { it >= 0 } ?: AprsPacket.passcode(cfg.callsign),
|
||||
version = "Look4Sat 4.5.4"
|
||||
).also { client = it }
|
||||
if (!c.isConnected) c.connect()
|
||||
onState(AprsState.Connected)
|
||||
|
||||
val pos = positionProvider()
|
||||
val packetLine = buildPositionPacket(cfg, pos?.first, pos?.second)
|
||||
val result = c.sendPacket(packetLine)
|
||||
val ok = result?.first == true
|
||||
val detail = result?.second ?: "no connection"
|
||||
onReport(AprsReport(System.currentTimeMillis(), packetLine, ok, detail))
|
||||
if (ok) onState(AprsState.Connected) else onState(AprsState.Error)
|
||||
} catch (e: Exception) {
|
||||
runCatching { client?.disconnect() }
|
||||
client = null
|
||||
onState(AprsState.Error)
|
||||
onReport(AprsReport(System.currentTimeMillis(), "", false, e.message ?: "error"))
|
||||
}
|
||||
}
|
||||
|
||||
/** 构造位置包:BG7NTA-5>APRS:=DDMM.MMN/DDDMM.MME<状态文本 */
|
||||
private fun buildPositionPacket(cfg: AprsConfig, lat: Double? = null, lon: Double? = null): String {
|
||||
val source = AprsPacket.formatCallSsid(cfg.callsign, cfg.ssid)
|
||||
val pos = AprsPosition(
|
||||
latitude = lat ?: 0.0,
|
||||
longitude = lon ?: 0.0,
|
||||
symbolTable = cfg.symbolTable.firstOrNull() ?: '/',
|
||||
symbolCode = cfg.symbolCode.firstOrNull() ?: '>'
|
||||
)
|
||||
return "$source>APRS:=${pos.toUncompressedString()}${cfg.statusText}"
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,83 @@
|
||||
package com.rtbishop.look4sat.core.data.aprs
|
||||
|
||||
import android.content.Context
|
||||
|
||||
/**
|
||||
* APRS 配置存取 + 服务 action 常量(被 feature/settings 和 app 服务共用,
|
||||
* 避免 feature 反向依赖 app)。
|
||||
*/
|
||||
object AprsStore {
|
||||
|
||||
const val ACTION_START = "com.rtbishop.look4sat.aprs.START"
|
||||
const val ACTION_STOP = "com.rtbishop.look4sat.aprs.STOP"
|
||||
const val ACTION_REPORT_NOW = "com.rtbishop.look4sat.aprs.REPORT_NOW"
|
||||
const val SERVICE_CLASS = "com.rtbishop.look4sat.app.AprsForegroundService"
|
||||
|
||||
private const val PREFS = "aprs_config"
|
||||
private const val KEY_ENABLED = "enabled"
|
||||
private const val KEY_SERVER = "server"
|
||||
private const val KEY_PORT = "port"
|
||||
private const val KEY_CALLSIGN = "callsign"
|
||||
private const val KEY_SSID = "ssid"
|
||||
private const val KEY_PASSCODE = "passcode"
|
||||
private const val KEY_INTERVAL = "interval"
|
||||
private const val KEY_STATUS = "status"
|
||||
private const val KEY_SYMBOL_TABLE = "symbol_table"
|
||||
private const val KEY_SYMBOL_CODE = "symbol_code"
|
||||
private const val KEY_LAST_TIME = "last_report_time"
|
||||
private const val KEY_LAST_OK = "last_report_ok"
|
||||
private const val KEY_LAST_DETAIL = "last_report_detail"
|
||||
|
||||
/** 读取配置(填入即保存,无需每次打开重填) */
|
||||
fun loadConfig(context: Context): AprsConfig {
|
||||
val p = context.getSharedPreferences(PREFS, Context.MODE_PRIVATE)
|
||||
return AprsConfig(
|
||||
enabled = p.getBoolean(KEY_ENABLED, false),
|
||||
server = p.getString(KEY_SERVER, "euro.aprs2.net") ?: "euro.aprs2.net",
|
||||
port = p.getInt(KEY_PORT, 14580),
|
||||
callsign = p.getString(KEY_CALLSIGN, "") ?: "",
|
||||
ssid = p.getString(KEY_SSID, "") ?: "",
|
||||
passcode = p.getString(KEY_PASSCODE, "") ?: "",
|
||||
intervalMin = p.getInt(KEY_INTERVAL, 5),
|
||||
statusText = p.getString(KEY_STATUS, "Look4Sat APRS") ?: "Look4Sat APRS",
|
||||
symbolTable = p.getString(KEY_SYMBOL_TABLE, "/") ?: "/",
|
||||
symbolCode = p.getString(KEY_SYMBOL_CODE, ">") ?: ">"
|
||||
)
|
||||
}
|
||||
|
||||
/** 上次上报结果(供设置卡片显示) */
|
||||
data class LastReport(val time: Long = 0L, val ok: Boolean = false, val detail: String = "")
|
||||
|
||||
fun loadLastReport(context: Context): LastReport {
|
||||
val p = context.getSharedPreferences(PREFS, Context.MODE_PRIVATE)
|
||||
return LastReport(
|
||||
time = p.getLong(KEY_LAST_TIME, 0L),
|
||||
ok = p.getBoolean(KEY_LAST_OK, false),
|
||||
detail = p.getString(KEY_LAST_DETAIL, "") ?: ""
|
||||
)
|
||||
}
|
||||
|
||||
fun saveLastReport(context: Context, ok: Boolean, detail: String) {
|
||||
context.getSharedPreferences(PREFS, Context.MODE_PRIVATE).edit()
|
||||
.putLong(KEY_LAST_TIME, System.currentTimeMillis())
|
||||
.putBoolean(KEY_LAST_OK, ok)
|
||||
.putString(KEY_LAST_DETAIL, detail)
|
||||
.apply()
|
||||
}
|
||||
|
||||
/** 保存配置 */
|
||||
fun saveConfig(context: Context, cfg: AprsConfig) {
|
||||
context.getSharedPreferences(PREFS, Context.MODE_PRIVATE).edit()
|
||||
.putBoolean(KEY_ENABLED, cfg.enabled)
|
||||
.putString(KEY_SERVER, cfg.server)
|
||||
.putInt(KEY_PORT, cfg.port)
|
||||
.putString(KEY_CALLSIGN, cfg.callsign)
|
||||
.putString(KEY_SSID, cfg.ssid)
|
||||
.putString(KEY_PASSCODE, cfg.passcode)
|
||||
.putInt(KEY_INTERVAL, cfg.intervalMin)
|
||||
.putString(KEY_STATUS, cfg.statusText)
|
||||
.putString(KEY_SYMBOL_TABLE, cfg.symbolTable)
|
||||
.putString(KEY_SYMBOL_CODE, cfg.symbolCode)
|
||||
.apply()
|
||||
}
|
||||
}
|
||||
@@ -29,6 +29,7 @@ import com.rtbishop.look4sat.core.data.framework.Ft817Controller
|
||||
import com.rtbishop.look4sat.core.data.framework.Ic705Controller
|
||||
import com.rtbishop.look4sat.core.data.framework.NetworkReporter
|
||||
import com.rtbishop.look4sat.core.data.framework.RadioTrackingService
|
||||
import com.rtbishop.look4sat.core.data.repository.AmSatRepository
|
||||
import com.rtbishop.look4sat.core.data.repository.DatabaseRepo
|
||||
import com.rtbishop.look4sat.core.data.repository.SatelliteRepo
|
||||
import com.rtbishop.look4sat.core.data.repository.SelectionRepo
|
||||
@@ -73,12 +74,14 @@ import okhttp3.OkHttpClient
|
||||
class MainContainer(private val context: Context) : IMainContainer {
|
||||
|
||||
private val localSource = provideLocalSource()
|
||||
private val remoteSource by lazy { provideRemoteSource() }
|
||||
private val mainHandler = CoroutineExceptionHandler { _, error -> println("MainHandler: $error") }
|
||||
override val appScope = CoroutineScope(SupervisorJob() + Dispatchers.Default + mainHandler)
|
||||
override val settingsRepo = provideSettingsRepo()
|
||||
override val selectionRepo = provideSelectionRepo()
|
||||
override val satelliteRepo = provideSatelliteRepo()
|
||||
override val databaseRepo = provideDatabaseRepo()
|
||||
override val amSatRepo = AmSatRepository(remoteSource)
|
||||
override val radioTrackingService: IRadioTrackingService by lazy {
|
||||
val manager = context.getSystemService(Context.BLUETOOTH_SERVICE) as BluetoothManager
|
||||
RadioTrackingService(appScope, manager, satelliteRepo, settingsRepo)
|
||||
@@ -162,7 +165,6 @@ class MainContainer(private val context: Context) : IMainContainer {
|
||||
private fun provideDatabaseRepo(): IDatabaseRepo {
|
||||
val dbDispatcher = Dispatchers.Default
|
||||
val dataParser = DataParser(dbDispatcher)
|
||||
val remoteSource = provideRemoteSource()
|
||||
return DatabaseRepo(dbDispatcher, dataParser, localSource, remoteSource, settingsRepo)
|
||||
}
|
||||
|
||||
|
||||
@@ -0,0 +1,21 @@
|
||||
package com.rtbishop.look4sat.core.data.repository
|
||||
|
||||
import com.rtbishop.look4sat.core.data.source.AmSatParser
|
||||
import com.rtbishop.look4sat.core.domain.model.SatStatusPage
|
||||
import com.rtbishop.look4sat.core.domain.repository.IAmSatRepository
|
||||
import com.rtbishop.look4sat.core.domain.source.IRemoteSource
|
||||
|
||||
/** AMSAT 状态仓库: 抓 HTML → 解析 → SatStatusPage */
|
||||
class AmSatRepository(private val remoteSource: IRemoteSource) : IAmSatRepository {
|
||||
|
||||
override suspend fun fetchStatus(): SatStatusPage? {
|
||||
val html = remoteSource.getStatusHtml() ?: return null
|
||||
if (html.isBlank()) return null
|
||||
return try {
|
||||
AmSatParser.parse(html, System.currentTimeMillis())
|
||||
} catch (exception: Exception) {
|
||||
println("AmSatRepository parse exception: $exception")
|
||||
null
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,136 @@
|
||||
package com.rtbishop.look4sat.core.data.source
|
||||
|
||||
import com.rtbishop.look4sat.core.domain.model.SatDay
|
||||
import com.rtbishop.look4sat.core.domain.model.SatReport
|
||||
import com.rtbishop.look4sat.core.domain.model.SatSlot
|
||||
import com.rtbishop.look4sat.core.domain.model.SatStatus
|
||||
import com.rtbishop.look4sat.core.domain.model.SatStatusPage
|
||||
import java.util.regex.Pattern
|
||||
|
||||
/**
|
||||
* AMSAT 卫星状态页解析器(https://amsat.org/status/)
|
||||
*
|
||||
* 页面结构(静态 HTML, 2026-08 实测):
|
||||
* - 状态表: <table> 内 48 行, 表头 = Name + 6 天(每个 colspan=12)
|
||||
* 数据行 73 格: [0]=卫星名, [1..72] = 6 天 × 12 个 2 小时槽(新→旧)
|
||||
* 每格 <td width=9 bgcolor="颜色">数字</td>, 有报告时数字带
|
||||
* docTips.show('id') 链接
|
||||
* - 报告详情在页面内嵌 JS:
|
||||
* tips.a885153 = new Array(5,5,120,'状态<br>呼号<br>网格<br>日期<br>时间段 UTC')
|
||||
*
|
||||
* 状态色: #648fff=活跃, #ffb000=仅遥测, #dc267f=未听到, #fe6100=矛盾
|
||||
*/
|
||||
object AmSatParser {
|
||||
|
||||
private val STATUS_COLORS = mapOf(
|
||||
"#648fff" to 0xFF648FFF.toLong(),
|
||||
"#ffb000" to 0xFFFFB000.toLong(),
|
||||
"#dc267f" to 0xFFDC267F.toLong(),
|
||||
"#fe6100" to 0xFFFE6100.toLong()
|
||||
)
|
||||
private val GRAY = 0xFFC0C0C0.toLong()
|
||||
|
||||
private val rowRe = Pattern.compile("<tr>(.*?)</tr>", Pattern.DOTALL)
|
||||
private val cellRe = Pattern.compile("(<t[dh][^>]*>.*?</t[dh]>)", Pattern.DOTALL)
|
||||
private val bgRe = Pattern.compile("bgcolor=\"?(#[0-9a-fA-F]{6}|C0C0C0)\"?")
|
||||
private val linkRe = Pattern.compile("docTips\\.show\\('(a\\d+)'\\)")
|
||||
private val tipRe = Pattern.compile(
|
||||
"tips\\.(a\\d+)\\s*=\\s*new\\s+Array\\(\\s*\\d+,\\s*\\d+,\\s*\\d+,\\s*'([^']*)'"
|
||||
)
|
||||
|
||||
/** 解析完整页面 */
|
||||
fun parse(html: String, fetchedAtUtcMs: Long): SatStatusPage {
|
||||
val reports = parseReports(html)
|
||||
val statuses = parseStatusTable(html, reports)
|
||||
return SatStatusPage(fetchedAtUtcMs, statuses, reports)
|
||||
}
|
||||
|
||||
/** 提取全部报告(tips.* JS 数组) */
|
||||
fun parseReports(html: String): Map<String, SatReport> {
|
||||
val map = mutableMapOf<String, SatReport>()
|
||||
val m = tipRe.matcher(html)
|
||||
while (m.find()) {
|
||||
val id = m.group(1)
|
||||
val parts = m.group(2).split("<br>")
|
||||
map[id] = SatReport(
|
||||
id = id,
|
||||
statusText = parts.getOrElse(0) { "" }.trim(),
|
||||
call = parts.getOrElse(1) { "" }.trim(),
|
||||
grid = parts.getOrElse(2) { "" }.trim(),
|
||||
dateUtc = parts.getOrElse(3) { "" }.trim(),
|
||||
timeUtc = parts.getOrElse(4) { "" }.trim()
|
||||
)
|
||||
}
|
||||
return map
|
||||
}
|
||||
|
||||
/** 解析状态表(48 行卫星) */
|
||||
fun parseStatusTable(html: String, reports: Map<String, SatReport>): List<SatStatus> {
|
||||
val result = mutableListOf<SatStatus>()
|
||||
val tables = extractTables(html)
|
||||
for (table in tables) {
|
||||
val rows = rowRe.matcher(table)
|
||||
val parsed = mutableListOf<SatStatus>()
|
||||
var rowIndex = 0
|
||||
var dayHeaders: List<String> = emptyList()
|
||||
while (rows.find()) {
|
||||
val rowHtml = rows.group(1)
|
||||
val cells = cellRe.matcher(rowHtml)
|
||||
val cellList = mutableListOf<String>()
|
||||
while (cells.find()) cellList.add(cells.group(1))
|
||||
if (rowIndex == 0) {
|
||||
// 表头: Name + 6 天(每个 colspan=12)
|
||||
dayHeaders = cellList.drop(1).take(6).map { stripHtml(it) }
|
||||
rowIndex++
|
||||
continue
|
||||
}
|
||||
if (cellList.size < 7) { rowIndex++; continue }
|
||||
val name = stripHtml(cellList[0])
|
||||
if (name.isBlank()) { rowIndex++; continue }
|
||||
val days = mutableListOf<SatDay>()
|
||||
for (d in 0 until 6) {
|
||||
val start = 1 + d * 12
|
||||
val end = start + 12
|
||||
val slots = (start until end).mapNotNull { i ->
|
||||
cellList.getOrNull(i)?.let { cell ->
|
||||
val bg = bgRe.matcher(cell)
|
||||
val color = if (bg.find()) {
|
||||
STATUS_COLORS[bg.group(1).lowercase()] ?: GRAY
|
||||
} else GRAY
|
||||
val link = linkRe.matcher(cell)
|
||||
val ids = mutableListOf<String>()
|
||||
while (link.find()) ids.add(link.group(1))
|
||||
val hasReport = ids.isNotEmpty()
|
||||
val count = if (hasReport) {
|
||||
stripHtml(cell).trim().toIntOrNull() ?: ids.size
|
||||
} else 0
|
||||
SatSlot(
|
||||
statusColor = if (hasReport) color else GRAY,
|
||||
count = count,
|
||||
reportIds = ids
|
||||
)
|
||||
}
|
||||
}
|
||||
days.add(SatDay(dayHeaders.getOrElse(d) { "" }, slots))
|
||||
}
|
||||
parsed.add(SatStatus(name, days))
|
||||
rowIndex++
|
||||
}
|
||||
if (parsed.isNotEmpty()) {
|
||||
result.addAll(parsed)
|
||||
break
|
||||
}
|
||||
}
|
||||
return result
|
||||
}
|
||||
|
||||
private fun extractTables(html: String): List<String> {
|
||||
val result = mutableListOf<String>()
|
||||
val m = Pattern.compile("<table.*?</table>", Pattern.DOTALL).matcher(html)
|
||||
while (m.find()) result.add(m.group())
|
||||
return result
|
||||
}
|
||||
|
||||
private fun stripHtml(s: String): String =
|
||||
s.replace(Regex("<[^>]+>"), "").trim()
|
||||
}
|
||||
@@ -43,6 +43,22 @@ class RemoteSource(
|
||||
}
|
||||
}
|
||||
|
||||
override suspend fun getStatusHtml(): String? = withContext(dispatcher) {
|
||||
try {
|
||||
val request = Request.Builder()
|
||||
.url("https://amsat.org/status/")
|
||||
.header("User-Agent", "Mozilla/5.0 (Linux; Android 13) Look4Sat/4.5")
|
||||
.build()
|
||||
httpClient.newCall(request).execute().use { response ->
|
||||
if (!response.isSuccessful) return@use null
|
||||
response.body?.string()
|
||||
}
|
||||
} catch (exception: Exception) {
|
||||
println("RemoteSource amsat status exception: $exception")
|
||||
null
|
||||
}
|
||||
}
|
||||
|
||||
override suspend fun getNetworkStream(url: String): InputStream? = withContext(dispatcher) {
|
||||
try {
|
||||
val networkRequest = Request.Builder().url(url).build()
|
||||
|
||||
@@ -0,0 +1,116 @@
|
||||
package com.rtbishop.look4sat.core.domain.aprs
|
||||
|
||||
import kotlin.math.abs
|
||||
import kotlin.math.round
|
||||
|
||||
/**
|
||||
* APRS-IS 协议核心(纯 Kotlin,无 Android 依赖)。
|
||||
* 从 APRSdroid 1.6.3d 逆向移植:AprsPacket$.scala + ab0oo Position.java。
|
||||
*/
|
||||
object AprsPacket {
|
||||
|
||||
/** APRS-IS passcode 算法(标准):0x73E2 初值,呼号大写+\0,每对字符 XOR */
|
||||
fun passcode(callsign: String): Int {
|
||||
val s = callsign.split("-")[0].uppercase() + "\u0000"
|
||||
var hash = 29666 // 0x73E2
|
||||
var i = 0
|
||||
while (i <= s.length - 2) {
|
||||
hash = hash xor (s[i].code * 256 + s[i + 1].code)
|
||||
i += 2
|
||||
}
|
||||
return hash and 0x7FFF
|
||||
}
|
||||
|
||||
/** 登录行:user CALL-SSID pass XXXX vers XXXX */
|
||||
fun formatLogin(callsign: String, ssid: String, passcode: Int, version: String): String {
|
||||
val callSsid = formatCallSsid(callsign, ssid)
|
||||
return "user $callSsid pass $passcode vers $version"
|
||||
}
|
||||
|
||||
/** 呼号-SSID 拼接(BG7NTA + 5 → BG7NTA-5) */
|
||||
fun formatCallSsid(callsign: String, ssid: String): String {
|
||||
if (ssid.isNullOrEmpty()) return callsign
|
||||
return "$callsign-$ssid"
|
||||
}
|
||||
|
||||
/** 可选距离过滤: filter r/lat/lon/dist */
|
||||
fun formatRangeFilter(latitude: Double, longitude: Double, distKm: Int): String {
|
||||
return String.format("r/%.3f/%.3f/%d", latitude, longitude, distKm)
|
||||
}
|
||||
|
||||
/** 高度扩展 /A=00000(英尺) */
|
||||
fun formatAltitude(altitudeMeters: Double?): String {
|
||||
if (altitudeMeters == null) return ""
|
||||
return String.format("/A=%06d", (altitudeMeters * 3.2808399).toInt())
|
||||
}
|
||||
|
||||
/** 航速航向扩展(节/度) */
|
||||
fun formatCourseSpeed(speedMps: Double?, bearing: Float?): String {
|
||||
if (speedMps == null || bearing == null) return ""
|
||||
val knots = (speedMps * 1.94384449).toInt()
|
||||
return String.format("/%03d/%03d", bearing.toInt(), knots)
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* APRS 位置编码(ab0oo Position.java 逆向移植)。
|
||||
* 非压缩:DDMM.MMN/DDDMM.MME;压缩:base91。
|
||||
*/
|
||||
class AprsPosition(
|
||||
val latitude: Double,
|
||||
val longitude: Double,
|
||||
val symbolTable: Char,
|
||||
val symbolCode: Char,
|
||||
val positionAmbiguity: Int = 0
|
||||
) {
|
||||
|
||||
/** 非压缩格式(APRS-IS 默认上报格式) */
|
||||
fun toUncompressedString(): String {
|
||||
val lat = getDMS(latitude, true)
|
||||
val lon = getDMS(longitude, false)
|
||||
return "$lat$symbolTable$lon$symbolCode"
|
||||
}
|
||||
|
||||
/** 压缩格式(base91,标准 APRS 算法) */
|
||||
fun toCompressedString(): String {
|
||||
val jRound = round((90.0 - latitude) * 380926.0).toLong()
|
||||
val j = jRound / 753571 + 33
|
||||
val j2 = jRound % 753571
|
||||
val j3 = j2 / 8281 + 33
|
||||
val j4 = j2 % 8281
|
||||
val i = (j4 % 91).toInt() + 33
|
||||
val jRound2 = round((longitude + 180.0) * 190463.0).toLong()
|
||||
val j5 = jRound2 / 753571 + 33
|
||||
val j6 = jRound2 % 753571
|
||||
val j7 = 33 + j6 / 8281
|
||||
val j8 = j6 % 8281
|
||||
return "" + symbolTable + j.toInt().toChar() + j3.toInt().toChar() +
|
||||
((j4 / 91).toInt() + 33).toChar() + i.toChar() +
|
||||
j5.toInt().toChar() + j7.toInt().toChar() +
|
||||
((j8 / 91).toInt() + 33).toChar() +
|
||||
((j8 % 91).toInt() + 33).toChar() + symbolCode
|
||||
}
|
||||
|
||||
/** 单轴 DMS 编码(百分位) */
|
||||
private fun getDMS(value: Double, isLat: Boolean): String {
|
||||
var iRound = round(value * 6000.0).toInt()
|
||||
if (iRound < 0) iRound = -iRound
|
||||
val degrees = iRound / 6000
|
||||
val minutes = (iRound / 100) % 60
|
||||
val hundredths = iRound % 100
|
||||
val frac = when (positionAmbiguity) {
|
||||
1 -> " . "
|
||||
2 -> String.format("%d . ", minutes / 10)
|
||||
3 -> String.format("%02d. ", minutes)
|
||||
4 -> String.format("%02d.%d ", minutes, hundredths / 10)
|
||||
else -> String.format("%02d.%02d", minutes, hundredths)
|
||||
}
|
||||
return if (isLat) {
|
||||
val ns = if (value >= 0) 'N' else 'S'
|
||||
String.format("%02d%s%c", degrees, frac, ns)
|
||||
} else {
|
||||
val ew = if (value >= 0) 'E' else 'W'
|
||||
String.format("%03d%s%c", degrees, frac, ew)
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,37 @@
|
||||
package com.rtbishop.look4sat.core.domain.model
|
||||
|
||||
/** 单条卫星状态报告(AMSAT 网站 tooltip 数据) */
|
||||
data class SatReport(
|
||||
val id: String, // 报告 ID(a885153)
|
||||
val statusText: String, // Heard / Telemetry Only / Not Heard ...
|
||||
val call: String, // 呼号
|
||||
val grid: String, // 网格坐标(可为空)
|
||||
val dateUtc: String, // 2026-08-04
|
||||
val timeUtc: String // 2:46-:59 UTC
|
||||
)
|
||||
|
||||
/** 单个 2 小时槽的状态 */
|
||||
data class SatSlot(
|
||||
val statusColor: Long, // ARGB 状态色(-1 = 无报告)
|
||||
val count: Int, // 报告数量(0 = 无)
|
||||
val reportIds: List<String> = emptyList() // 该槽报告 ID 列表
|
||||
)
|
||||
|
||||
/** 卫星一天的状态(12 个 2 小时槽) */
|
||||
data class SatDay(
|
||||
val dateLabel: String, // "Aug 4"
|
||||
val slots: List<SatSlot> // 12 槽(00-02 ... 22-24)
|
||||
)
|
||||
|
||||
/** 单个卫星 6 天状态 */
|
||||
data class SatStatus(
|
||||
val name: String, // "AO-123_[FM]"
|
||||
val days: List<SatDay> // 6 天(新→旧)
|
||||
)
|
||||
|
||||
/** 页面整体解析结果 */
|
||||
data class SatStatusPage(
|
||||
val fetchedAtUtcMs: Long,
|
||||
val statuses: List<SatStatus>,
|
||||
val reports: Map<String, SatReport> // id → 报告
|
||||
)
|
||||
+9
@@ -0,0 +1,9 @@
|
||||
package com.rtbishop.look4sat.core.domain.repository
|
||||
|
||||
import com.rtbishop.look4sat.core.domain.model.SatStatusPage
|
||||
|
||||
/** AMSAT 卫星状态数据源 */
|
||||
interface IAmSatRepository {
|
||||
/** 抓取并解析 AMSAT 状态页; 失败返回 null */
|
||||
suspend fun fetchStatus(): SatStatusPage?
|
||||
}
|
||||
+1
@@ -30,6 +30,7 @@ interface IMainContainer {
|
||||
val selectionRepo: ISelectionRepo
|
||||
val satelliteRepo: ISatelliteRepo
|
||||
val databaseRepo: IDatabaseRepo
|
||||
val amSatRepo: IAmSatRepository
|
||||
val radioTrackingService: IRadioTrackingService
|
||||
val mutualPassData: StateFlow<MutualPassData>
|
||||
fun setMutualPassData(data: MutualPassData)
|
||||
|
||||
@@ -22,4 +22,7 @@ import java.io.InputStream
|
||||
interface IRemoteSource {
|
||||
suspend fun getFileStream(uri: String): InputStream?
|
||||
suspend fun getNetworkStream(url: String): InputStream?
|
||||
|
||||
/** 抓取 AMSAT 状态页 HTML(带 UA, 返回 null = 失败) */
|
||||
suspend fun getStatusHtml(): String?
|
||||
}
|
||||
+4
-1
@@ -47,6 +47,9 @@ sealed class Screen(val iconResId: Int, val titleResId: Int, val screenId: Strin
|
||||
@Serializable
|
||||
data object WavelogLog : Screen(R.drawable.ic_log, R.string.nav_log, "WavelogLog")
|
||||
|
||||
@Serializable
|
||||
data object AmSat : Screen(R.drawable.ic_satellites, R.string.nav_amsat, "AMSAT")
|
||||
|
||||
@Serializable
|
||||
data object Settings : Screen(R.drawable.ic_settings, R.string.nav_prefs, "Settings")
|
||||
}
|
||||
@@ -55,7 +58,7 @@ sealed class Screen(val iconResId: Int, val titleResId: Int, val screenId: Strin
|
||||
val defaultScreenOrder = listOf("Satellites", "Passes", "Radar", "Map", "Settings")
|
||||
|
||||
// UI 设置: 默认更多菜单顺序(进「更多」的页面)
|
||||
val defaultSubMenuOrder = listOf("Mutual", "Roaming", "CwDecode", "WavelogLog")
|
||||
val defaultSubMenuOrder = listOf("Mutual", "Roaming", "CwDecode", "WavelogLog", "AMSAT")
|
||||
|
||||
@Serializable
|
||||
data object RadarDestination : NavKey
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<string name="app_name">Look4Sat Pro</string>
|
||||
<string name="app_name" translatable="false">Look4Sat Pro</string>
|
||||
<string name="btn_accept">Terima</string>
|
||||
<string name="btn_cancel">Batal</string>
|
||||
<string name="empty_list_message">Tidak ada data untuk ditampilkan</string>
|
||||
@@ -12,8 +12,50 @@
|
||||
<string name="nav_cw">Dekoder CW</string>
|
||||
<string name="nav_map">Peta</string>
|
||||
<string name="nav_prefs">Pengaturan</string>
|
||||
<string name="prefs_aprs_title">Pelaporan APRS</string>
|
||||
<string name="prefs_aprs_enable">Aktifkan pelaporan APRS</string>
|
||||
<string name="prefs_aprs_summary">Server: %1$s:%2$d Panggilan: %3$s</string>
|
||||
<string name="prefs_aprs_report_now">Lapor Sekarang</string>
|
||||
<string name="prefs_aprs_settings_title">Pengaturan APRS</string>
|
||||
<string name="prefs_aprs_server">Server</string>
|
||||
<string name="prefs_aprs_port">Port</string>
|
||||
<string name="prefs_aprs_callsign">Tanda panggilan</string>
|
||||
<string name="prefs_aprs_ssid">SSID</string>
|
||||
<string name="prefs_aprs_passcode">Kode sandi</string>
|
||||
<string name="prefs_aprs_passcode_hint">Kosong = otomatis dari panggilan</string>
|
||||
<string name="prefs_aprs_interval">Interval (menit)</string>
|
||||
<string name="prefs_aprs_status">Teks status</string>
|
||||
<string name="prefs_aprs_symbol_table">Tabel simbol</string>
|
||||
<string name="prefs_aprs_symbol_code">Kode simbol</string>
|
||||
<string name="prefs_aprs_save">Simpan</string>
|
||||
<string name="prefs_aprs_cancel">Batal</string>
|
||||
<string name="aprs_notif_channel">Layanan APRS</string>
|
||||
<string name="aprs_notif_title">APRS: %1$s</string>
|
||||
<string name="aprs_notif_running">Pelaporan berjalan</string>
|
||||
<string name="aprs_notif_connected">Terhubung ke APRS-IS</string>
|
||||
<string name="aprs_notif_error">Kesalahan koneksi</string>
|
||||
<string name="aprs_notif_stop">Berhenti</string>
|
||||
<string name="prefs_aprs_calc_passcode">Hitung kode sandi</string>
|
||||
<string name="aprs_toast_ok">APRS: laporan terkirim</string>
|
||||
<string name="aprs_toast_fail">APRS: laporan gagal - %1$s</string>
|
||||
<string name="aprs_toast_not_configured">APRS belum dikonfigurasi - isi panggilan dulu</string>
|
||||
<string name="prefs_aprs_last_report">Laporan terakhir: %1$s %2$s</string>
|
||||
<string name="prefs_aprs_last_ok">OK</string>
|
||||
<string name="prefs_aprs_last_fail">gagal - %1$s</string>
|
||||
<string name="nav_more">Lainnya</string>
|
||||
<string name="nav_log">Log</string>
|
||||
<string name="nav_amsat">AMSAT</string>
|
||||
<string name="amsat_title">Status Satelit AMSAT</string>
|
||||
<string name="amsat_updated">Diperbarui:</string>
|
||||
<string name="amsat_active">Aktif</string>
|
||||
<string name="amsat_tlm">TLM/beacon</string>
|
||||
<string name="amsat_not_heard">Tidak terdengar</string>
|
||||
<string name="amsat_conflict">Konflik</string>
|
||||
<string name="amsat_name">Name</string>
|
||||
<string name="amsat_load_failed">Gagal memuat - periksa jaringan dan coba lagi</string>
|
||||
<string name="amsat_no_reports">Tidak ada laporan untuk periode ini</string>
|
||||
<string name="amsat_close">Tutup</string>
|
||||
|
||||
<string name="sat_type_hint">Jenis: %s</string>
|
||||
<string name="sat_type_title">Pilih jenis satelit</string>
|
||||
<string name="sat_search_hint">Id - Nama</string>
|
||||
@@ -33,13 +75,13 @@
|
||||
<string name="pass_filter_aos_time">Jendela AOS</string>
|
||||
<string name="pass_filter_invert_time">Balik jendela AOS</string>
|
||||
<string name="pass_filter_deep_space">DeepSpace (periode >225 mnt)</string>
|
||||
<string name="pass_time_placeholder"> -- : -- : -- </string>
|
||||
<string name="pass_time_placeholder" translatable="false"> -- : -- : -- </string>
|
||||
<string name="pass_modes_title">Pilih jenis modulasi</string>
|
||||
<string name="pass_satId">%05d</string>
|
||||
<string name="pass_satId" translatable="false">%05d</string>
|
||||
<string name="pass_elevation">Elevasi: %.1f°</string>
|
||||
<string name="pass_deep_space">DeepSpace</string>
|
||||
<string name="pass_deep_space" translatable="false">DeepSpace</string>
|
||||
<string name="pass_altitude">Ketinggian: %d km</string>
|
||||
<string name="pass_aosLos">%03d° - %03d°</string>
|
||||
<string name="pass_aosLos" translatable="false">%03d° - %03d°</string>
|
||||
<string name="pass_empty_list_message">
|
||||
Pastikan filter Anda benar dan Anda sudah memilih satelit</string>
|
||||
<string name="pass_error_message">Tidak ada lintasan satelit mendatang untuk ditampilkan</string>
|
||||
@@ -47,26 +89,31 @@
|
||||
<string name="pass_welcome_message">
|
||||
Pastikan Anda mengatur posisi melalui GPS, Lat/Lon atau QTH di Pengaturan.
|
||||
\n\nPerbarui database setidaknya seminggu sekali untuk prediksi yang akurat.</string>
|
||||
<string name="pass_whatsnew_title">Apa yang baru di Look4Sat</string>
|
||||
<string name="pass_whatsnew_message">
|
||||
* WaveLog kini mendukung API v1 dan v2 (terdeteksi otomatis); dialog kesalahan dengan tombol salin
|
||||
* Frekuensi log cocok dengan panel Doppler; transponder linier menampilkan rentang penuh</string>
|
||||
<string name="pass_whatsnew_title" translatable="false">Apa yang baru di Look4Sat</string>
|
||||
<string name="pass_whatsnew_message" translatable="false">
|
||||
* BARU: Halaman status satelit AMSAT - tabel status langsung (warna resmi), jumlah laporan, laporan detail per satelit/hari
|
||||
* Log dikelompokkan per lintasan satelit (sesi = satelit + waktu AOS), garis pemisah antar sesi
|
||||
* GPS kini hanya menampilkan sukses saat posisi benar-benar didapat (timeout 15 dtk, cek izin)
|
||||
* Pesan kegagalan jelas saat database satelit gagal diunduh
|
||||
* Frekuensi log mengikuti panel Doppler secara real-time; visual hapus geser dipulihkan
|
||||
* Perbaikan bahasa Indonesia (values-id)
|
||||
* BARU: Pelaporan APRS (jaringan APRS-IS, layanan latar depan dengan notifikasi, interval dapat diatur)</string>
|
||||
<string name="radar_back">Kembali</string>
|
||||
<string name="radar_notify">Beri tahu</string>
|
||||
<string name="radar_az_text">Azimuth</string>
|
||||
<string name="radar_az_value">%.1f°</string>
|
||||
<string name="radar_az_value" translatable="false">%.1f°</string>
|
||||
<string name="radar_el_text">Elevasi</string>
|
||||
<string name="radar_el_value">%.1f°</string>
|
||||
<string name="radar_el_value" translatable="false">%.1f°</string>
|
||||
<string name="radar_alt_text">Ketinggian</string>
|
||||
<string name="radar_alt_value">%.0f km</string>
|
||||
<string name="radar_alt_value" translatable="false">%.0f km</string>
|
||||
<string name="radar_dist_text">Jarak</string>
|
||||
<string name="radar_dist_value">%.0f km</string>
|
||||
<string name="radar_dist_value" translatable="false">%.0f km</string>
|
||||
<string name="radar_eclipsed">Gerhana</string>
|
||||
<string name="radar_downlink">Downlink</string>
|
||||
<string name="radar_uplink">Uplink</string>
|
||||
<string name="radar_link_low">%.4f</string>
|
||||
<string name="radar_link_lowHigh">%.4f - %.4f</string>
|
||||
<string name="radar_no_link">- - . - -</string>
|
||||
<string name="radar_link_low" translatable="false">%.4f</string>
|
||||
<string name="radar_link_lowHigh" translatable="false">%.4f - %.4f</string>
|
||||
<string name="radar_no_link" translatable="false">- - . - -</string>
|
||||
<string name="radar_no_data">Satelit ini tidak memiliki transceiver</string>
|
||||
<string name="radar_add">Tambah</string>
|
||||
<string name="radar_data">Transceiver satelit:</string>
|
||||
@@ -86,32 +133,32 @@
|
||||
<string name="radar_cw_reset">Bersihkan</string>
|
||||
<string name="map_prev">Sebelumnya</string>
|
||||
<string name="map_next">Berikutnya</string>
|
||||
<string name="map_copyright">© Kontributor OpenStreetMap</string>
|
||||
<string name="map_copyright" translatable="false">© Kontributor OpenStreetMap</string>
|
||||
<string name="map_azimuth">Azimuth: %.1f°</string>
|
||||
<string name="map_elevation">Elevasi: %.1f°</string>
|
||||
<string name="map_altitude">Ketinggian: %.0f km</string>
|
||||
<string name="map_distance">Jarak: %.0f km</string>
|
||||
<string name="map_latitude">Lintang: %.1f°</string>
|
||||
<string name="map_longitude">Bujur: %.1f°</string>
|
||||
<string name="map_qth">QTH: %s</string>
|
||||
<string name="map_qth" translatable="false">QTH: %s</string>
|
||||
<string name="map_phase">Fase: %.1f°</string>
|
||||
<string name="map_eclipsed">Gerhana</string>
|
||||
<string name="map_period">Periode: %.0f mnt</string>
|
||||
<string name="map_velocity">Kecepatan: %.2f km/d</string>
|
||||
<string name="map_visibility">Visibilitas: %s</string>
|
||||
<string name="map_visible">Terlihat</string>
|
||||
<string name="prefs_app_title">Look4Sat Pro v%s</string>
|
||||
<string name="prefs_app_url">https://play.google.com/store/apps/details?id=com.rtbishop.look4sat</string>
|
||||
<string name="prefs_app_title" translatable="false">Look4Sat Pro v%s</string>
|
||||
<string name="prefs_app_url" translatable="false">https://play.google.com/store/apps/details?id=com.rtbishop.look4sat</string>
|
||||
<string name="prefs_donate_title">Donasi</string>
|
||||
<string name="prefs_donate_url">https://ko-fi.com/rt_bishop</string>
|
||||
<string name="prefs_fdroid_title">F-Droid</string>
|
||||
<string name="prefs_fdroid_url">https://f-droid.org/en/packages/com.rtbishop.look4sat/</string>
|
||||
<string name="prefs_github_title">GitHub</string>
|
||||
<string name="prefs_github_url">https://github.com/rt-bishop/Look4Sat/</string>
|
||||
<string name="prefs_license_title">GPLv3</string>
|
||||
<string name="prefs_license_url">https://www.gnu.org/licenses/gpl-3.0.html</string>
|
||||
<string name="prefs_donate_url" translatable="false">https://ko-fi.com/rt_bishop</string>
|
||||
<string name="prefs_fdroid_title" translatable="false">F-Droid</string>
|
||||
<string name="prefs_fdroid_url" translatable="false">https://f-droid.org/en/packages/com.rtbishop.look4sat/</string>
|
||||
<string name="prefs_github_title" translatable="false">GitHub</string>
|
||||
<string name="prefs_github_url" translatable="false">https://github.com/rt-bishop/Look4Sat/</string>
|
||||
<string name="prefs_license_title" translatable="false">GPLv3</string>
|
||||
<string name="prefs_license_url" translatable="false">https://www.gnu.org/licenses/gpl-3.0.html</string>
|
||||
<string name="prefs_privacy_title">Kebijakan Privasi</string>
|
||||
<string name="prefs_privacy_url">https://sites.google.com/view/look4sat-privacy-policy/home</string>
|
||||
<string name="prefs_privacy_url" translatable="false">https://sites.google.com/view/look4sat-privacy-policy/home</string>
|
||||
<string name="prefs_updated_title">Diperbarui: %s</string>
|
||||
<string name="prefs_updated_time">d MMM yyyy - HH:mm:ss</string>
|
||||
<string name="prefs_loc_title">Posisi stasiun</string>
|
||||
@@ -141,7 +188,7 @@
|
||||
<string name="prefs_data_sources_title">Sumber data kustom</string>
|
||||
<string name="prefs_data_sources_tle_switch">URL TLE Kustom</string>
|
||||
<string name="prefs_data_sources_transceivers_switch">URL transceiver kustom</string>
|
||||
<string name="prefs_data_sources_url_title">URL (HTTPS)</string>
|
||||
<string name="prefs_data_sources_url_title" translatable="false">URL (HTTPS)</string>
|
||||
<string name="prefs_data_reset_url">Setel ulang ke URL bawaan</string>
|
||||
<string name="prefs_data_output_title">Keluaran data</string>
|
||||
<string name="prefs_net_output">Jaringan</string>
|
||||
@@ -222,7 +269,7 @@
|
||||
<string name="prefs_highlight_mid">Sedang %1$d–%2$d°</string>
|
||||
<string name="prefs_highlight_high">Tinggi > %1$d°</string>
|
||||
<string name="prefs_outro_title">BG7NTA & penulis asli mengucapkan terima kasih</string>
|
||||
<string name="prefs_outro_thanks">
|
||||
<string name="prefs_outro_thanks" translatable="false">
|
||||
* Pengguna dan kontributor Look4Sat!
|
||||
\n* David A. B. Johnson (predict4java)
|
||||
\n* Dave Moten (predict4java)
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<string name="app_name">Look4Sat Pro</string>
|
||||
<string name="app_name" translatable="false">Look4Sat Pro</string>
|
||||
<string name="btn_accept">Terima</string>
|
||||
<string name="btn_cancel">Batal</string>
|
||||
<string name="empty_list_message">Tidak ada data untuk ditampilkan</string>
|
||||
@@ -12,8 +12,49 @@
|
||||
<string name="nav_cw">Dekoder CW</string>
|
||||
<string name="nav_map">Peta</string>
|
||||
<string name="nav_prefs">Pengaturan</string>
|
||||
<string name="prefs_aprs_title">Pelaporan APRS</string>
|
||||
<string name="prefs_aprs_enable">Aktifkan pelaporan APRS</string>
|
||||
<string name="prefs_aprs_summary">Server: %1$s:%2$d Panggilan: %3$s</string>
|
||||
<string name="prefs_aprs_report_now">Lapor Sekarang</string>
|
||||
<string name="prefs_aprs_settings_title">Pengaturan APRS</string>
|
||||
<string name="prefs_aprs_server">Server</string>
|
||||
<string name="prefs_aprs_port">Port</string>
|
||||
<string name="prefs_aprs_callsign">Tanda panggilan</string>
|
||||
<string name="prefs_aprs_ssid">SSID</string>
|
||||
<string name="prefs_aprs_passcode">Kode sandi</string>
|
||||
<string name="prefs_aprs_passcode_hint">Kosong = otomatis dari panggilan</string>
|
||||
<string name="prefs_aprs_interval">Interval (menit)</string>
|
||||
<string name="prefs_aprs_status">Teks status</string>
|
||||
<string name="prefs_aprs_symbol_table">Tabel simbol</string>
|
||||
<string name="prefs_aprs_symbol_code">Kode simbol</string>
|
||||
<string name="prefs_aprs_save">Simpan</string>
|
||||
<string name="prefs_aprs_cancel">Batal</string>
|
||||
<string name="aprs_notif_channel">Layanan APRS</string>
|
||||
<string name="aprs_notif_title">APRS: %1$s</string>
|
||||
<string name="aprs_notif_running">Pelaporan berjalan</string>
|
||||
<string name="aprs_notif_connected">Terhubung ke APRS-IS</string>
|
||||
<string name="aprs_notif_error">Kesalahan koneksi</string>
|
||||
<string name="aprs_notif_stop">Berhenti</string>
|
||||
<string name="prefs_aprs_calc_passcode">Hitung kode sandi</string>
|
||||
<string name="aprs_toast_ok">APRS: laporan terkirim</string>
|
||||
<string name="aprs_toast_fail">APRS: laporan gagal - %1$s</string>
|
||||
<string name="aprs_toast_not_configured">APRS belum dikonfigurasi - isi panggilan dulu</string>
|
||||
<string name="prefs_aprs_last_report">Laporan terakhir: %1$s %2$s</string>
|
||||
<string name="prefs_aprs_last_ok">OK</string>
|
||||
<string name="prefs_aprs_last_fail">gagal - %1$s</string>
|
||||
<string name="nav_more">Lainnya</string>
|
||||
<string name="nav_log">Log</string>
|
||||
<string name="nav_amsat">AMSAT</string>
|
||||
<string name="amsat_title">Status Satelit AMSAT</string>
|
||||
<string name="amsat_updated">Diperbarui:</string>
|
||||
<string name="amsat_active">Aktif</string>
|
||||
<string name="amsat_tlm">TLM/beacon</string>
|
||||
<string name="amsat_not_heard">Tidak terdengar</string>
|
||||
<string name="amsat_conflict">Konflik</string>
|
||||
<string name="amsat_name">Name</string>
|
||||
<string name="amsat_load_failed">Gagal memuat - periksa jaringan dan coba lagi</string>
|
||||
<string name="amsat_no_reports">Tidak ada laporan untuk periode ini</string>
|
||||
<string name="amsat_close">Tutup</string>
|
||||
<string name="sat_type_hint">Jenis: %s</string>
|
||||
<string name="sat_type_title">Pilih jenis satelit</string>
|
||||
<string name="sat_search_hint">Id - Nama</string>
|
||||
@@ -33,13 +74,13 @@
|
||||
<string name="pass_filter_aos_time">Jendela AOS</string>
|
||||
<string name="pass_filter_invert_time">Balik jendela AOS</string>
|
||||
<string name="pass_filter_deep_space">DeepSpace (periode >225 mnt)</string>
|
||||
<string name="pass_time_placeholder"> -- : -- : -- </string>
|
||||
<string name="pass_time_placeholder" translatable="false"> -- : -- : -- </string>
|
||||
<string name="pass_modes_title">Pilih jenis modulasi</string>
|
||||
<string name="pass_satId">%05d</string>
|
||||
<string name="pass_satId" translatable="false">%05d</string>
|
||||
<string name="pass_elevation">Elevasi: %.1f°</string>
|
||||
<string name="pass_deep_space">DeepSpace</string>
|
||||
<string name="pass_deep_space" translatable="false">DeepSpace</string>
|
||||
<string name="pass_altitude">Ketinggian: %d km</string>
|
||||
<string name="pass_aosLos">%03d° - %03d°</string>
|
||||
<string name="pass_aosLos" translatable="false">%03d° - %03d°</string>
|
||||
<string name="pass_empty_list_message">
|
||||
Pastikan filter Anda benar dan Anda sudah memilih satelit</string>
|
||||
<string name="pass_error_message">Tidak ada lintasan satelit mendatang untuk ditampilkan</string>
|
||||
@@ -47,26 +88,31 @@
|
||||
<string name="pass_welcome_message">
|
||||
Pastikan Anda mengatur posisi melalui GPS, Lat/Lon atau QTH di Pengaturan.
|
||||
\n\nPerbarui database setidaknya seminggu sekali untuk prediksi yang akurat.</string>
|
||||
<string name="pass_whatsnew_title">Apa yang baru di Look4Sat</string>
|
||||
<string name="pass_whatsnew_message">
|
||||
* WaveLog kini mendukung API v1 dan v2 (terdeteksi otomatis); dialog kesalahan dengan tombol salin
|
||||
* Frekuensi log cocok dengan panel Doppler; transponder linier menampilkan rentang penuh</string>
|
||||
<string name="pass_whatsnew_title" translatable="false">Apa yang baru di Look4Sat</string>
|
||||
<string name="pass_whatsnew_message" translatable="false">
|
||||
* BARU: Halaman status satelit AMSAT - tabel status langsung (warna resmi), jumlah laporan, laporan detail per satelit/hari
|
||||
* Log dikelompokkan per lintasan satelit (sesi = satelit + waktu AOS), garis pemisah antar sesi
|
||||
* GPS kini hanya menampilkan sukses saat posisi benar-benar didapat (timeout 15 dtk, cek izin)
|
||||
* Pesan kegagalan jelas saat database satelit gagal diunduh
|
||||
* Frekuensi log mengikuti panel Doppler secara real-time; visual hapus geser dipulihkan
|
||||
* Perbaikan bahasa Indonesia (values-id)
|
||||
* BARU: Pelaporan APRS (jaringan APRS-IS, layanan latar depan dengan notifikasi, interval dapat diatur)</string>
|
||||
<string name="radar_back">Kembali</string>
|
||||
<string name="radar_notify">Beri tahu</string>
|
||||
<string name="radar_az_text">Azimuth</string>
|
||||
<string name="radar_az_value">%.1f°</string>
|
||||
<string name="radar_az_value" translatable="false">%.1f°</string>
|
||||
<string name="radar_el_text">Elevasi</string>
|
||||
<string name="radar_el_value">%.1f°</string>
|
||||
<string name="radar_el_value" translatable="false">%.1f°</string>
|
||||
<string name="radar_alt_text">Ketinggian</string>
|
||||
<string name="radar_alt_value">%.0f km</string>
|
||||
<string name="radar_alt_value" translatable="false">%.0f km</string>
|
||||
<string name="radar_dist_text">Jarak</string>
|
||||
<string name="radar_dist_value">%.0f km</string>
|
||||
<string name="radar_dist_value" translatable="false">%.0f km</string>
|
||||
<string name="radar_eclipsed">Gerhana</string>
|
||||
<string name="radar_downlink">Downlink</string>
|
||||
<string name="radar_uplink">Uplink</string>
|
||||
<string name="radar_link_low">%.4f</string>
|
||||
<string name="radar_link_lowHigh">%.4f - %.4f</string>
|
||||
<string name="radar_no_link">- - . - -</string>
|
||||
<string name="radar_link_low" translatable="false">%.4f</string>
|
||||
<string name="radar_link_lowHigh" translatable="false">%.4f - %.4f</string>
|
||||
<string name="radar_no_link" translatable="false">- - . - -</string>
|
||||
<string name="radar_no_data">Satelit ini tidak memiliki transceiver</string>
|
||||
<string name="radar_add">Tambah</string>
|
||||
<string name="radar_data">Transceiver satelit:</string>
|
||||
@@ -86,32 +132,32 @@
|
||||
<string name="radar_cw_reset">Bersihkan</string>
|
||||
<string name="map_prev">Sebelumnya</string>
|
||||
<string name="map_next">Berikutnya</string>
|
||||
<string name="map_copyright">© Kontributor OpenStreetMap</string>
|
||||
<string name="map_copyright" translatable="false">© Kontributor OpenStreetMap</string>
|
||||
<string name="map_azimuth">Azimuth: %.1f°</string>
|
||||
<string name="map_elevation">Elevasi: %.1f°</string>
|
||||
<string name="map_altitude">Ketinggian: %.0f km</string>
|
||||
<string name="map_distance">Jarak: %.0f km</string>
|
||||
<string name="map_latitude">Lintang: %.1f°</string>
|
||||
<string name="map_longitude">Bujur: %.1f°</string>
|
||||
<string name="map_qth">QTH: %s</string>
|
||||
<string name="map_qth" translatable="false">QTH: %s</string>
|
||||
<string name="map_phase">Fase: %.1f°</string>
|
||||
<string name="map_eclipsed">Gerhana</string>
|
||||
<string name="map_period">Periode: %.0f mnt</string>
|
||||
<string name="map_velocity">Kecepatan: %.2f km/d</string>
|
||||
<string name="map_visibility">Visibilitas: %s</string>
|
||||
<string name="map_visible">Terlihat</string>
|
||||
<string name="prefs_app_title">Look4Sat Pro v%s</string>
|
||||
<string name="prefs_app_url">https://play.google.com/store/apps/details?id=com.rtbishop.look4sat</string>
|
||||
<string name="prefs_app_title" translatable="false">Look4Sat Pro v%s</string>
|
||||
<string name="prefs_app_url" translatable="false">https://play.google.com/store/apps/details?id=com.rtbishop.look4sat</string>
|
||||
<string name="prefs_donate_title">Donasi</string>
|
||||
<string name="prefs_donate_url">https://ko-fi.com/rt_bishop</string>
|
||||
<string name="prefs_fdroid_title">F-Droid</string>
|
||||
<string name="prefs_fdroid_url">https://f-droid.org/en/packages/com.rtbishop.look4sat/</string>
|
||||
<string name="prefs_github_title">GitHub</string>
|
||||
<string name="prefs_github_url">https://github.com/rt-bishop/Look4Sat/</string>
|
||||
<string name="prefs_license_title">GPLv3</string>
|
||||
<string name="prefs_license_url">https://www.gnu.org/licenses/gpl-3.0.html</string>
|
||||
<string name="prefs_donate_url" translatable="false">https://ko-fi.com/rt_bishop</string>
|
||||
<string name="prefs_fdroid_title" translatable="false">F-Droid</string>
|
||||
<string name="prefs_fdroid_url" translatable="false">https://f-droid.org/en/packages/com.rtbishop.look4sat/</string>
|
||||
<string name="prefs_github_title" translatable="false">GitHub</string>
|
||||
<string name="prefs_github_url" translatable="false">https://github.com/rt-bishop/Look4Sat/</string>
|
||||
<string name="prefs_license_title" translatable="false">GPLv3</string>
|
||||
<string name="prefs_license_url" translatable="false">https://www.gnu.org/licenses/gpl-3.0.html</string>
|
||||
<string name="prefs_privacy_title">Kebijakan Privasi</string>
|
||||
<string name="prefs_privacy_url">https://sites.google.com/view/look4sat-privacy-policy/home</string>
|
||||
<string name="prefs_privacy_url" translatable="false">https://sites.google.com/view/look4sat-privacy-policy/home</string>
|
||||
<string name="prefs_updated_title">Diperbarui: %s</string>
|
||||
<string name="prefs_updated_time">d MMM yyyy - HH:mm:ss</string>
|
||||
<string name="prefs_loc_title">Posisi stasiun</string>
|
||||
@@ -141,7 +187,7 @@
|
||||
<string name="prefs_data_sources_title">Sumber data kustom</string>
|
||||
<string name="prefs_data_sources_tle_switch">URL TLE Kustom</string>
|
||||
<string name="prefs_data_sources_transceivers_switch">URL transceiver kustom</string>
|
||||
<string name="prefs_data_sources_url_title">URL (HTTPS)</string>
|
||||
<string name="prefs_data_sources_url_title" translatable="false">URL (HTTPS)</string>
|
||||
<string name="prefs_data_reset_url">Setel ulang ke URL bawaan</string>
|
||||
<string name="prefs_data_output_title">Keluaran data</string>
|
||||
<string name="prefs_net_output">Jaringan</string>
|
||||
@@ -223,7 +269,7 @@
|
||||
<string name="prefs_highlight_mid">Sedang %1$d–%2$d°</string>
|
||||
<string name="prefs_highlight_high">Tinggi > %1$d°</string>
|
||||
<string name="prefs_outro_title">BG7NTA & penulis asli mengucapkan terima kasih</string>
|
||||
<string name="prefs_outro_thanks">
|
||||
<string name="prefs_outro_thanks" translatable="false">
|
||||
* Pengguna dan kontributor Look4Sat!
|
||||
\n* David A. B. Johnson (predict4java)
|
||||
\n* Dave Moten (predict4java)
|
||||
|
||||
@@ -13,8 +13,49 @@
|
||||
<string name="nav_cw">CW Dekoder</string>
|
||||
<string name="nav_map">Harita</string>
|
||||
<string name="nav_prefs">Ayarlar</string>
|
||||
<string name="prefs_aprs_title">APRS Raporlama</string>
|
||||
<string name="prefs_aprs_enable">APRS raporlamayı etkinleştir</string>
|
||||
<string name="prefs_aprs_summary">Sunucu: %1$s:%2$d Çağrı: %3$s</string>
|
||||
<string name="prefs_aprs_report_now">Şimdi Raporla</string>
|
||||
<string name="prefs_aprs_settings_title">APRS Ayarları</string>
|
||||
<string name="prefs_aprs_server">Sunucu</string>
|
||||
<string name="prefs_aprs_port">Port</string>
|
||||
<string name="prefs_aprs_callsign">Çağrı işareti</string>
|
||||
<string name="prefs_aprs_ssid">SSID</string>
|
||||
<string name="prefs_aprs_passcode">Parola</string>
|
||||
<string name="prefs_aprs_passcode_hint">Parola boş = çağrıdan otomatik hesaplanır</string>
|
||||
<string name="prefs_aprs_interval">Aralık (dakika)</string>
|
||||
<string name="prefs_aprs_status">Durum metni</string>
|
||||
<string name="prefs_aprs_symbol_table">Sembol tablosu</string>
|
||||
<string name="prefs_aprs_symbol_code">Sembol kodu</string>
|
||||
<string name="prefs_aprs_save">Kaydet</string>
|
||||
<string name="prefs_aprs_cancel">İptal</string>
|
||||
<string name="aprs_notif_channel">APRS hizmeti</string>
|
||||
<string name="aprs_notif_title">APRS: %1$s</string>
|
||||
<string name="aprs_notif_running">Raporlama çalışıyor</string>
|
||||
<string name="aprs_notif_connected">APRS-IS bağlı</string>
|
||||
<string name="aprs_notif_error">Bağlantı hatası</string>
|
||||
<string name="aprs_notif_stop">Durdur</string>
|
||||
<string name="prefs_aprs_calc_passcode">Parolayı hesapla</string>
|
||||
<string name="aprs_toast_ok">APRS: rapor gönderildi</string>
|
||||
<string name="aprs_toast_fail">APRS: rapor başarısız - %1$s</string>
|
||||
<string name="aprs_toast_not_configured">APRS yapılandırılmadı - önce çağrı girin</string>
|
||||
<string name="prefs_aprs_last_report">Son rapor: %1$s %2$s</string>
|
||||
<string name="prefs_aprs_last_ok">OK</string>
|
||||
<string name="prefs_aprs_last_fail">başarısız - %1$s</string>
|
||||
<string name="nav_more">Daha Fazla</string>
|
||||
<string name="nav_log">Günlük</string>
|
||||
<string name="nav_amsat">AMSAT</string>
|
||||
<string name="amsat_title">AMSAT Uydu Durumu</string>
|
||||
<string name="amsat_updated">Güncellendi:</string>
|
||||
<string name="amsat_active">Aktif</string>
|
||||
<string name="amsat_tlm">TLM/işaret</string>
|
||||
<string name="amsat_not_heard">Duyulmadı</string>
|
||||
<string name="amsat_conflict">Çelişkili</string>
|
||||
<string name="amsat_name">Name</string>
|
||||
<string name="amsat_load_failed">Yükleme başarısız - ağı kontrol edip tekrar deneyin</string>
|
||||
<string name="amsat_no_reports">Bu dönem için rapor yok</string>
|
||||
<string name="amsat_close">Kapat</string>
|
||||
|
||||
<!-- Satellites screen -->
|
||||
<string name="sat_type_hint">Uydu türü: %s</string>
|
||||
@@ -54,8 +95,13 @@
|
||||
\n\nDoğru tahminler alabilmek için veritabanını en az haftada bir güncelleyin.</string>
|
||||
<string name="pass_whatsnew_title" translatable="false">What\'s new in Look4Sat</string>
|
||||
<string name="pass_whatsnew_message" translatable="false">
|
||||
* WaveLog artık hem API v1 hem v2 destekliyor (otomatik algılama); kopyalama butonlu hata penceresi
|
||||
* Günlük frekansları Doppler paneliyle eşleşiyor; doğrusal transponderler tam aralığı gösteriyor</string>
|
||||
* YENİ: AMSAT uydu durum sayfası - canlı durum tablosu (resmi renkler), rapor sayıları, uydu/gün bazında detaylı raporlar
|
||||
* Günlükler uydu geçişine göre gruplanır (oturum = uydu + AOS zamanı), oturumlar arasında ayırıcı çizgi
|
||||
* GPS artık yalnızca gerçek konum alındığında başarı gösterir (15 sn zaman aşımı, izin kontrolü)
|
||||
* Uydu veritabanı indirilemediğinde net hata mesajı gösterilir
|
||||
* Günlük frekansları Doppler panelini gerçek zamanlı takip eder; kaydırarak silme görselleri düzeltildi
|
||||
* Endonezya dili düzeltmesi (values-id)
|
||||
* YENİ: APRS raporlama (APRS-IS ağı, bildirimli ön plan hizmeti, ayarlanabilir aralık)</string>
|
||||
|
||||
<!-- Radar screen -->
|
||||
<string name="radar_back">Geri</string>
|
||||
|
||||
@@ -14,8 +14,49 @@
|
||||
<string name="nav_cw">CW解码</string>
|
||||
<string name="nav_map">地图</string>
|
||||
<string name="nav_prefs">设置</string>
|
||||
<string name="prefs_aprs_title">APRS 上报</string>
|
||||
<string name="prefs_aprs_enable">启用 APRS 上报</string>
|
||||
<string name="prefs_aprs_summary">服务器: %1$s:%2$d 呼号: %3$s</string>
|
||||
<string name="prefs_aprs_report_now">立即上报</string>
|
||||
<string name="prefs_aprs_settings_title">APRS 设置</string>
|
||||
<string name="prefs_aprs_server">服务器</string>
|
||||
<string name="prefs_aprs_port">端口</string>
|
||||
<string name="prefs_aprs_callsign">呼号</string>
|
||||
<string name="prefs_aprs_ssid">SSID</string>
|
||||
<string name="prefs_aprs_passcode">验证码</string>
|
||||
<string name="prefs_aprs_passcode_hint">验证码留空 = 按呼号自动计算</string>
|
||||
<string name="prefs_aprs_interval">周期(分钟)</string>
|
||||
<string name="prefs_aprs_status">状态文本</string>
|
||||
<string name="prefs_aprs_symbol_table">符号表</string>
|
||||
<string name="prefs_aprs_symbol_code">符号码</string>
|
||||
<string name="prefs_aprs_save">保存</string>
|
||||
<string name="prefs_aprs_cancel">取消</string>
|
||||
<string name="aprs_notif_channel">APRS 服务</string>
|
||||
<string name="aprs_notif_title">APRS: %1$s</string>
|
||||
<string name="aprs_notif_running">上报运行中</string>
|
||||
<string name="aprs_notif_connected">已连接 APRS-IS</string>
|
||||
<string name="aprs_notif_error">连接错误</string>
|
||||
<string name="aprs_notif_stop">停止</string>
|
||||
<string name="prefs_aprs_calc_passcode">计算验证码</string>
|
||||
<string name="aprs_toast_ok">APRS: 上报成功</string>
|
||||
<string name="aprs_toast_fail">APRS: 上报失败 - %1$s</string>
|
||||
<string name="aprs_toast_not_configured">APRS 未配置,请先填呼号</string>
|
||||
<string name="prefs_aprs_last_report">上次上报: %1$s %2$s</string>
|
||||
<string name="prefs_aprs_last_ok">成功</string>
|
||||
<string name="prefs_aprs_last_fail">失败 - %1$s</string>
|
||||
<string name="nav_more">更多</string>
|
||||
<string name="nav_log">日志</string>
|
||||
<string name="nav_amsat">AMSAT</string>
|
||||
<string name="amsat_title">AMSAT 卫星状态</string>
|
||||
<string name="amsat_updated">更新:</string>
|
||||
<string name="amsat_active">活跃</string>
|
||||
<string name="amsat_tlm">仅遥测</string>
|
||||
<string name="amsat_not_heard">未听到</string>
|
||||
<string name="amsat_conflict">矛盾</string>
|
||||
<string name="amsat_name">Name</string>
|
||||
<string name="amsat_load_failed">加载失败,请检查网络后重试</string>
|
||||
<string name="amsat_no_reports">该时段无报告</string>
|
||||
<string name="amsat_close">关闭</string>
|
||||
|
||||
<!-- Satellites screen -->
|
||||
<string name="sat_type_hint">类型:%s</string>
|
||||
@@ -44,8 +85,13 @@
|
||||
<string name="pass_welcome_message">请务必在设置中通过GPS、经纬度或QTH定位您的位置\n建议至少每周更新一次数据库,以确保预测结果的准确性</string>
|
||||
<string name="pass_whatsnew_title">Look4Sat Pro 更新内容</string>
|
||||
<string name="pass_whatsnew_message" translatable="false">
|
||||
* WaveLog 同时支持 API v1 和 v2(自动识别); 错误弹窗带一键复制
|
||||
* 日志频率与多普勒面板一致; 线性转发器显示完整频段区间</string>
|
||||
* 新增: AMSAT 卫星状态页 - 实时状态表格(官网配色)、报告数量、逐卫星/逐日详细报告
|
||||
* 日志按场次分组(场次 = 卫星 + AOS 时间), 组间横线分隔
|
||||
* GPS 真正定位成功才会提示成功(15 秒超时, 权限检查)
|
||||
* 卫星数据库下载失败时有明确失败提示
|
||||
* 日志频率实时跟随多普勒面板; 左滑删除视觉恢复
|
||||
* 印尼语识别修复(values-id)
|
||||
* 新增: APRS 网络上报(APRS-IS,前台服务+通知保活,周期可调)</string>
|
||||
|
||||
<!-- Radar screen -->
|
||||
<string name="radar_back">后退</string>
|
||||
@@ -100,7 +146,7 @@
|
||||
<string name="prefs_updated_title">更新:%s</string>
|
||||
<string name="prefs_updated_time">yyyy MMM d - HH:mm:ss</string>
|
||||
|
||||
<string name="prefs_loc_title">站位</string>
|
||||
<string name="prefs_loc_title">站点位置</string>
|
||||
<string name="prefs_loc_gps_title">GPS 定位</string>
|
||||
<string name="prefs_loc_gps_error">无法获取位置,请检查定位权限和GPS/网络信号</string>
|
||||
<string name="prefs_loc_input_title">输入位置</string>
|
||||
@@ -108,11 +154,11 @@
|
||||
<string name="prefs_loc_qth_title">QTH 网格</string>
|
||||
<string name="prefs_loc_qth_error">无效的 QTH 网格</string>
|
||||
<string name="prefs_loc_success">位置更新成功</string>
|
||||
<string name="prefs_station_title">站位设置</string>
|
||||
<string name="prefs_station_lat_text">输入站位的纬度</string>
|
||||
<string name="prefs_station_lon_text">输入站位的经度</string>
|
||||
<string name="prefs_station_title">站点位置设置</string>
|
||||
<string name="prefs_station_lat_text">输入站点的纬度</string>
|
||||
<string name="prefs_station_lon_text">输入站点的经度</string>
|
||||
<string name="prefs_locator_title">QTH 网格</string>
|
||||
<string name="prefs_locator_text">使用梅登黑德网格设置站位</string>
|
||||
<string name="prefs_locator_text">使用梅登黑德网格设置站点位置</string>
|
||||
|
||||
<string name="prefs_data_title">卫星数据更新</string>
|
||||
<string name="prefs_data_entries">卫星:%s</string>
|
||||
|
||||
@@ -15,8 +15,49 @@
|
||||
<string name="nav_cw">CW Decoder</string>
|
||||
<string name="nav_map">Map</string>
|
||||
<string name="nav_prefs">Settings</string>
|
||||
<string name="prefs_aprs_title">APRS Reporting</string>
|
||||
<string name="prefs_aprs_enable">Enable APRS reporting</string>
|
||||
<string name="prefs_aprs_summary">Server: %1$s:%2$d Callsign: %3$s</string>
|
||||
<string name="prefs_aprs_report_now">Report Now</string>
|
||||
<string name="prefs_aprs_settings_title">APRS Settings</string>
|
||||
<string name="prefs_aprs_server">Server</string>
|
||||
<string name="prefs_aprs_port">Port</string>
|
||||
<string name="prefs_aprs_callsign">Callsign</string>
|
||||
<string name="prefs_aprs_ssid">SSID</string>
|
||||
<string name="prefs_aprs_passcode">Passcode</string>
|
||||
<string name="prefs_aprs_passcode_hint">Passcode empty = auto-computed from callsign</string>
|
||||
<string name="prefs_aprs_interval">Interval (min)</string>
|
||||
<string name="prefs_aprs_status">Status text</string>
|
||||
<string name="prefs_aprs_symbol_table">Symbol table</string>
|
||||
<string name="prefs_aprs_symbol_code">Symbol code</string>
|
||||
<string name="prefs_aprs_save">Save</string>
|
||||
<string name="prefs_aprs_cancel">Cancel</string>
|
||||
<string name="aprs_notif_channel">APRS service</string>
|
||||
<string name="aprs_notif_title">APRS: %1$s</string>
|
||||
<string name="aprs_notif_running">Reporting running</string>
|
||||
<string name="aprs_notif_connected">Connected to APRS-IS</string>
|
||||
<string name="aprs_notif_error">Connection error</string>
|
||||
<string name="aprs_notif_stop">Stop</string>
|
||||
<string name="prefs_aprs_calc_passcode">Compute passcode</string>
|
||||
<string name="aprs_toast_ok">APRS: report sent OK</string>
|
||||
<string name="aprs_toast_fail">APRS: report failed - %1$s</string>
|
||||
<string name="aprs_toast_not_configured">APRS not configured - set callsign first</string>
|
||||
<string name="prefs_aprs_last_report">Last report: %1$s %2$s</string>
|
||||
<string name="prefs_aprs_last_ok">OK</string>
|
||||
<string name="prefs_aprs_last_fail">failed - %1$s</string>
|
||||
<string name="nav_more">More</string>
|
||||
<string name="nav_log">Log</string>
|
||||
<string name="nav_amsat">AMSAT</string>
|
||||
<string name="amsat_title">AMSAT Satellite Status</string>
|
||||
<string name="amsat_updated">Updated:</string>
|
||||
<string name="amsat_active">Active</string>
|
||||
<string name="amsat_tlm">TLM/Beacon</string>
|
||||
<string name="amsat_not_heard">Not Heard</string>
|
||||
<string name="amsat_conflict">Conflicting</string>
|
||||
<string name="amsat_name">Name</string>
|
||||
<string name="amsat_load_failed">Load failed - check network and retry</string>
|
||||
<string name="amsat_no_reports">No reports for this period</string>
|
||||
<string name="amsat_close">Close</string>
|
||||
|
||||
<!-- Satellites screen -->
|
||||
<string name="sat_type_hint">Type: %s</string>
|
||||
@@ -56,8 +97,13 @@
|
||||
\n\nPlease update the database at least weekly to get accurate predictions.</string>
|
||||
<string name="pass_whatsnew_title" translatable="false">What\'s new in Look4Sat</string>
|
||||
<string name="pass_whatsnew_message" translatable="false">
|
||||
* WaveLog now supports both API v1 and v2 (auto-detected); error dialog with copy button
|
||||
* Log frequencies match the Doppler panel; linear transponders show the full range</string>
|
||||
* NEW: AMSAT satellite status page - live status grid (official colors), report counts, detailed reports per satellite/day
|
||||
* Log entries grouped by satellite pass (session ID = satellite + AOS time), divider lines between sessions
|
||||
* GPS now only reports success when a real fix is acquired (15s timeout, permission check)
|
||||
* Data update shows a clear failure message when the satellite database cannot be downloaded
|
||||
* Log frequencies follow the Doppler panel in real time; swipe-to-delete visuals restored
|
||||
* Indonesian locale fix (values-id)
|
||||
* NEW: APRS reporting (APRS-IS network, foreground service with notification, configurable interval)</string>
|
||||
|
||||
<!-- Radar screen -->
|
||||
<string name="radar_back">Back</string>
|
||||
|
||||
@@ -40,6 +40,7 @@ import androidx.compose.material3.ExposedDropdownMenuBox
|
||||
import androidx.compose.material3.ExposedDropdownMenuDefaults
|
||||
import androidx.compose.material3.MenuAnchorType
|
||||
import androidx.compose.material3.Icon
|
||||
import androidx.compose.material3.HorizontalDivider
|
||||
import androidx.compose.material3.MaterialTheme
|
||||
import androidx.compose.material3.OutlinedTextField
|
||||
import androidx.compose.material3.Text
|
||||
@@ -179,7 +180,19 @@ fun LogTab(
|
||||
modifier = Modifier.padding(vertical = 8.dp)
|
||||
)
|
||||
} else {
|
||||
entries.forEach { entry ->
|
||||
// 按场次分组(sessionId = 卫星名-AOS 时间戳), 组间粗线分隔
|
||||
entries.groupBy { it.sessionId.ifBlank { "un" } }.forEach { (sessionId, groupEntries) ->
|
||||
// 组标题 + 分隔线
|
||||
HorizontalDivider(thickness = 2.dp, color = MaterialTheme.colorScheme.primary)
|
||||
Text(
|
||||
text = if (sessionId == "un") stringResource(id = R.string.wavelog_ungrouped)
|
||||
else sessionId.substringBeforeLast('-'),
|
||||
fontSize = 11.sp,
|
||||
fontWeight = FontWeight.Bold,
|
||||
color = MaterialTheme.colorScheme.primary,
|
||||
modifier = Modifier.padding(horizontal = 10.dp, vertical = 4.dp)
|
||||
)
|
||||
groupEntries.forEach { entry ->
|
||||
SwipeDeleteRow(
|
||||
onDelete = {
|
||||
queue.remove(entry.id)
|
||||
@@ -216,6 +229,7 @@ fun LogTab(
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/** 转发器展开输入区: 实时频率 + 呼号(回车存本地) + 模式修正 */
|
||||
|
||||
@@ -5,3 +5,7 @@ plugins {
|
||||
android {
|
||||
namespace = "com.rtbishop.look4sat.feature.settings"
|
||||
}
|
||||
|
||||
dependencies {
|
||||
implementation(project(":core:data"))
|
||||
}
|
||||
@@ -0,0 +1,316 @@
|
||||
package com.rtbishop.look4sat.feature.settings
|
||||
|
||||
import android.content.Intent
|
||||
import android.content.pm.PackageManager
|
||||
import android.os.Build
|
||||
import androidx.compose.foundation.layout.Arrangement
|
||||
import androidx.compose.foundation.layout.Column
|
||||
import androidx.compose.foundation.layout.Row
|
||||
import androidx.compose.foundation.layout.fillMaxWidth
|
||||
import androidx.compose.foundation.layout.padding
|
||||
import androidx.compose.foundation.text.KeyboardOptions
|
||||
import androidx.compose.material3.AlertDialog
|
||||
import androidx.compose.material3.ElevatedCard
|
||||
import androidx.compose.material3.IconButton
|
||||
import androidx.compose.material3.LocalTextStyle
|
||||
import androidx.compose.material3.MaterialTheme
|
||||
import androidx.compose.material3.OutlinedTextField
|
||||
import androidx.compose.material3.Switch
|
||||
import androidx.compose.material3.Text
|
||||
import androidx.compose.material3.TextButton
|
||||
import androidx.compose.runtime.Composable
|
||||
import androidx.compose.runtime.getValue
|
||||
import androidx.compose.runtime.mutableStateOf
|
||||
import androidx.compose.runtime.remember
|
||||
import androidx.activity.compose.rememberLauncherForActivityResult
|
||||
import androidx.compose.runtime.setValue
|
||||
import androidx.activity.result.contract.ActivityResultContracts
|
||||
import androidx.compose.ui.Alignment
|
||||
import androidx.compose.ui.Modifier
|
||||
import androidx.compose.ui.platform.LocalContext
|
||||
import androidx.compose.ui.res.stringResource
|
||||
import androidx.compose.ui.text.input.KeyboardType
|
||||
import androidx.compose.ui.unit.dp
|
||||
import androidx.compose.ui.unit.sp
|
||||
import com.rtbishop.look4sat.core.data.aprs.AprsConfig
|
||||
import com.rtbishop.look4sat.core.domain.aprs.AprsPacket
|
||||
import com.rtbishop.look4sat.core.data.aprs.AprsStore
|
||||
import com.rtbishop.look4sat.core.presentation.CardButton
|
||||
import com.rtbishop.look4sat.core.presentation.R
|
||||
|
||||
/** APRS 卡片:卫星数据容器与数据输出容器之间;设置键弹窗收纳,不挤 */
|
||||
@Composable
|
||||
fun AprsCard() {
|
||||
val context = LocalContext.current
|
||||
var config by remember { mutableStateOf(AprsStore.loadConfig(context)) }
|
||||
var showDialog by remember { mutableStateOf(false) }
|
||||
var lastReport by remember { mutableStateOf(AprsStore.loadLastReport(context)) }
|
||||
var reportPing by remember { mutableStateOf(0) }
|
||||
val notifPermissionLauncher = rememberLauncherForActivityResult(
|
||||
ActivityResultContracts.RequestPermission()
|
||||
) { }
|
||||
fun requestNotifPermissionIfNeeded() {
|
||||
if (Build.VERSION.SDK_INT >= 33 &&
|
||||
context.checkSelfPermission(android.Manifest.permission.POST_NOTIFICATIONS) !=
|
||||
PackageManager.PERMISSION_GRANTED
|
||||
) {
|
||||
notifPermissionLauncher.launch(android.Manifest.permission.POST_NOTIFICATIONS)
|
||||
}
|
||||
}
|
||||
|
||||
ElevatedCard(modifier = Modifier.fillMaxWidth()) {
|
||||
Column(
|
||||
modifier = Modifier.padding(horizontal = 8.dp, vertical = 4.dp),
|
||||
verticalArrangement = Arrangement.spacedBy(4.dp)
|
||||
) {
|
||||
// 标题行:标题 + 设置键(弹窗,省空间)
|
||||
Row(
|
||||
modifier = Modifier.fillMaxWidth(),
|
||||
horizontalArrangement = Arrangement.SpaceBetween
|
||||
) {
|
||||
Text(
|
||||
text = stringResource(id = R.string.prefs_aprs_title),
|
||||
color = MaterialTheme.colorScheme.primary
|
||||
)
|
||||
IconButton(onClick = { showDialog = true }) {
|
||||
Text(
|
||||
text = "\u2699", // ⚙
|
||||
color = MaterialTheme.colorScheme.primary,
|
||||
fontSize = 18.sp
|
||||
)
|
||||
}
|
||||
}
|
||||
// 启用开关
|
||||
AprsSwitchRow(R.string.prefs_aprs_enable, config.enabled) { enabled ->
|
||||
config = config.copy(enabled = enabled)
|
||||
AprsStore.saveConfig(context, config)
|
||||
if (enabled) requestNotifPermissionIfNeeded()
|
||||
val intent = Intent()
|
||||
.setClassName(context.packageName, AprsStore.SERVICE_CLASS)
|
||||
.setAction(if (enabled) AprsStore.ACTION_START else AprsStore.ACTION_STOP)
|
||||
if (enabled) context.startForegroundService(intent) else context.startService(intent)
|
||||
}
|
||||
// 简洁信息行(不挤)
|
||||
Text(
|
||||
text = stringResource(
|
||||
id = R.string.prefs_aprs_summary,
|
||||
config.server, config.port,
|
||||
if (config.callsign.isBlank()) "-" else config.callsign
|
||||
),
|
||||
fontSize = 13.sp,
|
||||
color = MaterialTheme.colorScheme.onSurfaceVariant
|
||||
)
|
||||
// 上次上报状态行
|
||||
val lr = lastReport
|
||||
if (lr.time > 0L) {
|
||||
val timeStr = java.text.SimpleDateFormat("HH:mm:ss", java.util.Locale.getDefault())
|
||||
.format(java.util.Date(lr.time))
|
||||
Text(
|
||||
text = stringResource(
|
||||
id = R.string.prefs_aprs_last_report,
|
||||
timeStr,
|
||||
if (lr.ok) stringResource(R.string.prefs_aprs_last_ok)
|
||||
else stringResource(R.string.prefs_aprs_last_fail, lr.detail)
|
||||
),
|
||||
fontSize = 13.sp,
|
||||
color = if (lr.ok) MaterialTheme.colorScheme.primary
|
||||
else MaterialTheme.colorScheme.error
|
||||
)
|
||||
}
|
||||
// 手动上报按钮
|
||||
CardButton(
|
||||
onClick = {
|
||||
val intent = Intent()
|
||||
.setClassName(context.packageName, AprsStore.SERVICE_CLASS)
|
||||
.setAction(AprsStore.ACTION_REPORT_NOW)
|
||||
context.startForegroundService(intent)
|
||||
reportPing++
|
||||
},
|
||||
text = stringResource(id = R.string.prefs_aprs_report_now),
|
||||
modifier = Modifier.fillMaxWidth()
|
||||
)
|
||||
}
|
||||
}
|
||||
// 上报后延迟刷新状态行(等结果落盘)
|
||||
androidx.compose.runtime.LaunchedEffect(reportPing) {
|
||||
if (reportPing > 0) {
|
||||
kotlinx.coroutines.delay(6000)
|
||||
lastReport = AprsStore.loadLastReport(context)
|
||||
}
|
||||
}
|
||||
if (showDialog) {
|
||||
AprsSettingsDialog(
|
||||
config = config,
|
||||
onDismiss = { showDialog = false },
|
||||
onSave = { newConfig ->
|
||||
config = newConfig
|
||||
AprsStore.saveConfig(context, newConfig)
|
||||
// 已启用时应用新配置(重启服务)
|
||||
if (newConfig.enabled) {
|
||||
context.startService(
|
||||
Intent().setClassName(context.packageName, AprsStore.SERVICE_CLASS)
|
||||
.setAction(AprsStore.ACTION_STOP)
|
||||
)
|
||||
context.startForegroundService(
|
||||
Intent().setClassName(context.packageName, AprsStore.SERVICE_CLASS)
|
||||
.setAction(AprsStore.ACTION_START)
|
||||
)
|
||||
}
|
||||
showDialog = false
|
||||
}
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
/** APRS 设置弹窗(空间充裕,配置项齐全) */
|
||||
@Composable
|
||||
private fun AprsSettingsDialog(
|
||||
config: AprsConfig,
|
||||
onDismiss: () -> Unit,
|
||||
onSave: (AprsConfig) -> Unit
|
||||
) {
|
||||
var server by remember { mutableStateOf(config.server) }
|
||||
var port by remember { mutableStateOf(config.port.toString()) }
|
||||
var callsign by remember { mutableStateOf(config.callsign) }
|
||||
var ssid by remember { mutableStateOf(config.ssid) }
|
||||
var passcode by remember { mutableStateOf(config.passcode) }
|
||||
var interval by remember { mutableStateOf(config.intervalMin.toString()) }
|
||||
var status by remember { mutableStateOf(config.statusText) }
|
||||
var symbolTable by remember { mutableStateOf(config.symbolTable) }
|
||||
var symbolCode by remember { mutableStateOf(config.symbolCode) }
|
||||
val textStyle = LocalTextStyle.current.copy(fontSize = 14.sp)
|
||||
|
||||
AlertDialog(
|
||||
onDismissRequest = onDismiss,
|
||||
title = { Text(stringResource(id = R.string.prefs_aprs_settings_title)) },
|
||||
text = {
|
||||
Column(verticalArrangement = Arrangement.spacedBy(6.dp)) {
|
||||
OutlinedTextField(
|
||||
value = server,
|
||||
onValueChange = { server = it },
|
||||
label = { Text(stringResource(id = R.string.prefs_aprs_server)) },
|
||||
singleLine = true,
|
||||
textStyle = textStyle
|
||||
)
|
||||
OutlinedTextField(
|
||||
value = port,
|
||||
onValueChange = { port = it },
|
||||
label = { Text(stringResource(id = R.string.prefs_aprs_port)) },
|
||||
singleLine = true,
|
||||
keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Number),
|
||||
textStyle = textStyle
|
||||
)
|
||||
OutlinedTextField(
|
||||
value = callsign,
|
||||
onValueChange = { callsign = it },
|
||||
label = { Text(stringResource(id = R.string.prefs_aprs_callsign)) },
|
||||
singleLine = true,
|
||||
textStyle = textStyle
|
||||
)
|
||||
// 计算验证码按钮(用户要求:让用户算出结果)
|
||||
TextButton(
|
||||
onClick = {
|
||||
val call = callsign.trim().uppercase()
|
||||
if (call.isNotBlank()) {
|
||||
passcode = AprsPacket.passcode(call).toString()
|
||||
}
|
||||
},
|
||||
enabled = callsign.trim().isNotBlank()
|
||||
) { Text(stringResource(id = R.string.prefs_aprs_calc_passcode)) }
|
||||
Row(horizontalArrangement = Arrangement.spacedBy(8.dp)) {
|
||||
OutlinedTextField(
|
||||
value = ssid,
|
||||
onValueChange = { ssid = it },
|
||||
label = { Text(stringResource(id = R.string.prefs_aprs_ssid)) },
|
||||
singleLine = true,
|
||||
modifier = Modifier.weight(1f),
|
||||
textStyle = textStyle
|
||||
)
|
||||
OutlinedTextField(
|
||||
value = passcode,
|
||||
onValueChange = { passcode = it },
|
||||
label = { Text(stringResource(id = R.string.prefs_aprs_passcode)) },
|
||||
singleLine = true,
|
||||
modifier = Modifier.weight(1f),
|
||||
textStyle = textStyle
|
||||
)
|
||||
}
|
||||
Row(horizontalArrangement = Arrangement.spacedBy(8.dp)) {
|
||||
OutlinedTextField(
|
||||
value = interval,
|
||||
onValueChange = { interval = it },
|
||||
label = { Text(stringResource(id = R.string.prefs_aprs_interval)) },
|
||||
singleLine = true,
|
||||
modifier = Modifier.weight(1f),
|
||||
keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Number),
|
||||
textStyle = textStyle
|
||||
)
|
||||
OutlinedTextField(
|
||||
value = status,
|
||||
onValueChange = { status = it },
|
||||
label = { Text(stringResource(id = R.string.prefs_aprs_status)) },
|
||||
singleLine = true,
|
||||
modifier = Modifier.weight(1f),
|
||||
textStyle = textStyle
|
||||
)
|
||||
}
|
||||
Row(horizontalArrangement = Arrangement.spacedBy(8.dp)) {
|
||||
OutlinedTextField(
|
||||
value = symbolTable,
|
||||
onValueChange = { symbolTable = it },
|
||||
label = { Text(stringResource(id = R.string.prefs_aprs_symbol_table)) },
|
||||
singleLine = true,
|
||||
modifier = Modifier.weight(1f),
|
||||
textStyle = textStyle
|
||||
)
|
||||
OutlinedTextField(
|
||||
value = symbolCode,
|
||||
onValueChange = { symbolCode = it },
|
||||
label = { Text(stringResource(id = R.string.prefs_aprs_symbol_code)) },
|
||||
singleLine = true,
|
||||
modifier = Modifier.weight(1f),
|
||||
textStyle = textStyle
|
||||
)
|
||||
}
|
||||
Text(
|
||||
text = stringResource(id = R.string.prefs_aprs_passcode_hint),
|
||||
fontSize = 12.sp,
|
||||
color = MaterialTheme.colorScheme.onSurfaceVariant
|
||||
)
|
||||
}
|
||||
},
|
||||
confirmButton = {
|
||||
TextButton(onClick = {
|
||||
onSave(
|
||||
config.copy(
|
||||
server = server.ifBlank { "euro.aprs2.net" },
|
||||
port = port.toIntOrNull() ?: 14580,
|
||||
callsign = callsign.trim().uppercase(),
|
||||
ssid = ssid.trim(),
|
||||
passcode = passcode.trim(),
|
||||
intervalMin = interval.toIntOrNull() ?: 5,
|
||||
statusText = status,
|
||||
symbolTable = symbolTable.ifBlank { "/" },
|
||||
symbolCode = symbolCode.ifBlank { ">" }
|
||||
)
|
||||
)
|
||||
}) { Text(stringResource(id = R.string.prefs_aprs_save)) }
|
||||
},
|
||||
dismissButton = {
|
||||
TextButton(onClick = onDismiss) { Text(stringResource(id = R.string.prefs_aprs_cancel)) }
|
||||
}
|
||||
)
|
||||
}
|
||||
|
||||
/** 本文件内开关行(与 SettingsScreen 的私有 SwitchRow 一致) */
|
||||
@Composable
|
||||
private fun AprsSwitchRow(labelResId: Int, checked: Boolean, onCheckedChange: ((Boolean) -> Unit)?) {
|
||||
Row(
|
||||
horizontalArrangement = Arrangement.SpaceBetween,
|
||||
verticalAlignment = Alignment.CenterVertically,
|
||||
modifier = Modifier.fillMaxWidth()
|
||||
) {
|
||||
Text(text = stringResource(id = labelResId))
|
||||
Switch(checked = checked, onCheckedChange = onCheckedChange)
|
||||
}
|
||||
}
|
||||
+4
@@ -381,6 +381,9 @@ private fun SettingsScreen(uiState: SettingsState, onAction: (SettingsAction) ->
|
||||
showDataSourcesDialog = { dialogs.dataSources = true }
|
||||
)
|
||||
}
|
||||
item(span = { GridItemSpan(maxLineSpan) }) {
|
||||
AprsCard()
|
||||
}
|
||||
item(span = { GridItemSpan(maxLineSpan) }) {
|
||||
OutputCard(
|
||||
onNetworkClick = permissions.launchNetwork,
|
||||
@@ -705,6 +708,7 @@ private fun UiSettingsCard(
|
||||
R.string.nav_roaming to "Roaming",
|
||||
R.string.nav_cw to "CwDecode",
|
||||
R.string.nav_log to "WavelogLog",
|
||||
R.string.nav_amsat to "AMSAT",
|
||||
R.string.nav_map to "Map",
|
||||
R.string.nav_prefs to "Settings"
|
||||
) // name 必须与 Screen.screenId 一致 (R8 安全)
|
||||
|
||||
@@ -0,0 +1,17 @@
|
||||
import com.android.build.api.dsl.LibraryExtension
|
||||
|
||||
plugins {
|
||||
alias(libs.plugins.convention.featurePlugin)
|
||||
}
|
||||
|
||||
android {
|
||||
namespace = "com.rtbishop.look4sat.feature.status"
|
||||
compileOptions {
|
||||
encoding = "UTF-8"
|
||||
}
|
||||
}
|
||||
|
||||
dependencies {
|
||||
implementation(project(":core:domain"))
|
||||
implementation(project(":core:presentation"))
|
||||
}
|
||||
@@ -0,0 +1,343 @@
|
||||
package com.rtbishop.look4sat.feature.status
|
||||
|
||||
import androidx.compose.animation.core.RepeatMode
|
||||
import androidx.compose.animation.core.animateFloat
|
||||
import androidx.compose.animation.core.infiniteRepeatable
|
||||
import androidx.compose.animation.core.rememberInfiniteTransition
|
||||
import androidx.compose.animation.core.tween
|
||||
import androidx.compose.foundation.background
|
||||
import androidx.compose.foundation.clickable
|
||||
import androidx.compose.foundation.layout.Arrangement
|
||||
import androidx.compose.foundation.layout.Box
|
||||
import androidx.compose.foundation.layout.Column
|
||||
import androidx.compose.foundation.layout.Row
|
||||
import androidx.compose.foundation.layout.Spacer
|
||||
import androidx.compose.foundation.layout.fillMaxSize
|
||||
import androidx.compose.foundation.layout.fillMaxWidth
|
||||
import androidx.compose.foundation.layout.height
|
||||
import androidx.compose.foundation.layout.padding
|
||||
import androidx.compose.foundation.layout.size
|
||||
import androidx.compose.foundation.layout.width
|
||||
import androidx.compose.foundation.lazy.LazyColumn
|
||||
import androidx.compose.foundation.lazy.items
|
||||
import androidx.compose.foundation.shape.CircleShape
|
||||
import androidx.compose.foundation.shape.RoundedCornerShape
|
||||
import androidx.compose.material3.AlertDialog
|
||||
import androidx.compose.material3.CircularProgressIndicator
|
||||
import androidx.compose.material3.HorizontalDivider
|
||||
import androidx.compose.material3.MaterialTheme
|
||||
import androidx.compose.material3.Text
|
||||
import androidx.compose.material3.TextButton
|
||||
import androidx.compose.runtime.Composable
|
||||
import androidx.compose.runtime.getValue
|
||||
import androidx.compose.runtime.mutableStateOf
|
||||
import androidx.compose.runtime.remember
|
||||
import androidx.compose.runtime.setValue
|
||||
import androidx.compose.ui.Alignment
|
||||
import androidx.compose.ui.Modifier
|
||||
import androidx.compose.ui.draw.clip
|
||||
import androidx.compose.ui.draw.rotate
|
||||
import androidx.compose.ui.graphics.Color
|
||||
import androidx.compose.ui.res.stringResource
|
||||
import androidx.compose.ui.text.font.FontWeight
|
||||
import androidx.compose.ui.text.style.TextAlign
|
||||
import androidx.compose.ui.unit.dp
|
||||
import androidx.compose.ui.unit.sp
|
||||
import androidx.lifecycle.compose.collectAsStateWithLifecycle
|
||||
import androidx.lifecycle.viewmodel.initializer
|
||||
import androidx.lifecycle.viewmodel.compose.viewModel
|
||||
import androidx.lifecycle.viewmodel.viewModelFactory
|
||||
import com.rtbishop.look4sat.core.domain.model.SatDay
|
||||
import com.rtbishop.look4sat.core.domain.model.SatReport
|
||||
import com.rtbishop.look4sat.core.domain.model.SatSlot
|
||||
import com.rtbishop.look4sat.core.domain.model.SatStatus
|
||||
import com.rtbishop.look4sat.core.domain.repository.IMainContainer
|
||||
import com.rtbishop.look4sat.core.presentation.R
|
||||
import java.util.Calendar
|
||||
|
||||
// ========== 官网状态色(amsat.org/status 原色) ==========
|
||||
val ActiveBlue = Color(0xFF648FFF)
|
||||
val TlmOrange = Color(0xFFFFB000)
|
||||
val NotHeardPink = Color(0xFFDC267F)
|
||||
val ConflictDeepOrange = Color(0xFFFE6100)
|
||||
val NoReportGray = Color(0xFFC0C0C0)
|
||||
|
||||
@Composable
|
||||
fun SatStatusScreen(container: IMainContainer) {
|
||||
val viewModel: SatStatusViewModel = viewModel(
|
||||
factory = viewModelFactory {
|
||||
initializer { SatStatusViewModel(container) }
|
||||
}
|
||||
)
|
||||
val uiState by viewModel.uiState.collectAsStateWithLifecycle()
|
||||
var selectedDay by remember { mutableStateOf<Pair<SatStatus, SatDay>?>(null) }
|
||||
|
||||
Column(modifier = Modifier.fillMaxSize().padding(horizontal = 8.dp)) {
|
||||
// 顶部: 图例 + 刷新
|
||||
StatusHeader(
|
||||
fetchedAtUtcMs = uiState.fetchedAtUtcMs,
|
||||
isRefreshing = uiState.isRefreshing,
|
||||
onRefresh = { viewModel.refresh() }
|
||||
)
|
||||
LegendRow()
|
||||
|
||||
when {
|
||||
uiState.isLoading -> {
|
||||
Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.Center) {
|
||||
CircularProgressIndicator()
|
||||
}
|
||||
}
|
||||
uiState.error != null && uiState.statuses.isEmpty() -> {
|
||||
Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.Center) {
|
||||
Text(
|
||||
text = stringResource(id = R.string.amsat_load_failed),
|
||||
color = MaterialTheme.colorScheme.error
|
||||
)
|
||||
}
|
||||
}
|
||||
else -> {
|
||||
// 表头
|
||||
HeaderRow(statuses = uiState.statuses)
|
||||
HorizontalDivider(thickness = 1.dp)
|
||||
// 行
|
||||
LazyColumn(modifier = Modifier.fillMaxSize()) {
|
||||
items(uiState.statuses, key = { it.name }) { status ->
|
||||
StatusRow(
|
||||
status = status,
|
||||
onClickDay = { day -> selectedDay = status to day }
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
selectedDay?.let { (status, day) ->
|
||||
ReportDialog(
|
||||
statusName = status.name,
|
||||
day = day,
|
||||
reports = uiState.reports,
|
||||
onDismiss = { selectedDay = null }
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
/** 顶部: 更新时间 + 刷新按钮(加载中旋转动画) */
|
||||
@Composable
|
||||
private fun StatusHeader(
|
||||
fetchedAtUtcMs: Long,
|
||||
isRefreshing: Boolean,
|
||||
onRefresh: () -> Unit
|
||||
) {
|
||||
val infiniteTransition = rememberInfiniteTransition(label = "refresh")
|
||||
val angle by infiniteTransition.animateFloat(
|
||||
initialValue = 0f,
|
||||
targetValue = 360f,
|
||||
animationSpec = infiniteRepeatable(tween(800), RepeatMode.Restart),
|
||||
label = "angle"
|
||||
)
|
||||
Row(
|
||||
modifier = Modifier.fillMaxWidth().padding(vertical = 6.dp),
|
||||
verticalAlignment = Alignment.CenterVertically
|
||||
) {
|
||||
Text(
|
||||
text = if (fetchedAtUtcMs > 0) stringResource(id = R.string.amsat_updated) + " " + formatFetchedAt(fetchedAtUtcMs) else stringResource(id = R.string.amsat_title),
|
||||
fontSize = 13.sp,
|
||||
color = MaterialTheme.colorScheme.onSurfaceVariant,
|
||||
modifier = Modifier.weight(1f)
|
||||
)
|
||||
Box(
|
||||
modifier = Modifier
|
||||
.size(34.dp)
|
||||
.clip(CircleShape)
|
||||
.background(MaterialTheme.colorScheme.surfaceVariant)
|
||||
.clickable(onClick = onRefresh),
|
||||
contentAlignment = Alignment.Center
|
||||
) {
|
||||
if (isRefreshing) {
|
||||
CircularProgressIndicator(modifier = Modifier.size(18.dp), strokeWidth = 2.dp)
|
||||
} else {
|
||||
Text(
|
||||
text = "↻",
|
||||
fontSize = 20.sp,
|
||||
color = MaterialTheme.colorScheme.primary,
|
||||
modifier = Modifier.rotate(angle)
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/** 图例(官网四色) */
|
||||
@Composable
|
||||
private fun LegendRow() {
|
||||
val legend = listOf(
|
||||
stringResource(id = R.string.amsat_active) to ActiveBlue,
|
||||
stringResource(id = R.string.amsat_tlm) to TlmOrange,
|
||||
stringResource(id = R.string.amsat_not_heard) to NotHeardPink,
|
||||
stringResource(id = R.string.amsat_conflict) to ConflictDeepOrange
|
||||
)
|
||||
Row(
|
||||
modifier = Modifier.fillMaxWidth().padding(vertical = 2.dp),
|
||||
horizontalArrangement = Arrangement.spacedBy(8.dp)
|
||||
) {
|
||||
legend.forEach { (label, color) ->
|
||||
Row(verticalAlignment = Alignment.CenterVertically) {
|
||||
Box(
|
||||
modifier = Modifier
|
||||
.size(10.dp)
|
||||
.clip(RoundedCornerShape(2.dp))
|
||||
.background(color)
|
||||
)
|
||||
Spacer(modifier = Modifier.width(3.dp))
|
||||
Text(text = label, fontSize = 10.sp, color = MaterialTheme.colorScheme.onSurfaceVariant)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/** 表头: 卫星名 + 6 天日期 */
|
||||
@Composable
|
||||
private fun HeaderRow(statuses: List<SatStatus>) {
|
||||
val dates = statuses.firstOrNull()?.days?.map { it.dateLabel } ?: emptyList()
|
||||
Row(
|
||||
modifier = Modifier.fillMaxWidth().padding(vertical = 4.dp),
|
||||
verticalAlignment = Alignment.CenterVertically
|
||||
) {
|
||||
Text(
|
||||
text = stringResource(id = R.string.amsat_name),
|
||||
fontSize = 11.sp,
|
||||
fontWeight = FontWeight.Bold,
|
||||
color = MaterialTheme.colorScheme.primary,
|
||||
modifier = Modifier.weight(2f).padding(start = 4.dp)
|
||||
)
|
||||
dates.forEach { date ->
|
||||
Text(
|
||||
text = date,
|
||||
fontSize = 10.sp,
|
||||
fontWeight = FontWeight.Bold,
|
||||
textAlign = TextAlign.Center,
|
||||
color = MaterialTheme.colorScheme.primary,
|
||||
modifier = Modifier.weight(0.8f)
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/** 卫星行: 名称 + 6 天色块(官网色 + 报告数) */
|
||||
@Composable
|
||||
private fun StatusRow(status: SatStatus, onClickDay: (SatDay) -> Unit) {
|
||||
Row(
|
||||
modifier = Modifier
|
||||
.fillMaxWidth()
|
||||
.padding(vertical = 3.dp),
|
||||
verticalAlignment = Alignment.CenterVertically
|
||||
) {
|
||||
Text(
|
||||
text = status.name,
|
||||
fontSize = 11.sp,
|
||||
maxLines = 1,
|
||||
overflow = androidx.compose.ui.text.style.TextOverflow.Ellipsis,
|
||||
modifier = Modifier.weight(2f).padding(start = 4.dp)
|
||||
)
|
||||
status.days.forEach { day ->
|
||||
val slot = day.slots.firstOrNull { it.statusColor != NoReportGray.value.toInt().toLong() } ?: day.slots.first()
|
||||
DayCell(
|
||||
slot = slot,
|
||||
modifier = Modifier.weight(0.8f).padding(horizontal = 1.dp),
|
||||
onClick = { onClickDay(day) }
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/** 单天色块: 取当天 12 槽中最新的有报告状态; 无报告则灰 */
|
||||
@Composable
|
||||
private fun DayCell(slot: SatSlot, modifier: Modifier, onClick: () -> Unit) {
|
||||
val color = Color(slot.statusColor)
|
||||
Box(
|
||||
modifier = modifier
|
||||
.height(24.dp)
|
||||
.clip(RoundedCornerShape(4.dp))
|
||||
.background(color)
|
||||
.clickable(onClick = onClick),
|
||||
contentAlignment = Alignment.Center
|
||||
) {
|
||||
if (slot.count > 0) {
|
||||
Text(
|
||||
text = slot.count.toString(),
|
||||
fontSize = 11.sp,
|
||||
fontWeight = FontWeight.Bold,
|
||||
color = Color.White
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/** 报告详情弹窗(3 级: 呼号/日期/时间/网格) */
|
||||
@Composable
|
||||
private fun ReportDialog(
|
||||
statusName: String,
|
||||
day: SatDay,
|
||||
reports: Map<String, SatReport>,
|
||||
onDismiss: () -> Unit
|
||||
) {
|
||||
val dayReports = day.slots.flatMap { it.reportIds }
|
||||
.mapNotNull { reports[it] }
|
||||
AlertDialog(
|
||||
onDismissRequest = onDismiss,
|
||||
title = { Text(text = "$statusName · ${day.dateLabel}") },
|
||||
text = {
|
||||
if (dayReports.isEmpty()) {
|
||||
Text(stringResource(id = R.string.amsat_no_reports))
|
||||
} else {
|
||||
LazyColumn(modifier = Modifier.height(320.dp)) {
|
||||
items(dayReports) { report ->
|
||||
Column(modifier = Modifier.fillMaxWidth().padding(vertical = 4.dp)) {
|
||||
Row(verticalAlignment = Alignment.CenterVertically) {
|
||||
Box(
|
||||
modifier = Modifier
|
||||
.size(8.dp)
|
||||
.clip(CircleShape)
|
||||
.background(statusColorOf(report.statusText))
|
||||
)
|
||||
Spacer(modifier = Modifier.width(6.dp))
|
||||
Text(
|
||||
text = report.statusText,
|
||||
fontSize = 13.sp,
|
||||
fontWeight = FontWeight.Bold
|
||||
)
|
||||
}
|
||||
Text(
|
||||
text = "${report.call} ${report.dateUtc} ${report.timeUtc}" +
|
||||
if (report.grid.isNotBlank() && report.grid != "-") " ${report.grid}" else "",
|
||||
fontSize = 12.sp,
|
||||
color = MaterialTheme.colorScheme.onSurfaceVariant
|
||||
)
|
||||
}
|
||||
HorizontalDivider(thickness = 0.5.dp)
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
confirmButton = {
|
||||
TextButton(onClick = onDismiss) { Text(stringResource(id = R.string.amsat_close)) }
|
||||
}
|
||||
)
|
||||
}
|
||||
|
||||
private fun statusColorOf(statusText: String): Color = when {
|
||||
statusText.contains("Heard", ignoreCase = true) && !statusText.contains("Not", ignoreCase = true) -> ActiveBlue
|
||||
statusText.contains("Telemetry", ignoreCase = true) || statusText.contains("Beacon", ignoreCase = true) -> TlmOrange
|
||||
statusText.contains("Not Heard", ignoreCase = true) -> NotHeardPink
|
||||
else -> ConflictDeepOrange
|
||||
}
|
||||
|
||||
private fun formatFetchedAt(utcMs: Long): String {
|
||||
val cal = Calendar.getInstance()
|
||||
cal.timeInMillis = utcMs
|
||||
return "%02d-%02d %02d:%02d".format(
|
||||
cal.get(Calendar.MONTH) + 1, cal.get(Calendar.DAY_OF_MONTH),
|
||||
cal.get(Calendar.HOUR_OF_DAY), cal.get(Calendar.MINUTE)
|
||||
)
|
||||
}
|
||||
+84
@@ -0,0 +1,84 @@
|
||||
package com.rtbishop.look4sat.feature.status
|
||||
|
||||
import androidx.lifecycle.ViewModel
|
||||
import androidx.lifecycle.viewModelScope
|
||||
import com.rtbishop.look4sat.core.domain.model.SatReport
|
||||
import com.rtbishop.look4sat.core.domain.model.SatStatus
|
||||
import com.rtbishop.look4sat.core.domain.repository.IMainContainer
|
||||
import kotlinx.coroutines.flow.MutableStateFlow
|
||||
import kotlinx.coroutines.flow.StateFlow
|
||||
import kotlinx.coroutines.flow.update
|
||||
import kotlinx.coroutines.launch
|
||||
|
||||
data class SatStatusUiState(
|
||||
val isLoading: Boolean = false,
|
||||
val isRefreshing: Boolean = false,
|
||||
val statuses: List<SatStatus> = emptyList(),
|
||||
val reports: Map<String, SatReport> = emptyMap(),
|
||||
val fetchedAtUtcMs: Long = 0L,
|
||||
val error: String? = null
|
||||
)
|
||||
|
||||
class SatStatusViewModel(
|
||||
private val container: IMainContainer
|
||||
) : ViewModel() {
|
||||
|
||||
private val _uiState = MutableStateFlow(SatStatusUiState(isLoading = true))
|
||||
val uiState: StateFlow<SatStatusUiState> = _uiState
|
||||
|
||||
init {
|
||||
fetch()
|
||||
}
|
||||
|
||||
fun fetch() {
|
||||
viewModelScope.launch {
|
||||
_uiState.update { it.copy(isLoading = true, error = null) }
|
||||
try {
|
||||
val page = container.amSatRepo.fetchStatus()
|
||||
if (page != null && page.statuses.isNotEmpty()) {
|
||||
_uiState.update {
|
||||
it.copy(
|
||||
isLoading = false,
|
||||
isRefreshing = false,
|
||||
statuses = page.statuses,
|
||||
reports = page.reports,
|
||||
fetchedAtUtcMs = page.fetchedAtUtcMs
|
||||
)
|
||||
}
|
||||
} else {
|
||||
_uiState.update {
|
||||
it.copy(isLoading = false, isRefreshing = false, error = "fetch_failed")
|
||||
}
|
||||
}
|
||||
} catch (exception: Exception) {
|
||||
_uiState.update {
|
||||
it.copy(isLoading = false, isRefreshing = false, error = exception.message ?: "fetch_failed")
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fun refresh() {
|
||||
if (_uiState.value.isRefreshing) return
|
||||
_uiState.update { it.copy(isRefreshing = true, error = null) }
|
||||
viewModelScope.launch {
|
||||
try {
|
||||
val page = container.amSatRepo.fetchStatus()
|
||||
if (page != null && page.statuses.isNotEmpty()) {
|
||||
_uiState.update {
|
||||
it.copy(
|
||||
isRefreshing = false,
|
||||
statuses = page.statuses,
|
||||
reports = page.reports,
|
||||
fetchedAtUtcMs = page.fetchedAtUtcMs
|
||||
)
|
||||
}
|
||||
} else {
|
||||
_uiState.update { it.copy(isRefreshing = false, error = "fetch_failed") }
|
||||
}
|
||||
} catch (exception: Exception) {
|
||||
_uiState.update { it.copy(isRefreshing = false, error = exception.message ?: "fetch_failed") }
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,8 +1,8 @@
|
||||
[versions]
|
||||
#noinspection UnusedVersionCatalogEntry
|
||||
appVersionCode = "452"
|
||||
appVersionCode = "454"
|
||||
#noinspection UnusedVersionCatalogEntry
|
||||
appVersionName = "4.5.2"
|
||||
appVersionName = "4.5.4"
|
||||
#noinspection UnusedVersionCatalogEntry
|
||||
compileSdk = "37"
|
||||
#noinspection UnusedVersionCatalogEntry
|
||||
|
||||
+2
-1
@@ -28,5 +28,6 @@ include(
|
||||
":feature:radar",
|
||||
":feature:roaming",
|
||||
":feature:satellites",
|
||||
":feature:settings"
|
||||
":feature:settings",
|
||||
":feature:status"
|
||||
)
|
||||
Reference in new issue
Block a user