build: release version 4.4.8-ba7opf.11.6 (581)

feat(satellites): AMSAT Live FM 组补 RS95S 与 UNNE-1B
Sources.amSatFmCatnums 加两颗：RS95S / QMR-KWT-2 (67291)、UNNE-1B (98205)。两星在 SatNOGS 都有 V/U FM 转发器（"V/U FM Transponder CTCSS 67.0 Hz" 145.920/436.950，与 "Mode V/U - FM Repeater (Voice + (A)FSK)"），因此归入卫星页「AMSAT Live FM」虚拟类型筛选。该集合是三处共用的一份口径：卫星页与互通页的 FM 筛选、以及雷达页 Log（FM 星按名义 voice repeater 频率对记账，两颗星都有该行，不会回落到算器/所选频点）。 98205 是 SatNOGS 的分析编号（国际编号 26227BL，T-18 由 OTV OSSIE 释放）， Space-Track 正式编目后会换号，届时需回改这一条；已在 KDoc 标注，ephem-watch cron（6b1544af4470）会盯到编号变化。测试：SelectionRepoSearchTest 新增一例，断言 FM 虚拟类型命中 67291 与 98205 （全量 ./gradlew test 通过）。
2026-10-09 22:07:23 +00:00 · 2026-10-09 01:54:56 +08:00 · 2026-10-09 01:47:52 +08:00 · 2026-10-08 12:36:40 +08:00 · 2026-10-08 12:36:35 +08:00 · 2026-10-08 02:27:47 +08:00
23 changed files with 265 additions and 29 deletions
@@ -36,7 +36,7 @@ import java.util.Locale
 import java.util.zip.GZIPInputStream
 import javax.xml.parsers.DocumentBuilderFactory

-/** Bundled ARRL configuration 11.34 from https://lotw.arrl.org/lotw/config.tq6. */
+/** Bundled ARRL configuration 11.35 from https://lotw.arrl.org/lotw/config.tq6. */
 internal class LoTWConfig(input: InputStream) {
    private val root = input.use { source -> GZIPInputStream(source).use { gzip ->
        val xml = gzip.bufferedReader(Charsets.UTF_8).readText()
@@ -66,8 +66,17 @@ class SelectionRepo(
        }
    }

+    // Selected satellites are pinned to the top (matches upstream); ordering
+    // within each group stays name/catnum. Sits on the reactive chain, so
+    // ticking an entry re-sorts the visible list immediately.
    private val itemsWithQuery = currentQuery.flatMapLatest { query ->
-        itemsWithTypes.map { items -> filterByQuery(items, query) }
+        itemsWithTypes.map { items ->
+            filterByQuery(items, query).sortedWith(
+                compareByDescending<SatItem> { it.isSelected }
+                    .thenBy { it.name }
+                    .thenBy { it.catnum }
+            )
+        }
    }

    override fun getCurrentTypes() = currentTypes.value
@@ -87,6 +87,7 @@ class LoTWConfigTest {
        assertEquals("AO-91", config.resolveSatellite("FOX-1B"))
        assertEquals("IO-86", config.resolveSatellite("LAPAN-A2"))
        assertEquals("RS-44", config.resolveSatellite("DOSAAF-85"))
+        assertEquals("RS95S", config.resolveSatellite("QMR-KWT 2"))
        assertEquals("BO-102", config.resolveSatellite("CAS-7B"))
        assertEquals("SO-50", config.resolveSatellite("SO-50"))
    }
@@ -124,6 +124,22 @@ class SelectionRepoSearchTest {
        assertEquals(setOf(25544, 61781), results.map { it.catnum }.toSet())
    }

+    @Test
+    fun `FM virtual type includes the BA7OPF RS95S and UNNE-1B additions`() = runTest {
+        // RS95S / QMR-KWT-2 (67291) and UNNE-1B (98205) joined the hardcoded
+        // AMSAT Live FM set on 2026-10-09; both carry a V/U FM repeater in
+        // SatNOGS ("V/U FM Transponder CTCSS 67.0 Hz" / "Mode V/U - FM Repeater
+        // (Voice + (A)FSK)"). sampleItems contributes ISS (25544) only.
+        val items = sampleItems + listOf(
+            SatItem(catnum = 67291, name = "QMR-KWT-2 (RS95S)"),
+            SatItem(catnum = 98205, name = "UNNE-1B")
+        )
+        val repo = createRepo(items)
+        repo.setTypes(listOf("AMSAT Live FM"))
+        val results = repo.getEntriesFlow().first()
+        assertEquals(setOf(25544, 67291, 98205), results.map { it.catnum }.toSet())
+    }
+
    @Test
    fun `Linear virtual type shows only hardcoded linear satellites`() = runTest {
        val repo = createRepo(sampleItems)
@@ -284,6 +300,24 @@ class SelectionRepoSearchTest {
        assertEquals(sampleItems.map { it.catnum }.toSet(), results.map { it.catnum }.toSet())
    }

+    @Test
+    fun `selected satellites are shown first`() = runTest {
+        // Pinning ported from upstream: ticked satellites sort above the rest,
+        // each group keeping the name order.
+        val repo = createRepo(
+            items = listOf(
+                SatItem(catnum = 44444, name = "Zeta"),
+                SatItem(catnum = 25544, name = "Alpha"),
+                SatItem(catnum = 40967, name = "Beta")
+            )
+        )
+        val flow = repo.getEntriesFlow()
+        repo.setSelection(listOf(40967), true)
+        val results = flow.first()
+        assertEquals(listOf(40967, 25544, 44444), results.map { it.catnum })
+        assertEquals(listOf(true, false, false), results.map { it.isSelected })
+    }
+
    private fun createRepo(
        items: List<SatItem>,
        sstvIds: List<Int> = emptyList()
@@ -14,9 +14,15 @@ import java.util.Date
 import java.util.Locale
 import java.util.TimeZone

-/** Small ADI codec for the logbook's actual field set (ADIF 3.1.7). */
+/**
+ * Small ADI codec for the logbook's actual field set (ADIF 3.1.7).
+ *
+ * Grid directions follow ADIF: the un-prefixed fields (GRIDSQUARE, VUCC_GRIDS) belong to
+ * the OPPOSITE station, the MY_* fields (MY_GRIDSQUARE, MY_VUCC_GRIDS) to the operator.
+ */
 object AdifCodec {
    private val utc = TimeZone.getTimeZone("UTC")
+    private val gridPattern = Regex("[A-R]{2}[0-9]{2}([A-X]{2}([0-9]{2})?)?")

    fun encode(records: List<QsoRecord>, includeStationCallsign: Boolean = true): String = buildString {
        append(field("ADIF_VER", "3.1.7"))
@@ -36,7 +42,17 @@ object AdifCodec {
            appendOptional("MODE", record.mode)
            appendOptional("SUBMODE", record.submode)
            appendOptional("GRIDSQUARE", record.theirGrid)
+            // The OPPOSITE station's multi-grid set (2+ grids: a grid line or corner).
+            // A single grid is carried by GRIDSQUARE; one value inside the VUCC field
+            // makes Wavelog flag the record in its QSO view.
+            if (record.theirVuccGrids.size > 1) {
+                appendOptional("VUCC_GRIDS", record.theirVuccGrids.joinToString(","))
+            }
            appendOptional("MY_GRIDSQUARE", record.myGrid)
+            // The grid set this qso went out under (own operated grids, stamped at
+            // upload). ADIF's MY_VUCC_GRIDS is its home — not VUCC_GRIDS, which belongs
+            // to the opposite station and drives Wavelog's grid/distance/QRB display.
+            appendOptional("MY_VUCC_GRIDS", record.vuccGrids.joinToString(","))
            appendOptional("RST_SENT", record.sentReport)
            appendOptional("RST_RCVD", record.receivedReport)
            record.txFrequencyHz?.let { append(field("FREQ", hzToMhz(it))) }
@@ -49,7 +65,6 @@ object AdifCodec {
            if (record.lotwConfirmed) append(field("LOTW_QSL_RCVD", "Y"))
            if (record.lotwReceived) append(field("LOTW_QSL_SENT", "Y"))
            appendOptional("LOTW_QSLRDATE", record.lotwQslDate)
-            appendOptional("VUCC_GRIDS", record.vuccGrids.joinToString(","))
            record.dxcc?.let { append(field("DXCC", it.toString())) }
            appendOptional("COUNTRY", record.country)
            record.cqZone?.let { append(field("CQZ", it.toString())) }
@@ -80,7 +95,9 @@ object AdifCodec {
            theirCallsign = call,
            myCallsign = values["STATION_CALLSIGN"].orEmpty().uppercase(Locale.US),
            theirGrid = values["GRIDSQUARE"].orEmpty().uppercase(Locale.US),
+            theirVuccGrids = decodeGrids(values["VUCC_GRIDS"]),
            myGrid = values["MY_GRIDSQUARE"].orEmpty().uppercase(Locale.US),
+            vuccGrids = decodeGrids(values["MY_VUCC_GRIDS"]),
            sentReport = values["RST_SENT"].orEmpty(),
            receivedReport = values["RST_RCVD"].orEmpty(),
            txFrequencyHz = mhzToHz(values["FREQ"]),
@@ -100,8 +117,6 @@ object AdifCodec {
            lotwConfirmed = values["LOTW_QSL_RCVD"].equals("Y", true),
            lotwReceived = values["LOTW_QSL_SENT"].equals("Y", true),
            lotwQslDate = values["LOTW_QSLRDATE"].orEmpty(),
-            vuccGrids = values["VUCC_GRIDS"].orEmpty().split(',').map { it.trim().uppercase(Locale.US) }
-                .filter { it.matches(Regex("[A-R]{2}[0-9]{2}([A-X]{2}([0-9]{2})?)?")) }.distinct(),
            dxcc = values["DXCC"]?.toIntOrNull(),
            country = values["COUNTRY"].orEmpty(),
            cqZone = values["CQZ"]?.toIntOrNull()?.takeIf { it in 1..40 },
@@ -140,6 +155,12 @@ object AdifCodec {
        return records
    }

+    /** Splits an ADIF grid list on commas, keeping only valid 4/6/8-char locators. */
+    private fun decodeGrids(value: String?): List<String> = value.orEmpty().split(',')
+        .map { it.trim().uppercase(Locale.US) }
+        .filter { it.matches(gridPattern) }
+        .distinct()
+
    private fun StringBuilder.appendOptional(name: String, value: String) {
        if (value.isNotBlank()) append(field(name, value))
    }
@@ -34,6 +34,8 @@ import java.util.Locale
 *  - live SatNOGS 3LE names and Celestrak amateur names joined to the same NORAD id,
 *  - designator tokens of the config.tq6 satellite descriptions (e.g. CAS-7B -> BO-102),
 *  - the ISS family, which SatNOGS does not list under its ARRL name "ARISS".
+ * Added 2026-10-08: config.tq6 v11.35 lists QMR-KWT 2 as "RS95S"; SatNOGS DB carries it as
+ * "QMR-KWT 2" (alias "RS95S") and other sources spell it "RS-95S", hence the identity entry.
 * Placeholder names ("OBJECT AY" and friends) are deliberately NOT mapped: they are recycled
 * between objects and would sign the wrong satellite. LoTWConfigTest asserts that every target
 * here is a real config.tq6 name.
@@ -79,11 +81,11 @@ object LoTWSatelliteAliases {
        "OSCAR16PACSAT" to "AO-16", "OSCAR19LUSAT" to "LO-19", "OSCAR64" to "DO-64",
        "OSCAR7" to "AO-7", "PACSAT" to "AO-16", "PARKINSONSAT" to "NO-84",
        "PCSAT" to "NO-44", "PHILLIPINESOSCAR101" to "PO-101", "PO101" to "PO-101",
-        "PSAT" to "NO-84", "PSAT2" to "NO-104", "QB50P1" to "EO-79",
+        "PSAT" to "NO-84", "PSAT2" to "NO-104", "QB50P1" to "EO-79", "QMRKWT2" to "RS95S",
        "QO100" to "QO-100", "RADFXSAT" to "AO-91", "RADIOROSTO" to "RS-15",
        "RS0ISS" to "ARISS", "RS14" to "AO-21", "RS15" to "RS-15",
-        "RS44" to "RS-44", "RS64S" to "AO-123", "SAUDISAT1C" to "SO-50",
-        "SO121" to "SO-121", "SO124" to "SO-124", "SO125" to "SO-125",
+        "RS44" to "RS-44", "RS64S" to "AO-123", "RS95S" to "RS95S",
+        "SAUDISAT1C" to "SO-50", "SO121" to "SO-121", "SO124" to "SO-124", "SO125" to "SO-125",
        "SO50" to "SO-50", "SOLUTUSNANOSATTELITE" to "SONATE", "SONATE2" to "SONATE",
        "TAURUS1" to "TAURUS", "TEVEL21" to "TEV2-1", "TEVEL22" to "TEV2-2",
        "TEVEL23" to "TEV2-3", "TEVEL24" to "TEV2-4", "TEVEL25" to "TEV2-5",
@@ -48,6 +48,8 @@ data class QsoRecord(
    val wavelogStation: String = "",
    val lotwReceived: Boolean = false,
    val lotwQslDate: String = "",
+    /** Own operated grid set this QSO went out under — uploaded as ADIF MY_VUCC_GRIDS
+     *  (never VUCC_GRIDS, which belongs to the opposite station). Stamped at upload. */
    val vuccGrids: List<String> = emptyList(),
    val dxcc: Int? = null,
    val country: String = "",
@@ -50,11 +50,26 @@ object Sources {
    )
    /**
     * Hardcoded AMSAT Live FM satellites (NORAD catnums):
-     * SO-50 (27607), ISS ZARYA (25544), AO-123 ASRTU-1 (61781).
+     * SO-50 (27607), ISS ZARYA (25544), AO-123 ASRTU-1 (61781),
+     * RS95S/QMR-KWT-2 (67291), UNNE-1B (98205).
     * Replaces the AMSAT live-page fetch: stable on any network, no
     * sync-time dependency, no stale-list or timeout failure modes.
+     *
+     * BA7OPF additions (2026-10-09):
+     *  - RS95S / QMR-KWT-2 (67291): V/U FM transponder 145.920/436.950 CTCSS 67.0
+     *    (SatNOGS "QMR-KWT-2 (RS95S)", R4UAB "QMR-KWT-2 (RS95S)", AMSAT "RS95S
+     *    (QMR-KWT-2)"; the LoTW alias table maps the tracker name to ARRL's "RS95S").
+     *  - UNNE-1B (98205): AMSAT-EA 1.5P PocketQube released from the T-18 OTV
+     *    "OSSIE" with a V/U FM repeater ("Voice + (A)FSK").
+     *  ⚠ 98205 is SatNOGS' analysis number (designator 26227BL) for the freshly
+     *    released object — Space-Track assigns the permanent catalogue number later,
+     *    so this entry must be re-pointed then; the ephem-watch cron job tracks it.
+     *
+     * The set is shared: the satellite page / mutual page "AMSAT Live FM" filters
+     * and the radar Log page (FM satellites are logged on the fixed nominal
+     * voice-repeater pair).
     */
-    val amSatFmCatnums = setOf(27607, 25544, 61781)
+    val amSatFmCatnums = setOf(27607, 25544, 61781, 67291, 98205)

    /**
     * Hardcoded AMSAT Live linear (SSB/CW) satellites:
@@ -27,7 +27,7 @@ import org.junit.Test
 /** Alias table that maps tracker catalogue names onto the names ARRL's config.tq6 uses. */
 class LoTWSatelliteAliasesTest {

-    private val catalogue = listOf("SO-50", "ARISS", "PO-101", "BO-102", "AO-91", "RS-44", "IO-117")
+    private val catalogue = listOf("SO-50", "ARISS", "PO-101", "BO-102", "AO-91", "RS-44", "IO-117", "RS95S")

    @Test
    fun `lookup maps SatNOGS catalogue names to ARRL names`() {
@@ -37,6 +37,7 @@ class LoTWSatelliteAliasesTest {
        assertEquals("AO-91", LoTWSatelliteAliases.lookup("FOX-1B"))
        assertEquals("RS-44", LoTWSatelliteAliases.lookup("DOSAAF-85"))
        assertEquals("IO-117", LoTWSatelliteAliases.lookup("GREENCUBE"))
+        assertEquals("RS95S", LoTWSatelliteAliases.lookup("QMR-KWT 2"))
    }

    @Test
@@ -59,6 +60,8 @@ class LoTWSatelliteAliasesTest {
        assertEquals("SO-50", LoTWSatelliteAliases.resolve("SAUDISAT 1C (SO-50)", catalogue))
        assertEquals("ARISS", LoTWSatelliteAliases.resolve("ISS (ZARYA)", catalogue))
        assertEquals("AO-91", LoTWSatelliteAliases.resolve("AO-91 (RadFxSat)", catalogue))
+        assertEquals("RS95S", LoTWSatelliteAliases.resolve("RS-95S", catalogue))
+        assertEquals("RS95S", LoTWSatelliteAliases.resolve("QMR-KWT 2", catalogue))
    }

    @Test
@@ -10,6 +10,7 @@
 package com.rtbishop.look4sat.core.domain.logbook

 import org.junit.Assert.assertEquals
+import org.junit.Assert.assertFalse
 import org.junit.Assert.assertTrue
 import org.junit.Test

@@ -22,8 +23,10 @@ class AdifCodecTest {
            endUtcMillis = 1_700_000_000_100L,
            theirCallsign = "BG5JVM",
            myCallsign = "BA7OPF",
-            theirGrid = "OM60",
+            theirGrid = "EN52",
+            theirVuccGrids = listOf("EN52", "EN53"),
            myGrid = "OL62TI",
+            vuccGrids = listOf("OL62", "OL61"),
            sentReport = "59",
            receivedReport = "59",
            txFrequencyHz = 145_850_000L,
@@ -36,8 +39,7 @@ class AdifCodecTest {
            propagationMode = "SAT",
            status = QsoStatus.COMPLETE,
            lotwConfirmed = true,
-            lotwQslDate = "2026-09-20",
-            vuccGrids = listOf("OM60", "OM50")
+            lotwQslDate = "2026-09-20"
        )
        val decoded = AdifCodec.decode(AdifCodec.encode(listOf(record))).single()
        assertEquals(record.startUtcMillis, decoded.startUtcMillis)
@@ -47,12 +49,18 @@ class AdifCodecTest {
        assertEquals("2M", decoded.band)
        assertEquals("70CM", decoded.rxBand)
        assertTrue(decoded.lotwConfirmed)
-        assertEquals(listOf("OM60", "OM50"), decoded.vuccGrids)
+        // Grid directions survive a round trip: the opposite's set stays theirs,
+        // the operator's own set stays theirs.
+        assertEquals("EN52", decoded.theirGrid)
+        assertEquals(listOf("EN52", "EN53"), decoded.theirVuccGrids)
+        assertEquals("OL62TI", decoded.myGrid)
+        assertEquals(listOf("OL62", "OL61"), decoded.vuccGrids)
    }

    @Test
    fun decode_lotwStyleReportFields() {
-        // LoTW report subset: lowercase eor, alphabetical fields, VUCC_GRIDS list.
+        // LoTW report subset: lowercase eor, alphabetical fields. The un-prefixed
+        // grid fields belong to the OPPOSITE station, MY_* fields to the operator.
        val adi = """
            <EOH>
            <CALL:6>BH6RJD
@@ -64,8 +72,9 @@ class AdifCodecTest {
            <BAND:3>2M
            <BAND_RX:4>70CM
            <GRIDSQUARE:4>OM60
-            <MY_GRIDSQUARE:8>OM60IL70
            <VUCC_GRIDS:9>OM60,OM50
+            <MY_GRIDSQUARE:6>OL62TI
+            <MY_VUCC_GRIDS:9>OL62,OL61
            <STATION_CALLSIGN:6>BH6RJD
            <DXCC:3>318
            <COUNTRY:5>China
@@ -78,12 +87,27 @@ class AdifCodecTest {
        assertEquals("BH6RJD", record.theirCallsign)
        assertEquals("SO-50", record.satelliteName)
        assertEquals("FM", record.displayMode)
-        assertEquals("OM60IL70", record.myGrid)
-        assertEquals(listOf("OM60", "OM50"), record.vuccGrids)
+        assertEquals("OM60", record.theirGrid)
+        assertEquals(listOf("OM60", "OM50"), record.theirVuccGrids)
+        assertEquals("OL62TI", record.myGrid)
+        assertEquals(listOf("OL62", "OL61"), record.vuccGrids)
        assertTrue(record.lotwConfirmed)
        assertTrue(record.isSatellite)
    }

+    @Test
+    fun decodeWavelogPullStyleRecordKeepsGridDirections() {
+        // Wavelog's export: the OPPOSITE station's grids un-prefixed, the station
+        // profile's grid under MY_*. A pull must not flip them into each other.
+        val adi = "<EOH><CALL:6>BG5JVM<QSO_DATE:8>20260916<TIME_ON:4>0745" +
+            "<VUCC_GRIDS:9>EN52,EN53<MY_GRIDSQUARE:6>OL62TI<MY_VUCC_GRIDS:9>OL62,OL61" +
+            "<MODE:2>FM<PROP_MODE:3>SAT<SAT_NAME:5>SO-50<EOR>"
+        val record = AdifCodec.decode(adi).single()
+        assertEquals(listOf("EN52", "EN53"), record.theirVuccGrids)
+        assertEquals("OL62TI", record.myGrid)
+        assertEquals(listOf("OL62", "OL61"), record.vuccGrids)
+    }
+
    @Test
    fun encodeOmitsStationCallsignForWavelog() {
        val record = QsoRecord(
@@ -99,4 +123,44 @@ class AdifCodecTest {
        assertTrue(adif.contains("<CALL:6>N0CALL"))
        assertTrue(adif.contains("<SAT_NAME:5>SO-50"))
    }
+
+    @Test
+    fun encodeKeepsOwnGridsOutOfTheOppositeVuccField() {
+        // The reported defect: an operator's stamped own grid set must never land in
+        // VUCC_GRIDS — Wavelog displays that field as the OPPOSITE station's grid.
+        val record = QsoRecord(
+            startUtcMillis = 1_700_000_000_000L,
+            theirCallsign = "N0CALL",
+            myCallsign = "BA7OPF",
+            myGrid = "OL62TI",
+            vuccGrids = listOf("OL62"),
+            satelliteName = "SO-50"
+        )
+        val adif = AdifCodec.encode(listOf(record), includeStationCallsign = false)
+        assertTrue(adif.contains("<MY_VUCC_GRIDS:4>OL62"))
+        assertFalse(adif.contains("<VUCC_GRIDS:"))
+        assertFalse(adif.contains("<GRIDSQUARE:"))
+    }
+
+    @Test
+    fun encodeWritesTheOppositeMultiGridSetToVuccGrids() {
+        val multi = QsoRecord(
+            startUtcMillis = 1_700_000_000_000L,
+            theirCallsign = "N0CALL",
+            myCallsign = "BA7OPF",
+            theirGrid = "EN52",
+            theirVuccGrids = listOf("EN52", "EN53"),
+            satelliteName = "SO-50"
+        )
+        val multiAdif = AdifCodec.encode(listOf(multi), false)
+        assertTrue(multiAdif.contains("<GRIDSQUARE:4>EN52"))
+        assertTrue(multiAdif.contains("<VUCC_GRIDS:9>EN52,EN53"))
+
+        // A single opposite grid rides in GRIDSQUARE only; one value inside the VUCC
+        // field would trigger Wavelog's single-grid warning in its QSO view.
+        val single = multi.copy(theirVuccGrids = listOf("EN52"))
+        val singleAdif = AdifCodec.encode(listOf(single), false)
+        assertTrue(singleAdif.contains("<GRIDSQUARE:4>EN52"))
+        assertFalse(singleAdif.contains("<VUCC_GRIDS:"))
+    }
 }
@@ -19,6 +19,10 @@
    <string name="sat_search_clear">Vaciar</string>
    <string name="sat_clear_all">Vaciar todo</string>
    <string name="sat_select_all">Seleccionar todo</string>
+    <string name="sat_group_selected">Seleccionados</string>
+    <string name="sat_group_available">Disponibles</string>
+    <string name="sat_group_selected_count">Seleccionados (%1$d)</string>
+    <string name="sat_group_available_count">Disponibles (%1$d)</string>
    <string name="sat_empty_list_message">
        Asegúrese de que su consulta de búsqueda sea correcta y que la base de datos esté actualizada</string>
    <string name="sat_warning_title">Alarma\!</string>
@@ -19,6 +19,10 @@
    <string name="sat_search_clear">Очистить</string>
    <string name="sat_clear_all">Очистить</string>
    <string name="sat_select_all">Выбрать</string>
+    <string name="sat_group_selected">Выбранные</string>
+    <string name="sat_group_available">Доступные</string>
+    <string name="sat_group_selected_count">Выбранные (%1$d)</string>
+    <string name="sat_group_available_count">Доступные (%1$d)</string>
    <string name="sat_empty_list_message">Убедитесь, что ваш поисковый запрос верен и база данных обновлена</string>
    <string name="sat_warning_title">Внимание\!</string>
    <string name="sat_warning_message">
@@ -19,6 +19,10 @@
    <string name="sat_search_clear">පිරිසිදු ක°</string>
    <string name="sat_clear_all">සියල්ල පිරිසිදු ක°</string>
    <string name="sat_select_all">සියල්ල තෝරන්න</string>
+    <string name="sat_group_selected">තෝරාගත්</string>
+    <string name="sat_group_available">තිබෙන</string>
+    <string name="sat_group_selected_count">තෝරාගත් (%1$d)</string>
+    <string name="sat_group_available_count">තිබෙන (%1$d)</string>
    <string name="sat_empty_list_message">
        ඔබගේ සෙවුම් විමසුම නිවැරදි බවත් දත්ත සමුදාය යාවත්කාලීන කර ඇති බවත් සහතික කර ගන්න</string>
    <string name="sat_warning_title">අවවාදයයි\!</string>
@@ -20,6 +20,10 @@
    <string name="sat_search_clear">Temizle</string>
    <string name="sat_clear_all">Tümünü temizle</string>
    <string name="sat_select_all">Tümünü seç</string>
+    <string name="sat_group_selected">Seçilenler</string>
+    <string name="sat_group_available">Kullanılabilir</string>
+    <string name="sat_group_selected_count">Seçilenler (%1$d)</string>
+    <string name="sat_group_available_count">Kullanılabilir (%1$d)</string>
    <string name="sat_empty_list_message">"Arama sorgunuzun doğru olduğundan ve veritabanının güncellendiğinden emin olun"</string>
    <string name="sat_warning_title">Uyarı\!</string>
    <string name="sat_warning_message">
@@ -19,6 +19,10 @@
    <string name="sat_search_clear">Очистити</string>
    <string name="sat_clear_all">Очистити всі</string>
    <string name="sat_select_all">Вибрати всі</string>
+    <string name="sat_group_selected">Обрані</string>
+    <string name="sat_group_available">Доступні</string>
+    <string name="sat_group_selected_count">Обрані (%1$d)</string>
+    <string name="sat_group_available_count">Доступні (%1$d)</string>
    <string name="sat_empty_list_message">
        Переконайтеся, що ваш пошуковий запит правильний, а база даних оновлена</string>
    <string name="sat_warning_title">Увага\!</string>
@@ -20,6 +20,10 @@
    <string name="sat_search_clear">清空</string>
    <string name="sat_clear_all">全部清空</string>
    <string name="sat_select_all">全选</string>
+    <string name="sat_group_selected">已选择</string>
+    <string name="sat_group_available">可用</string>
+    <string name="sat_group_selected_count">已选择（%1$d）</string>
+    <string name="sat_group_available_count">可用（%1$d）</string>
    <string name="sat_empty_list_message">请确保您的搜索查询正确且数据库已更新</string>
    <string name="sat_warning_title">警告\!</string>
    <string name="sat_warning_message">此应用收录了超过9000颗卫星信息\n同时追踪所有卫星并不现实\n建议始终通过搜索和分类筛选功能仅勾选您感兴趣的卫星</string>
@@ -21,6 +21,10 @@
    <string name="sat_search_clear">Clear</string>
    <string name="sat_clear_all">Clear all</string>
    <string name="sat_select_all">Select all</string>
+    <string name="sat_group_selected">Selected</string>
+    <string name="sat_group_available">Available</string>
+    <string name="sat_group_selected_count">Selected (%1$d)</string>
+    <string name="sat_group_available_count">Available (%1$d)</string>
    <string name="sat_empty_list_message">"Make sure your search query is correct and the DB is updated"</string>
    <string name="sat_warning_title">Warning\!</string>
    <string name="sat_warning_message">
@@ -82,7 +82,10 @@ class MutualViewModel(
    private val settingsRepo: ISettingsRepo,
    // Injected so unit tests can run the pass computation on a test dispatcher;
    // production callers keep the CPU-bound pool default.
-    private val computeDispatcher: CoroutineDispatcher = Dispatchers.Default
+    private val computeDispatcher: CoroutineDispatcher = Dispatchers.Default,
+    // Injected so unit tests can pin the wall clock to the fixture TLE epoch and
+    // stay deterministic; production callers keep the real clock default.
+    private val nowMillis: () -> Long = System::currentTimeMillis
 ) : ViewModel() {

    private val _uiState = MutableStateFlow(MutualUiState())
@@ -303,7 +306,7 @@ class MutualViewModel(
        queryGeneration += 1

        viewModelScope.launch {
-            val now = System.currentTimeMillis()
+            val now = nowMillis()
            // 转发器类型筛选: 使用硬编码 AMSAT Live 清单 (见 Sources):
            // FM = {SO-50, ISS ZARYA, AO-123}, Linear = {RS-44, FO-29,
            // AO-7, AO-73, JO-97}. 不再依赖 AMSAT 网页同步: 任何网络下都
@@ -53,7 +53,9 @@ class MutualViewModelTest {
    ): MutualViewModel = MutualViewModel(
        satelliteRepo = FakeSatelliteRepo(satellites, passes),
        settingsRepo = FakeSettingsRepo(position),
-        computeDispatcher = StandardTestDispatcher(mainDispatcherRule.dispatcher.scheduler)
+        computeDispatcher = StandardTestDispatcher(mainDispatcherRule.dispatcher.scheduler),
+        // Pin the clock to the fixture base so results never depend on wall time.
+        nowMillis = { TestOrbits.FIXTURE_BASE }
    )

    private fun TestScope.queryAndSettle(vm: MutualViewModel) {
@@ -219,7 +221,7 @@ class MutualViewModelTest {
        assertTrue(state.mutualPasses.all { it.catNum == 25544 })
        assertTrue(state.mutualPasses.all { it.name == "ISS (ZARYA)" })
        // AOS/LOS within the searched horizon
-        val now = System.currentTimeMillis()
+        val now = TestOrbits.FIXTURE_BASE
        assertTrue(state.mutualPasses.all { it.startTime >= now - 120_000L })
        assertTrue(state.mutualPasses.all { it.endTime <= now + 12 * 3600_000L + 120_000L })
    }
@@ -48,6 +48,15 @@ object TestOrbits {
        )
    )

+    /**
+     * Fixed wall-clock base for every fixture computation: 2024-03-10T00:00Z,
+     * ~18 h after [ISS]'s TLE epoch, so SGP4 propagates an accurate, healthy
+     * orbit. Tests pin the ViewModel clock to this value as well
+     * (MutualViewModel.nowMillis), which makes pass windows deterministic
+     * instead of rotting as the fixture ages against System.currentTimeMillis().
+     */
+    val FIXTURE_BASE: Long = 1710028800000L
+
    /** Guangzhou (default BA7OPF grid OL62/OL63 area). */
    val GUANGZHOU = GeoPos(23.13, 113.26)

@@ -85,7 +94,7 @@ object TestOrbits {
    fun findPassWindows(
        sat: OrbitalObject = ISS,
        pos: GeoPos = GUANGZHOU,
-        time: Long = System.currentTimeMillis(),
+        time: Long = FIXTURE_BASE,
        hoursAhead: Int = 12
    ): List<OrbitalPass> {
        if (!sat.willBeSeen(pos)) return emptyList()
@@ -326,9 +326,52 @@ private fun SatellitesPreview() {

@Composable
 private fun SatellitesCard(items: List<SatItem>, onSelected: (Int, Boolean) -> Unit) {
+    val selectedItems = items.filter { it.isSelected }
+    val availableItems = items.filterNot { it.isSelected }
+
    LazyVerticalGrid(columns = GridCells.Adaptive(320.dp)) {
-        items(items = items, key = { item -> item.catnum }) { entry ->
-            Satellite(entry, onSelected, Modifier.animateItem())
+        stickyHeader(key = "sat_summary_header") {
+            SummaryHeader(
+                selectedText = stringResource(R.string.sat_group_selected_count, selectedItems.size),
+                availableText = stringResource(R.string.sat_group_available_count, availableItems.size)
+            )
+        }
+
+        if (selectedItems.isNotEmpty()) {
+            items(items = selectedItems, key = { item -> item.catnum }) { entry ->
+                Satellite(entry, onSelected, Modifier.animateItem())
+            }
+        }
+
+        if (availableItems.isNotEmpty()) {
+            items(items = availableItems, key = { item -> item.catnum }) { entry ->
+                Satellite(entry, onSelected, Modifier.animateItem())
+            }
        }
    }
 }
+
+@Composable
+private fun SummaryHeader(selectedText: String, availableText: String) {
+    Row(
+        verticalAlignment = Alignment.CenterVertically,
+        horizontalArrangement = Arrangement.SpaceBetween,
+        modifier = Modifier
+            .fillMaxWidth()
+            .background(MaterialTheme.colorScheme.surfaceContainerHighest)
+            .padding(horizontal = 12.dp, vertical = 4.dp)
+    ) {
+        Text(
+            text = selectedText,
+            style = MaterialTheme.typography.titleSmall,
+            fontWeight = FontWeight.SemiBold,
+            color = MaterialTheme.colorScheme.onSurfaceVariant
+        )
+        Text(
+            text = availableText,
+            style = MaterialTheme.typography.titleSmall,
+            fontWeight = FontWeight.SemiBold,
+            color = MaterialTheme.colorScheme.onSurfaceVariant
+        )
+    }
+}
@@ -1,8 +1,8 @@
 [versions]
 #noinspection UnusedVersionCatalogEntry
-appVersionCode = "579"
+appVersionCode = "581"
 #noinspection UnusedVersionCatalogEntry
-appVersionName = "4.4.8-ba7opf.11.4"
+appVersionName = "4.4.8-ba7opf.11.6"
 #noinspection UnusedVersionCatalogEntry
 compileSdk = "37"
 #noinspection UnusedVersionCatalogEntry
Author	SHA1	Message	Date
atsunatsu	ddca54e7e6	build: release version 4.4.8-ba7opf.11.6 (581)	2026-10-09 01:54:56 +08:00
atsunatsu	e19d22714b	feat(satellites): AMSAT Live FM 组补 RS95S 与 UNNE-1B Sources.amSatFmCatnums 加两颗：RS95S / QMR-KWT-2 (67291)、UNNE-1B (98205)。两星在 SatNOGS 都有 V/U FM 转发器（"V/U FM Transponder CTCSS 67.0 Hz" 145.920/436.950，与 "Mode V/U - FM Repeater (Voice + (A)FSK)"），因此归入卫星页「AMSAT Live FM」虚拟类型筛选。该集合是三处共用的一份口径：卫星页与互通页的 FM 筛选、以及雷达页 Log（FM 星按名义 voice repeater 频率对记账，两颗星都有该行，不会回落到算器/所选频点）。 98205 是 SatNOGS 的分析编号（国际编号 26227BL，T-18 由 OTV OSSIE 释放）， Space-Track 正式编目后会换号，届时需回改这一条；已在 KDoc 标注，ephem-watch cron（6b1544af4470）会盯到编号变化。测试：SelectionRepoSearchTest 新增一例，断言 FM 虚拟类型命中 67291 与 98205 （全量 ./gradlew test 通过）。	2026-10-09 01:47:52 +08:00
atsunatsu	623d859c97	test(mutual): 钉死 fixture 时间基准，消除时段性 flaky fixture 用 2024-03-09 固定 ISS TLE + System.currentTimeMillis() 起点；SGP4 带阻力衰减 942 天后高度仅 ≈262km，12h 窗口内可能无广州过境 → 3 条依赖过境窗的用例时段性失败（Gradle 缓存 FROM-CACHE 会掩盖上一次的真跑）。 - TestOrbits.FIXTURE_BASE（2024-03-10T00:00Z，历元后约 18h）取代默认 System.currentTimeMillis() - MutualViewModel 墙钟可注入：nowMillis: () -> Long = System::currentTimeMillis（第 4 个默认参数，生产行为逐位不变；工厂具名构造零改动） - 断言里的 now 改用同一基准；prefill/scroll 测试不碰时间未动修后：:feature:mutual 28/28，全量 ./gradlew test 451/451。	2026-10-08 12:36:40 +08:00
atsunatsu	08803e0f55	feat(logbook): LoTW 卫星别名补 RS95S（QMR-KWT 2）＋内置 config.tq6 升 11.35 RS-95S（QMR-KWT 2，NORAD 67291）QSO 上传时发现：别名表无该星、内置 config 11.34 也无此官方名（11.34 里没有 RS95S，会被 every-alias-target 校验挡住）。 - config.tq6 11.34 → 11.35（ARRL 现行版本，新增 RS95S=QMR-KWT-2） - 别名表补 QMRKWT2→RS95S（SatNOGS 名 QMR-KWT 2）与 RS95S→RS95S（兼容 RS-95S 连字符写法，resolve 的包含回退逐字符比会漏） - 单测补断言：QMR-KWT 2 lookup / RS-95S＋QMR-KWT 2 resolve / 用真实 config 解析 RS95S	2026-10-08 12:36:35 +08:00
atsunatsu	6f1c0a2d23	build: release version 4.4.8-ba7opf.11.5 (580)	2026-10-08 02:27:47 +08:00
atsunatsu	74e7e19cf2	feat(satellites): 勾选置顶显示——已选/可用分组＋顶部计数条（对齐上游）	2026-10-08 02:26:56 +08:00
atsunatsu	bb001b4d38	fix(logbook): ADIF 网格字段方向修正——VUCC_GRIDS 归对方、MY_VUCC_GRIDS 归己方（编解码双向）	2026-10-08 02:26:51 +08:00