feat(status): 4.5.3 AMSAT satellite status page + radar log pass divider

New feature/status module: fetches https://amsat.org/status/ and renders a live status grid in the official site colors: - Parser (AmSatParser): 47 satellites x 6 days x 12 two-hour slots, official colors (blue=Active, orange=TLM/Beacon, pink=Not Heard, deep-orange=Conflicting, gray=none); 598+ report details extracted from inline JS tooltips (callsign/date/time/grid) - Three-level viz: color grid -> report count -> tap day cell opens report list dialog - Manual refresh with spin animation + last-updated timestamp + legend row; loading/error states - New "AMSAT" entry in the More menu (Screen.AmSat), integrated with page-order / hide-page settings (SettingsScreen screens list, defaultSubMenuOrder, allNavItems, migration for existing users) - AmSatRepository via IRemoteSource.getStatusHtml() (UA header); shared remoteSource promoted to a lazy class property in MainContainer Radar page Log tab: local entries now grouped by pass session with a thick divider + satellite label between groups (matches the log page). What's new updated in EN/ZH/TR/IN/ID. Version bumped to 4.5.3/453. Not released (user gates all releases).
2026-10-02 03:15:37 +00:00 · 2026-08-04 15:57:41 +00:00
1 parent dd378990fe
commit f7402a3531
@@ -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)
                            }
@@ -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)
@@ -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,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 → 报告
+)
@@ -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?
+}
@@ -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?
 }
@@ -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
@@ -14,6 +14,18 @@
    <string name="nav_prefs">Pengaturan</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>
@@ -48,9 +60,13 @@
        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_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)</string>
    <string name="radar_back">Kembali</string>
    <string name="radar_notify">Beri tahu</string>
    <string name="radar_az_text">Azimuth</string>
@@ -14,6 +14,17 @@
    <string name="nav_prefs">Pengaturan</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>
@@ -48,9 +59,13 @@
        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_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)</string>
    <string name="radar_back">Kembali</string>
    <string name="radar_notify">Beri tahu</string>
    <string name="radar_az_text">Azimuth</string>
@@ -15,6 +15,17 @@
    <string name="nav_prefs">Ayarlar</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 +65,12 @@
        \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)</string>

    <!-- Radar screen -->
    <string name="radar_back">Geri</string>
@@ -16,6 +16,17 @@
    <string name="nav_prefs">设置</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 +55,12 @@
    <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)</string>

    <!-- Radar screen -->
    <string name="radar_back">后退</string>
@@ -17,6 +17,17 @@
    <string name="nav_prefs">Settings</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 +67,12 @@
        \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)</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)
@@ -213,6 +226,7 @@ fun LogTab(
                        )
                    }
                }
+                }
            }
        }
    }
@@ -705,6 +705,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(1.4f).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(1f)
+            )
+        }
+    }
+}
+
+/** 卫星行: 名称 + 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(1.4f).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(1f).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(26.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)
+    )
+}
@@ -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 = "453"
 #noinspection UnusedVersionCatalogEntry
-appVersionName = "4.5.2"
+appVersionName = "4.5.3"
 #noinspection UnusedVersionCatalogEntry
 compileSdk = "37"
 #noinspection UnusedVersionCatalogEntry
@@ -28,5 +28,6 @@ include(
    ":feature:radar",
    ":feature:roaming",
    ":feature:satellites",
-    ":feature:settings"
+    ":feature:settings",
+    ":feature:status"
 )