build: bump version to 4.4.7-ba7opf.15 (497)

The satellite selection screen's 'Select satellite type' dialog now lists
three virtual types first (AMSAT Live FM, AMSAT Live Linear, Live SSTV)
before the TLE-source types. Selecting one filters the satellite list to
that transponder/activity set; multiple selections union. 'All' is kept.

- SelectionRepo.getTypesList: virtual types prepended (All preserved)
- SelectionRepo.resolveTypeIds: FM/Linear -> AMSAT catnum sets,
  Live SSTV -> mode=SSTV radios; other types via persisted IDs
- Tests: virtual-type filtering, union, clear, list-order assertion

core/data/src/main/java/com/rtbishop/look4sat/core/data/database/Look4SatDao.kt

@@ -45,7 +45,7 @@ interface Look4SatDao {
     @Query("DELETE FROM entries")
     suspend fun deleteEntries()
 
-    @Query("SELECT catnum FROM radios WHERE downlinkMode IN (:modes)")
+    @Query("SELECT catnum FROM radios WHERE downlinkMode IN (:modes) AND isAlive = 1")
     suspend fun getIdsWithModes(modes: List<String>): List<Int>
 
     @Query("SELECT COUNT(*) FROM radios")

core/data/src/main/java/com/rtbishop/look4sat/core/data/repository/DatabaseRepo.kt

@@ -115,12 +115,48 @@ class DatabaseRepo(
             localSource.insertRadios(importedRadios)
         }
         if (importedEntries.isNotEmpty()) localSource.insertEntries(importedEntries)
+        updateAmSatLiveLists()
         setUpdateSuccessful(System.currentTimeMillis())
     }
 
+    /**
+     * Refresh the AMSAT Live FM/Linear satellite lists (transponders currently
+     * on the air). Best effort: any failure keeps the previous lists and never
+     * blocks the rest of the data update, so the mutual-match filter simply
+     * falls back to the last successful snapshot.
+     */
+    private suspend fun updateAmSatLiveLists() = withContext(dispatcher) {
+        runCatching {
+            val entries = localSource.getEntriesList() // catnum -> name
+            val jobs = Sources.amSatLiveUrls.map { (type, url) ->
+                async { type to remoteSource.getNetworkStream(url) }
+            }
+            val results = jobs.awaitAll()
+            val fmNames = results.firstOrNull { it.first == "FM" }?.second?.stream
+                ?.let { dataParser.parseAmSatLivePage(it) }.orEmpty()
+            val linearNames = results.firstOrNull { it.first == "Linear" }?.second?.stream
+                ?.let { dataParser.parseAmSatLivePage(it) }.orEmpty()
+            val nameToCatnum = entries.associate { it.name.uppercase() to it.catnum }
+            fun resolve(names: List<String>): Set<Int> = names.mapNotNull { name ->
+                val keys = dataParser.normalizeAmSatName(name)
+                nameToCatnum.entries.firstOrNull { (localName, _) ->
+                    keys.any { key -> localName.contains(key) }
+                }?.value
+            }.toSet()
+            val fmCatnums = resolve(fmNames)
+            val linearCatnums = resolve(linearNames)
+            settingsRepo.setAmSatCatnums(fmCatnums, linearCatnums)
+            println("AMSAT live lists updated: FM=${fmCatnums.size}, Linear=${linearCatnums.size}")
+        }.onFailure {
+            // Keep the previous lists; the mutual filter stays on the last good snapshot.
+            println("AMSAT live lists update failed: $it")
+        }
+    }
+
     override suspend fun clearAllData() = withContext(dispatcher) {
         localSource.deleteEntries()
         localSource.deleteRadios()
+        settingsRepo.setAmSatCatnums(emptySet(), emptySet())
         setUpdateSuccessful(0L)
     }
 

core/data/src/main/java/com/rtbishop/look4sat/core/data/repository/SatelliteRepo.kt

@@ -65,6 +65,8 @@ class SatelliteRepo(
 
     override suspend fun getRadiosWithId(id: Int) = localStorage.getRadiosWithId(id)
 
+    override suspend fun getSatelliteIdsWithModes(modes: List<String>) = localStorage.getIdsWithModes(modes)
+
     override suspend fun initRepository() = withContext(dispatcher) {
         combine(
             settingsRepo.selectedIds,

core/data/src/main/java/com/rtbishop/look4sat/core/data/repository/SelectionRepo.kt

@@ -43,11 +43,13 @@ class SelectionRepo(
 
     // Resolve type IDs once when types change, then filter items reactively.
     // The HashSet gives O(1) catnum lookups instead of O(n) with a List.
+    // The three virtual types ("AMSAT Live FM", "AMSAT Live Linear", "Live SSTV")
+    // are resolved from live transponder data instead of SharedPreferences.
     private val itemsWithTypes = currentTypes.flatMapLatest { types: List<String> ->
         val catnumSet: Set<Int>? = if (types.isEmpty()) {
             null // null = no filtering
         } else {
-            val ids = settingsRepo.getSatelliteTypesIds(types)
+            val ids = resolveTypeIds(types)
             if (ids.isEmpty()) null else ids.toHashSet()
         }
         currentItems.map { items ->
@@ -61,8 +63,28 @@ class SelectionRepo(
 
     override fun getCurrentTypes() = currentTypes.value
 
-    override fun getTypesList() = Sources.satelliteDataUrls.keys.sorted().toMutableList().apply {
-        removeAt(0)
+    /**
+     * Resolves a list of type names to satellite catnums. The three virtual
+     * transponder/activity types are resolved from live data; all other types
+     * come from the per-type ID lists persisted by [ISettingsRepo].
+     */
+    private suspend fun resolveTypeIds(types: List<String>): List<Int> {
+        val idsSet = mutableSetOf<Int>()
+        types.forEach { type ->
+            when (type) {
+                "AMSAT Live FM" -> idsSet.addAll(settingsRepo.getAmSatFmCatnums())
+                "AMSAT Live Linear" -> idsSet.addAll(settingsRepo.getAmSatLinearCatnums())
+                "Live SSTV" -> idsSet.addAll(localSource.getIdsWithModes(listOf("SSTV")))
+                else -> idsSet.addAll(settingsRepo.getSatelliteTypesIds(listOf(type)))
+            }
+        }
+        return idsSet.toList()
+    }
+
+    override fun getTypesList() = buildList {
+        // 三个转发器/活动虚拟类型排在最前.
+        addAll(listOf("AMSAT Live FM", "AMSAT Live Linear", "Live SSTV"))
+        addAll(Sources.satelliteDataUrls.keys.sorted().toMutableList().apply { removeAt(0) })
     }
 
     override suspend fun getEntriesFlow() = withContext(dispatcher) {

core/data/src/main/java/com/rtbishop/look4sat/core/data/repository/SettingsRepo.kt

@@ -107,6 +107,8 @@ class SettingsRepo(
     private val keySatelliteEnabled = "satelliteEnabled"
     private val keyTransceiversEnabled = "transceiversEnabled"
     private val keySatnogsTleSourceMigration = "satnogsTleSourceMigration"
+    private val keyAmSatFmCatnums = "amSatFmCatnums"
+    private val keyAmSatLinearCatnums = "amSatLinearCatnums"
     private val separatorComma = ","
     private val separatorUrl = "\n"
     private val legacyCelestrakSatnogsUrl =
@@ -269,6 +271,59 @@ class SettingsRepo(
         preferences.edit { putString(keyRoamedGrids, array.toString()) }
     }
 
+    // Marked stations in unworked gridsquares, persisted as a single JSON
+    // object: {"OL62":[{"c":call,"t":epochMs}, ...]}. Each grid holds an
+    // ordered list (first = pinned/top). v14.1 stored a single object per
+    // grid; reads transparently migrate that old shape to a one-element list.
+    private val keyMarkedGridStations = "markedGridStations"
+
+    override fun getMarkedGridStations(): Map<String, List<com.rtbishop.look4sat.core.domain.model.MarkedStation>> {
+        val json = preferences.getString(keyMarkedGridStations, null).orEmpty()
+        if (json.isBlank()) return emptyMap()
+        return try {
+            val root = org.json.JSONObject(json)
+            val result = mutableMapOf<String, List<com.rtbishop.look4sat.core.domain.model.MarkedStation>>()
+            for (grid in root.keys()) {
+                val value = root.opt(grid)
+                val list = when (value) {
+                    // v14.2+ shape: JSON array of station objects.
+                    is org.json.JSONArray -> (0 until value.length()).mapNotNull { i ->
+                        val o = value.optJSONObject(i) ?: return@mapNotNull null
+                        val call = o.optString("c").ifBlank { return@mapNotNull null }
+                        com.rtbishop.look4sat.core.domain.model.MarkedStation(call = call, epochMs = o.optLong("t"))
+                    }
+                    // v14.1 legacy shape: a single station object per grid.
+                    is org.json.JSONObject -> {
+                        val call = value.optString("c").ifBlank { null }
+                        if (call == null) emptyList()
+                        else listOf(com.rtbishop.look4sat.core.domain.model.MarkedStation(call = call, epochMs = value.optLong("t")))
+                    }
+                    else -> emptyList()
+                }
+                if (list.isNotEmpty()) result[grid] = list
+            }
+            result
+        } catch (_: Exception) {
+            emptyMap()
+        }
+    }
+
+    override fun setMarkedGridStations(stations: Map<String, List<com.rtbishop.look4sat.core.domain.model.MarkedStation>>) {
+        val root = org.json.JSONObject()
+        for ((grid, list) in stations) {
+            val array = org.json.JSONArray()
+            for (station in list) {
+                array.put(
+                    org.json.JSONObject()
+                        .put("c", station.call)
+                        .put("t", station.epochMs)
+                )
+            }
+            root.put(grid, array)
+        }
+        preferences.edit { putString(keyMarkedGridStations, root.toString()) }
+    }
+
     // LoTW credentials (stored locally on the device only)
     private val keyLoTWCall = "lotwCallsign"
     private val keyLoTWPass = "lotwPassword"
@@ -692,6 +747,25 @@ class SettingsRepo(
     }
     //endregion
 
+    //region # AMSAT live-transponder lists
+    override fun getAmSatFmCatnums(): Set<Int> {
+        val raw = preferences.getString(keyAmSatFmCatnums, null) ?: return emptySet()
+        return raw.split(separatorComma).mapNotNull { it.toIntOrNull() }.toSet()
+    }
+
+    override fun getAmSatLinearCatnums(): Set<Int> {
+        val raw = preferences.getString(keyAmSatLinearCatnums, null) ?: return emptySet()
+        return raw.split(separatorComma).mapNotNull { it.toIntOrNull() }.toSet()
+    }
+
+    override fun setAmSatCatnums(fmCatnums: Set<Int>, linearCatnums: Set<Int>) {
+        preferences.edit {
+            putString(keyAmSatFmCatnums, fmCatnums.sorted().joinToString(separatorComma))
+            putString(keyAmSatLinearCatnums, linearCatnums.sorted().joinToString(separatorComma))
+        }
+    }
+    //endregion
+
     //region # Radio control settings
     private val keyRadioControlEnabled = "radioControlEnabled"
     private val keyRadioModel = "radioModel"

core/data/src/test/java/com/rtbishop/look4sat/core/data/repository/DatabaseRepoTest.kt

@@ -269,6 +269,10 @@ private class FakeSettingsRepo(dataSources: DataSourcesSettings = defaultDataSou
         (dataSourcesStatus as? MutableStateFlow)?.value = status
     }
 
+    override fun getAmSatFmCatnums(): Set<Int> = emptySet()
+    override fun getAmSatLinearCatnums(): Set<Int> = emptySet()
+    override fun setAmSatCatnums(fmCatnums: Set<Int>, linearCatnums: Set<Int>) = Unit
+
     override fun updateRadioControlSettings(settings: RadioControlSettings) = Unit
 
     override fun getSatelliteOffset(catnum: Int): String = ""
@@ -312,6 +316,10 @@ private class FakeSettingsRepo(dataSources: DataSourcesSettings = defaultDataSou
     override fun setRoamedGrids(grids: Set<String>) {
         roamedGrids.value = grids
     }
+
+    override fun getMarkedGridStations(): Map<String, List<com.rtbishop.look4sat.core.domain.model.MarkedStation>> = emptyMap()
+
+    override fun setMarkedGridStations(stations: Map<String, List<com.rtbishop.look4sat.core.domain.model.MarkedStation>>) = Unit
 }
 
 private fun defaultDataSourcesSettings(): DataSourcesSettings {

core/data/src/test/java/com/rtbishop/look4sat/core/data/repository/SelectionRepoSearchTest.kt

@@ -112,22 +112,86 @@ class SelectionRepoSearchTest {
         assertTrue(repo.getEntriesFlow().first().isEmpty())
     }
 
-    private fun createRepo(items: List<SatItem>): ISelectionRepo {
+    @Test
+    fun `FM virtual type shows only AMSAT FM list satellites`() = runTest {
+        val repo = createRepo(
+            items = sampleItems,
+            amSatFm = setOf(25544, 39444)
+        )
+        repo.setTypes(listOf("AMSAT Live FM"))
+        val results = repo.getEntriesFlow().first()
+        assertEquals(listOf(25544, 39444), results.map { it.catnum })
+    }
+
+    @Test
+    fun `SSTV virtual type shows only satellites with SSTV radios`() = runTest {
+        val repo = createRepo(
+            items = sampleItems,
+            sstvIds = listOf(43803)
+        )
+        repo.setTypes(listOf("Live SSTV"))
+        val results = repo.getEntriesFlow().first()
+        assertEquals(listOf(43803), results.map { it.catnum })
+    }
+
+    @Test
+    fun `multiple virtual types union their satellites`() = runTest {
+        val repo = createRepo(
+            items = sampleItems,
+            amSatFm = setOf(25544),
+            amSatLinear = setOf(7530),
+            sstvIds = listOf(43803)
+        )
+        repo.setTypes(listOf("AMSAT Live FM", "Live SSTV"))
+        val results = repo.getEntriesFlow().first()
+        assertEquals(setOf(25544, 43803), results.map { it.catnum }.toSet())
+    }
+
+    @Test
+    fun `clearing types restores full list`() = runTest {
+        val repo = createRepo(items = sampleItems, amSatFm = setOf(25544))
+        repo.setTypes(listOf("AMSAT Live FM"))
+        assertTrue(repo.getEntriesFlow().first().isNotEmpty())
+        repo.setTypes(emptyList())
+        assertEquals(sampleItems.size, repo.getEntriesFlow().first().size)
+    }
+
+    @Test
+    fun `types list has virtual transponder types first and keeps All`() {
+        val repo = createRepo(sampleItems)
+        val types = repo.getTypesList()
+        assertTrue(types.size >= 4)
+        assertEquals("AMSAT Live FM", types[0])
+        assertEquals("AMSAT Live Linear", types[1])
+        assertEquals("Live SSTV", types[2])
+        // "All" must be kept in the list (first original type shown after virtual ones).
+        assertTrue("All" in types)
+    }
+
+    private fun createRepo(
+        items: List<SatItem>,
+        amSatFm: Set<Int> = emptySet(),
+        amSatLinear: Set<Int> = emptySet(),
+        sstvIds: List<Int> = emptyList()
+    ): ISelectionRepo {
         return SelectionRepo(
             dispatcher = Dispatchers.Unconfined,
-            localSource = FakeLocalSourceForSearch(items),
-            settingsRepo = FakeSettingsRepoForSearch()
+            localSource = FakeLocalSourceForSearch(items, sstvIds),
+            settingsRepo = FakeSettingsRepoForSearch(amSatFm, amSatLinear)
         )
     }
 }
 
-private class FakeLocalSourceForSearch(private val items: List<SatItem>) : ILocalSource {
+private class FakeLocalSourceForSearch(
+    private val items: List<SatItem>,
+    private val sstvIds: List<Int> = emptyList()
+) : ILocalSource {
     override suspend fun getEntriesTotal(): Int = items.size
     override suspend fun getEntriesList(): List<SatItem> = items
     override suspend fun getEntriesWithIds(ids: List<Int>): List<OrbitalObject> = emptyList()
     override suspend fun insertEntries(entries: List<OrbitalData>) = Unit
     override suspend fun deleteEntries() = Unit
-    override suspend fun getIdsWithModes(modes: List<String>): List<Int> = emptyList()
+    override suspend fun getIdsWithModes(modes: List<String>): List<Int> = sstvIds
     override suspend fun getRadiosTotal(): Int = 0
     override suspend fun getRadiosWithId(id: Int): List<SatRadio> = emptyList()
     override suspend fun insertRadios(radios: List<SatRadio>, isCustom: Boolean) = Unit
@@ -135,7 +199,10 @@ private class FakeLocalSourceForSearch(private val items: List<SatItem>) : ILoca
     override suspend fun deleteRadios() = Unit
 }
 
-private class FakeSettingsRepoForSearch : ISettingsRepo {
+private class FakeSettingsRepoForSearch(
+    private val amSatFm: Set<Int> = emptySet(),
+    private val amSatLinear: Set<Int> = emptySet()
+) : ISettingsRepo {
     override val appVersionName: String = "test"
     override val selectedIds: StateFlow<List<Int>> = MutableStateFlow(emptyList())
     override val selectedTypes: StateFlow<List<String>> = MutableStateFlow(emptyList())
@@ -177,6 +244,9 @@ private class FakeSettingsRepoForSearch : ISettingsRepo {
     override fun updateOtherSettings(transform: (OtherSettings) -> OtherSettings) = Unit
     override fun updateDataSourcesSettings(settings: DataSourcesSettings) = Unit
     override fun updateDataSourcesStatus(status: Map<String, Int>) = Unit
+    override fun getAmSatFmCatnums(): Set<Int> = amSatFm
+    override fun getAmSatLinearCatnums(): Set<Int> = amSatLinear
+    override fun setAmSatCatnums(fmCatnums: Set<Int>, linearCatnums: Set<Int>) = Unit
     override fun updateRadioControlSettings(settings: RadioControlSettings) = Unit
     override fun getSatelliteOffset(catnum: Int): String = ""
     override fun setSatelliteOffset(catnum: Int, offset: String) = Unit
@@ -189,6 +259,8 @@ private class FakeSettingsRepoForSearch : ISettingsRepo {
     override fun setWorkedGridQsos(qsos: Map<String, List<com.rtbishop.look4sat.core.domain.model.GridQso>>) = Unit
     override fun getRoamedGrids(): Set<String> = emptySet()
     override fun setRoamedGrids(grids: Set<String>) = Unit
+    override fun getMarkedGridStations(): Map<String, List<com.rtbishop.look4sat.core.domain.model.MarkedStation>> = emptyMap()
+    override fun setMarkedGridStations(stations: Map<String, List<com.rtbishop.look4sat.core.domain.model.MarkedStation>>) = Unit
     override fun updateLoTWSettings(settings: com.rtbishop.look4sat.core.domain.model.LoTWSettings) = Unit
     override fun getLastLotwSyncDate(): String = ""
     override fun setLastLotwSyncDate(date: String) = Unit

core/domain/src/main/java/com/rtbishop/look4sat/core/domain/model/MarkedStation.kt

@@ -0,0 +1,31 @@
+/*
+ * Look4Sat. Amateur radio satellite tracker and pass predictor.
+ * Copyright (C) 2019-2026 Arty Bishop and contributors.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package com.rtbishop.look4sat.core.domain.model
+
+/**
+ * A station the user marked in a gridsquare they have NOT yet worked — a
+ * reminder to try to contact that callsign. Stored per 4-char grid (one mark
+ * per grid).
+ *
+ * @param call      the callsign the user wants to work (uppercase)
+ * @param epochMs   the moment the mark was created, UTC milliseconds
+ */
+data class MarkedStation(
+    val call: String,
+    val epochMs: Long
+)

core/domain/src/main/java/com/rtbishop/look4sat/core/domain/repository/ISatelliteRepo.kt

@@ -65,4 +65,9 @@ interface ISatelliteRepo {
 
     /** Fetch radio transceivers for a satellite by its catalog number. */
     suspend fun getRadiosWithId(id: Int): List<SatRadio>
+
+    /** Satellite catnums whose radios carry any of the given downlink modes.
+     *  Empty modes -> empty result; used to filter the mutual-match satellite
+     *  set to transponder satellites (FM voice / linear). */
+    suspend fun getSatelliteIdsWithModes(modes: List<String>): List<Int>
 }

core/domain/src/main/java/com/rtbishop/look4sat/core/domain/repository/ISettingsRepo.kt

@@ -79,6 +79,14 @@ interface ISettingsRepo {
     fun updateDataSourcesStatus(status: Map<String, Int>)
     //endregion
 
+    //region # AMSAT live-transponder lists
+    /** Catalog numbers of satellites listed on AMSAT's "Live FM Satellites" page. */
+    fun getAmSatFmCatnums(): Set<Int>
+    /** Catalog numbers of satellites listed on AMSAT's "Live Linear Satellites" page. */
+    fun getAmSatLinearCatnums(): Set<Int>
+    fun setAmSatCatnums(fmCatnums: Set<Int>, linearCatnums: Set<Int>)
+    //endregion
+
     //region # Radio control settings
     val radioControlSettings: StateFlow<RadioControlSettings>
     fun updateRadioControlSettings(settings: RadioControlSettings)
@@ -105,6 +113,11 @@ interface ISettingsRepo {
     /** Distinct 4-char gridsquares the account operated from (LoTW <MY_GRIDSQUARE>). */
     fun getRoamedGrids(): Set<String>
     fun setRoamedGrids(grids: Set<String>)
+    /** Stations the user marked as "want to contact" in unworked gridsquares
+     *  (grid -> ordered list of marks; the first is the pinned/top one). The
+     *  whole grid clears automatically once it becomes worked. */
+    fun getMarkedGridStations(): Map<String, List<com.rtbishop.look4sat.core.domain.model.MarkedStation>>
+    fun setMarkedGridStations(stations: Map<String, List<com.rtbishop.look4sat.core.domain.model.MarkedStation>>)
     //endregion
 
     //region # LoTW confirmed-grids settings

core/domain/src/main/java/com/rtbishop/look4sat/core/domain/source/Sources.kt

@@ -55,4 +55,11 @@ object Sources {
         "SatNOGS" to "https://db.satnogs.org/api/transmitters/?format=json&status=active",
         "R4UAB" to "https://r4uab.ru/transmitters.json"
     )
+    /** AMSAT "Live FM/Linear Satellites" pages: human-maintained lists of
+     *  transponders currently on the air. Parsed into the mutual-match filter
+     *  (satellites that actually carry a working FM-voice / linear repeater). */
+    val amSatLiveUrls = mapOf(
+        "FM" to "https://www.amsat.org/live-fm-satellites/",
+        "Linear" to "https://www.amsat.org/live-linear-satellites/"
+    )
 }

core/domain/src/main/java/com/rtbishop/look4sat/core/domain/utility/DataParser.kt

@@ -58,6 +58,82 @@ class DataParser(private val dispatcher: CoroutineDispatcher) {
         }.getOrDefault(emptyList())
     }
 
+    /**
+     * Parse an AMSAT "Live FM/Linear Satellites" page into satellite names.
+     * The page is an HTML table whose first column is the satellite name,
+     * sometimes written as an alias list ("AO-91(RadFxSat / Fox-1B)") or a
+     * range ("TEVEL2-1 thru TEVEL2-9"). Returns the distinct expanded names.
+     */
+    suspend fun parseAmSatLivePage(stream: InputStream): List<String> = withContext(dispatcher) {
+        runCatching {
+            val html = stream.bufferedReader().readText()
+            // Grab table rows, take the first cell of each row, keep rows that
+            // look like satellite names (start with letters/digits, not a header).
+            val rows = Regex("<tr[^>]*>(.*?)</tr>", RegexOption.IGNORE_CASE)
+                .findAll(html)
+                .mapNotNull { match ->
+                    val cells = Regex("<t[dh][^>]*>(.*?)</t[dh]>", RegexOption.IGNORE_CASE)
+                        .findAll(match.groupValues[1])
+                        .map { cell -> stripHtml(cell.groupValues[1]).trim() }
+                        .toList()
+                    cells.firstOrNull()?.takeIf { it.isNotBlank() && !it.equals("Satellite", ignoreCase = true) }
+                }
+                .toList()
+            rows.flatMap { expandNameRange(it) }.distinct()
+        }.getOrDefault(emptyList())
+    }
+
+    private fun stripHtml(raw: String): String =
+        raw.replace(Regex("<[^>]+>"), " ").replace(Regex("\\s+"), " ").trim()
+
+    /** Expand "NAME1 thru NAME9" ranges (e.g. TEVEL2-1 thru TEVEL2-9). */
+    private fun expandNameRange(name: String): List<String> {
+        val m = Regex("^(.*?)(\\d+)\\s+thru\\s+(.*?)(\\d+)$", RegexOption.IGNORE_CASE).find(name)
+        if (m == null) return listOf(name)
+        val prefix1 = m.groupValues[1].trim()
+        val startNum = m.groupValues[2].toIntOrNull() ?: return listOf(name)
+        val endNum = m.groupValues[4].toIntOrNull() ?: return listOf(name)
+        val prefix2 = m.groupValues[3].trim()
+        if (startNum > endNum) return listOf(name)
+        // Suffix after the end number, if any (e.g. "TEVEL2-1 thru TEVEL2-9 ").
+        val suffix = name.substringAfterLast(m.groupValues[4]).trim()
+        return (startNum..endNum).map { "$prefix1$it$suffix" }
+    }
+
+    /**
+     * Normalize a satellite name from the AMSAT live pages into lookup keys
+     * used to match against the local entries table:
+     *  - primary key: the leading designator ("AO-91" from "AO-91 (RadFxSat / Fox-1B)")
+     *  - alias keys: every bracketed alias, uppercased, digits preserved
+     * The local entry names are normalized the same way in [matchesAmSatName].
+     */
+    fun normalizeAmSatName(name: String): List<String> {
+        val keys = mutableListOf<String>()
+        // Primary: everything before the first '(' (or '['), then the first token.
+        val primary = name.substringBefore('(').substringBefore('[').trim()
+        primary.split(Regex("\\s+")).firstOrNull()?.takeIf { it.isNotBlank() }?.let {
+            keys += it.uppercase()
+        }
+        // Aliases inside parentheses / brackets: "RadFxSat / Fox-1B" -> two keys.
+        Regex("\\(([^)]*)\\)").findAll(name).forEach { m ->
+            m.groupValues[1].split('/', '|').forEach { alias ->
+                alias.trim().takeIf { it.isNotBlank() }?.let { keys += it.uppercase() }
+            }
+        }
+        Regex("\\[([^]]*)]").findAll(name).forEach { m ->
+            m.groupValues[1].split('/', '|').forEach { alias ->
+                alias.trim().takeIf { it.isNotBlank() }?.let { keys += it.uppercase() }
+            }
+        }
+        return keys.distinct()
+    }
+
+    /** True if a local entry name matches any of the AMSAT normalized keys. */
+    fun matchesAmSatName(localName: String, amSatKeys: List<String>): Boolean {
+        val localUpper = localName.uppercase()
+        return amSatKeys.any { key -> localUpper.contains(key) }
+    }
+
     private fun parseCSV(values: List<String>): OrbitalData? = runCatching {
         val name = values[0]
         val timestamp = values[2]

core/domain/src/test/java/com/rtbishop/look4sat/core/domain/DataParserTest.kt

@@ -239,4 +239,51 @@ class DataParserTest {
         // Matches the CSV test data epoch: 2021-11-16 → day 320
         assert(dataParser.getDayOfYear(2021, 11, 16) == 320)
     }
+
+    @Test
+    fun `AMSAT FM page parses satellite names and expands thru ranges`() = runTest(testDispatcher) {
+        val html = """
+            <html><body><table>
+            <tr><th>Satellite</th><th>Uplink</th><th>Downlink</th><th>Comment</th></tr>
+            <tr><td>AO-91(RadFxSat / Fox-1B)</td><td>435.250</td><td>145.960</td></tr>
+            <tr><td>SO-50(SaudiSat-1C)</td><td>145.850</td><td>436.795</td></tr>
+            <tr><td>TEVEL2-1 thru TEVEL2-9</td><td>145.970</td><td>436.400</td></tr>
+            </table></body></html>
+        """.trimIndent().byteInputStream()
+        val names = dataParser.parseAmSatLivePage(html)
+        assert(names.contains("AO-91(RadFxSat / Fox-1B)"))
+        assert(names.contains("SO-50(SaudiSat-1C)"))
+        assert(names.contains("TEVEL2-1"))
+        assert(names.contains("TEVEL2-9"))
+        assert(names.size == 11) // 2 singles + 9 expanded TEVEL2
+    }
+
+    @Test
+    fun `AMSAT linear page keeps mode-suffixed names`() = runTest(testDispatcher) {
+        val html = """
+            <table>
+            <tr><th>Satellite</th><th>Frequencies</th><th>Comment</th></tr>
+            <tr><td>AO-7 Mode B U/v Inverting Analog</td><td>Uplink LSB</td></tr>
+            <tr><td>FO-29 (JAS-2)V/u Inverting Analog</td><td>Uplink LSB</td></tr>
+            </table>
+        """.trimIndent().byteInputStream()
+        val names = dataParser.parseAmSatLivePage(html)
+        assert(names.contains("AO-7 Mode B U/v Inverting Analog"))
+        assert(names.contains("FO-29 (JAS-2)V/u Inverting Analog"))
+    }
+
+    @Test
+    fun `AMSAT name normalization produces primary and alias keys`() {
+        assert(dataParser.normalizeAmSatName("AO-91(RadFxSat / Fox-1B)") == listOf("AO-91", "RADFXSAT", "FOX-1B"))
+        assert(dataParser.normalizeAmSatName("QO-100 (Es'hail-2/P4A) S/x") == listOf("QO-100", "ES'HAIL-2", "P4A"))
+        assert(dataParser.normalizeAmSatName("ISS") == listOf("ISS"))
+        assert(dataParser.matchesAmSatName("AO-91 (RADFXSAT)", listOf("AO-91", "RADFXSAT")))
+        assert(!dataParser.matchesAmSatName("SO-50", listOf("AO-91")))
+    }
+
+    @Test
+    fun `AMSAT live page with no table returns empty`() = runTest(testDispatcher) {
+        val html = "<html><body>No data</body></html>".byteInputStream()
+        assert(dataParser.parseAmSatLivePage(html).isEmpty())
+    }
 }

core/domain/src/test/java/com/rtbishop/look4sat/core/domain/repository/LoTWGridSyncTest.kt

@@ -21,6 +21,7 @@ import com.rtbishop.look4sat.core.domain.model.DatabaseState
 import com.rtbishop.look4sat.core.domain.model.DataSourcesSettings
 import com.rtbishop.look4sat.core.domain.model.GridQso
 import com.rtbishop.look4sat.core.domain.model.LoTWSettings
+import com.rtbishop.look4sat.core.domain.model.MarkedStation
 import com.rtbishop.look4sat.core.domain.model.OtherSettings
 import com.rtbishop.look4sat.core.domain.model.PassesSettings
 import com.rtbishop.look4sat.core.domain.model.RCSettings
@@ -261,6 +262,9 @@ class LoTWGridSyncTest {
         override fun setWorkedGridQsos(qsos: Map<String, List<GridQso>>) { workedGridQsos = qsos }
         override fun getRoamedGrids(): Set<String> = roamedGrids
         override fun setRoamedGrids(grids: Set<String>) { roamedGrids = grids }
+        private var markedGridStations: Map<String, List<MarkedStation>> = emptyMap()
+        override fun getMarkedGridStations(): Map<String, List<MarkedStation>> = markedGridStations
+        override fun setMarkedGridStations(stations: Map<String, List<MarkedStation>>) { markedGridStations = stations }
         override fun getLastLotwSyncDate(): String = lastSyncDate
         override fun setLastLotwSyncDate(date: String) { lastSyncDate = date }
         override fun getLastLotwSyncCallsign(): String = lastSyncCallsign
@@ -279,6 +283,9 @@ class LoTWGridSyncTest {
         override fun updateOtherSettings(transform: (OtherSettings) -> OtherSettings) = TODO()
         override fun updateDataSourcesSettings(settings: DataSourcesSettings) = TODO()
         override fun updateDataSourcesStatus(status: Map<String, Int>) = TODO()
+        override fun getAmSatFmCatnums(): Set<Int> = emptySet()
+        override fun getAmSatLinearCatnums(): Set<Int> = emptySet()
+        override fun setAmSatCatnums(fmCatnums: Set<Int>, linearCatnums: Set<Int>) = Unit
         override fun updateRadioControlSettings(settings: RadioControlSettings) = TODO()
         override fun getSatelliteOffset(catnum: Int): String = ""
         override fun setSatelliteOffset(catnum: Int, offset: String) = TODO()

core/presentation/src/main/res/drawable/ic_pin.xml

@@ -0,0 +1,20 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <!-- 冖 (秃宝盖): 顶横 + 两侧短竖, 笔画型 -->
+    <path
+        android:pathData="M5,4 L19,4 M5,4 L5,8.5 M19,4 L19,8.5"
+        android:strokeColor="@android:color/white"
+        android:strokeWidth="2"
+        android:strokeLineCap="round"
+        android:fillColor="#00000000" />
+    <!-- 笔画型向上箭头 ↑: 竖杆 + 两斜线箭头头 -->
+    <path
+        android:pathData="M12,9 L12,20 M12,9 L7.5,14 M12,9 L16.5,14"
+        android:strokeColor="@android:color/white"
+        android:strokeWidth="2"
+        android:strokeLineCap="round"
+        android:fillColor="#00000000" />
+</vector>

core/presentation/src/main/res/values-zh/strings.xml

@@ -131,6 +131,13 @@
     <string name="grid_qso_first">首通</string>
     <string name="grid_qso_no_sat">卫星未知</string>
     <string name="grid_qso_match">匹配</string>
+    <!-- 未通联网格中的“标记想通联的电台”提醒 -->
+    <string name="grid_mark_station">标记你想通联的电台</string>
+    <string name="grid_mark_callsign">呼号</string>
+    <string name="grid_mark_confirm">标记</string>
+    <string name="grid_mark_label">标记</string>
+    <string name="grid_mark_delete">删除标记</string>
+    <string name="grid_mark_pin">置顶</string>
     <string name="map_visible">日照中</string>
 
     <!-- Settings screen -->
@@ -301,6 +308,9 @@
     <string name="mutual_grid_hint">支持 4/6/8 位 Maidenhead 网格；也可直接输入经纬度</string>
     <string name="mutual_min_elevation">最小仰角：%d°</string>
     <string name="mutual_time_range">时间范围</string>
+    <string name="mutual_filter_transponder">转发器</string>
+    <string name="mutual_filter_fm">FM</string>
+    <string name="mutual_filter_linear">线性</string>
     <string name="mutual_calculating">计算中…</string>
     <string name="mutual_query">查询匹配</string>
     <string name="mutual_elevation_you">你：%d°</string>

core/presentation/src/main/res/values/strings.xml

@@ -151,6 +151,13 @@
     <string name="grid_qso_first">First</string>
     <string name="grid_qso_no_sat">satellite unknown</string>
     <string name="grid_qso_match">Match</string>
+    <!-- Mark-a-station reminder in unworked grids -->
+    <string name="grid_mark_station">Mark a station you want to contact</string>
+    <string name="grid_mark_callsign">Callsign</string>
+    <string name="grid_mark_confirm">Mark</string>
+    <string name="grid_mark_label">Marked</string>
+    <string name="grid_mark_delete">Remove mark</string>
+    <string name="grid_mark_pin">Pin to top</string>
     <string name="map_visible">Visible</string>
 
     <!-- Settings screen -->
@@ -331,6 +338,9 @@
     <string name="mutual_grid_hint">Supports 4/6/8-char Maidenhead grid; or enter lat/lon directly</string>
     <string name="mutual_min_elevation">Min elevation: %d°</string>
     <string name="mutual_time_range">Time range</string>
+    <string name="mutual_filter_transponder">Transponders</string>
+    <string name="mutual_filter_fm">FM</string>
+    <string name="mutual_filter_linear">Linear</string>
     <string name="mutual_calculating">Calculating…</string>
     <string name="mutual_query">Query Match</string>
     <string name="mutual_elevation_you">You: %d°</string>

feature/map/src/main/java/com/rtbishop/look4sat/feature/map/MaidenheadGridOverlay.kt

@@ -64,6 +64,11 @@ class MaidenheadGridOverlay : Overlay() {
         style = android.graphics.Paint.Style.FILL
         color = Color.argb(90, 76, 217, 100)
     }
+    // 标记(想通联)网格填充: 红色, 透明度与绿色 workedPaint 一致(alpha 90).
+    private val markedPaint = Paint(Paint.ANTI_ALIAS_FLAG).apply {
+        style = android.graphics.Paint.Style.FILL
+        color = Color.argb(90, 255, 59, 48)
+    }
     private val roamStripePaint = Paint(Paint.ANTI_ALIAS_FLAG).apply {
         style = Paint.Style.STROKE
         strokeWidth = 14f
@@ -87,6 +92,12 @@ class MaidenheadGridOverlay : Overlay() {
     /** Worked gridsquares (4-char, uppercase) to highlight, e.g. {"OL62", "PM95"}. */
     var workedGrids: Set<String> = emptySet()
 
+    /** Marked gridsquares (4-char, uppercase) — unworked grids the user has
+     *  marked stations they want to contact in; drawn red, same alpha as the
+     *  green worked fill. Value is the ordered mark list (first = pinned);
+     *  label mode shows the FIRST marked callsign. */
+    var markedGrids: Map<String, List<com.rtbishop.look4sat.core.domain.model.MarkedStation>> = emptyMap()
+
     /** Grid-mode first-call labels: label worked (green) cells with the first
      *  callsign worked in that grid instead of the Maidenhead code; non-worked
      *  cells get no label at all. Only meaningful at sub-square zoom. */
@@ -189,6 +200,9 @@ class MaidenheadGridOverlay : Overlay() {
                         if (cellLabel(lat, lon, zoom) in workedGrids) {
                             canvas.drawRect(xLeft, yTop, xRight, yBottom, workedPaint)
                         }
+                        if (cellLabel(lat, lon, zoom) in markedGrids) {
+                            canvas.drawRect(xLeft, yTop, xRight, yBottom, markedPaint)
+                        }
                     }
                 }
             } else {
@@ -215,6 +229,22 @@ class MaidenheadGridOverlay : Overlay() {
                         canvas.drawRect(xLeft, yTop, xRight, yBottom, workedPaint)
                     }
                 }
+                for (grid in markedGrids.keys) {
+                    val cell = gridCellBounds(grid) ?: continue
+                    for (turn in -colRepeats..colRepeats) {
+                        val dLon = turn * 360.0
+                        if (cell.lonRight + dLon <= leftLon || cell.lonLeft + dLon >= rightLon) continue
+                        val yTop = projectionToY(projection, cell.latTop) ?: continue
+                        val yBottom = projectionToY(projection, cell.latBottom) ?: continue
+                        val xLeftBase = projectionToX(projection, cell.lonLeft, centerLon, worldWidthPx) ?: continue
+                        val xRightBase = projectionToX(projection, cell.lonRight, centerLon, worldWidthPx) ?: continue
+                        val xLeft = xLeftBase + turn * worldWidthPx.toFloat()
+                        val xRight = xRightBase + turn * worldWidthPx.toFloat()
+                        if (xRight < 0f || xLeft > canvas.width) continue
+                        if (yBottom < 0f || yTop > canvas.height) continue
+                        canvas.drawRect(xLeft, yTop, xRight, yBottom, markedPaint)
+                    }
+                }
             }
         }
 
@@ -414,12 +444,15 @@ class MaidenheadGridOverlay : Overlay() {
                 if (xRight < 0f || xLeft > canvas.width) continue
                 val label = cellLabel(lat, lon, zoom)
                 if (showFirstCallLabels) {
-                    // 首通呼号模式: 只有绿格(worked)标注该格第一个通联的呼号,
-                    // 非绿格空着不写网格字符.
-                    if (label in workedGrids) {
-                        firstCallsByGrid[label]?.let { call ->
+                    // 首通呼号模式: 绿格(worked)标注该格第一个通联的呼号, 红格(marked)
+                    // 标注用户标记想通联的呼号, 均淡黄文字; 其它格空着不写网格字符.
+                    when {
+                        label in workedGrids -> firstCallsByGrid[label]?.let { call ->
                             canvas.drawText(call, (xLeft + xRight) / 2f, yCenter, firstCallPaint)
                         }
+                        label in markedGrids -> markedGrids[label]?.firstOrNull()?.let { station ->
+                            canvas.drawText(station.call, (xLeft + xRight) / 2f, yCenter, firstCallPaint)
+                        }
                     }
                 } else {
                     canvas.drawText(label, (xLeft + xRight) / 2f, yCenter, labelPaint)

feature/map/src/main/java/com/rtbishop/look4sat/feature/map/MapScreen.kt

@@ -362,7 +362,8 @@ private fun MapScreen(
                             centerOnStation = shouldCenter,
                             // 首通呼号标签只作用于 VUCC 视图(用户要求); "All"/其他奖状不过滤.
                             showFirstCallLabels = uiState.showFirstCallLabels && selectedAward == AwardType.VUCC,
-                            firstCallsByGrid = firstCallsByGrid
+                            firstCallsByGrid = firstCallsByGrid,
+                            markedGrids = uiState.markedGrids
                         )
                         if (!shouldCenter || uiState.stationPosition != null) {
                             prevGridMode = uiState.isGridMode
@@ -422,15 +423,20 @@ private fun MapScreen(
         }
     }
     // Centered dialog listing the tapped worked grid's confirmed satellite QSOs.
-    // Dismissed by tapping outside (no explicit close button).
+    // Dismissed by tapping outside (no explicit close button). Unworked grids
+    // open the same dialog with an empty list plus a mark-a-station reminder.
     selectedGrid?.let { grid ->
         WorkedGridQsoDialog(
             grid = grid,
             qsos = uiState.workedGridQsos[grid].orEmpty().sortedBy { it.epochMs },
+            marked = uiState.markedGrids[grid].orEmpty(),
             isUtc = uiState.isUtc,
             matchCalculating = matchCalculating,
             onDismiss = { selectedGrid = null },
-            onMatch = { onMatchGrid(grid) }
+            onMatch = { onMatchGrid(grid) },
+            onMark = { call -> onAction(MapAction.SetMarkedStation(grid, call)) },
+            onRemoveMark = { call -> onAction(MapAction.RemoveMarkedStation(grid, call)) },
+            onPinMark = { call -> onAction(MapAction.PinMarkedStation(grid, call)) }
         )
     }
 }
@@ -441,11 +447,17 @@ private fun MapScreen(
 private fun WorkedGridQsoDialog(
     grid: String,
     qsos: List<com.rtbishop.look4sat.core.domain.model.GridQso>,
+    marked: List<com.rtbishop.look4sat.core.domain.model.MarkedStation>,
     isUtc: Boolean,
     matchCalculating: Boolean,
     onDismiss: () -> Unit,
-    onMatch: () -> Unit
+    onMatch: () -> Unit,
+    onMark: (String) -> Unit,
+    onRemoveMark: (String) -> Unit,
+    onPinMark: (String) -> Unit
 ) {
+    var showMarkInput by remember { mutableStateOf(false) }
+    var callInput by remember { mutableStateOf("") }
     androidx.compose.ui.window.Dialog(onDismissRequest = onDismiss) {
         // Centered card, ~85% width, internal scroll for long lists.
         Card(
@@ -497,26 +509,158 @@ private fun WorkedGridQsoDialog(
                     }
                 }
                 androidx.compose.material3.HorizontalDivider()
-                if (qsos.isNotEmpty()) {
-                    // Group by callsign preserving first-contact order (list is
-                    // already sorted oldest-first); expandable rows.
-                    val grouped = remember(qsos) {
-                        qsos.groupBy { it.call }.entries.sortedBy { it.value.first().epochMs }
+                Column(
+                    Modifier
+                        .heightIn(max = 380.dp)
+                        .verticalScroll(rememberScrollState())
+                ) {
+                    // Marked stations show first as red reminder rows: pale-yellow
+                    // callsign, "标记" in the count column, the marking date in the
+                    // date column, a small pin icon (first = pinned, grey; others
+                    // pale yellow) and a delete icon to remove the mark.
+                    val showPin = marked.size > 1
+                    marked.forEachIndexed { index, station ->
+                        MarkedStationRow(
+                            marked = station,
+                            isPinned = index == 0,
+                            showPin = showPin,
+                            isUtc = isUtc,
+                            onRemoveMark = { onRemoveMark(station.call) },
+                            onPinMark = { onPinMark(station.call) }
+                        )
+                        androidx.compose.material3.HorizontalDivider(color = MaterialTheme.colorScheme.outlineVariant.copy(alpha = 0.3f))
                     }
-                    Column(
-                        Modifier
-                            .heightIn(max = 380.dp)
-                            .verticalScroll(rememberScrollState())
-                    ) {
+                    if (qsos.isNotEmpty()) {
+                        // Group by callsign preserving first-contact order (list is
+                        // already sorted oldest-first); expandable rows.
+                        val grouped = remember(qsos) {
+                            qsos.groupBy { it.call }.entries.sortedBy { it.value.first().epochMs }
+                        }
                         grouped.forEach { (call, callQsos) ->
                             WorkedGridCallRow(call, callQsos = callQsos, isUtc = isUtc)
                             androidx.compose.material3.HorizontalDivider(color = MaterialTheme.colorScheme.outlineVariant.copy(alpha = 0.3f))
                         }
                     }
+                    // Unworked grids: offer to mark a station the user wants to
+                    // contact in this grid (a reminder, cleared when worked).
+                    if (qsos.isEmpty()) {
+                        TextButton(
+                            onClick = {
+                                callInput = ""
+                                showMarkInput = true
+                            },
+                            modifier = Modifier.fillMaxWidth()
+                        ) {
+                            Icon(
+                                painter = painterResource(R.drawable.ic_add),
+                                contentDescription = null,
+                                modifier = Modifier.size(18.dp)
+                            )
+                            Spacer(Modifier.width(4.dp))
+                            Text(stringResource(R.string.grid_mark_station))
+                        }
+                    }
                 }
             }
         }
     }
+    // Mark-a-station input dialog: enter a callsign as a reminder.
+    if (showMarkInput) {
+        androidx.compose.material3.AlertDialog(
+            onDismissRequest = { showMarkInput = false },
+            title = { Text(stringResource(R.string.grid_mark_station)) },
+            text = {
+                androidx.compose.material3.OutlinedTextField(
+                    value = callInput,
+                    onValueChange = { callInput = it.uppercase() },
+                    label = { Text(stringResource(R.string.grid_mark_callsign)) },
+                    singleLine = true
+                )
+            },
+            confirmButton = {
+                TextButton(
+                    enabled = callInput.isNotBlank(),
+                    onClick = {
+                        onMark(callInput)
+                        showMarkInput = false
+                    }
+                ) { Text(stringResource(R.string.grid_mark_confirm)) }
+            },
+            dismissButton = {
+                TextButton(onClick = { showMarkInput = false }) { Text(stringResource(R.string.btn_cancel)) }
+            }
+        )
+    }
+}
+
+@Composable
+private fun MarkedStationRow(
+    marked: com.rtbishop.look4sat.core.domain.model.MarkedStation,
+    isPinned: Boolean,
+    showPin: Boolean,
+    isUtc: Boolean,
+    onRemoveMark: () -> Unit,
+    onPinMark: () -> Unit
+) {
+    Row(
+        verticalAlignment = Alignment.CenterVertically,
+        modifier = Modifier.fillMaxWidth().padding(horizontal = 16.dp, vertical = 8.dp)
+    ) {
+        Text(
+            text = marked.call,
+            style = MaterialTheme.typography.titleMedium,
+            fontFamily = androidx.compose.ui.text.font.FontFamily.Monospace,
+            color = ComposeColor(0xFFFFE082),
+            maxLines = 1,
+            overflow = androidx.compose.ui.text.style.TextOverflow.Ellipsis,
+            modifier = Modifier.weight(1f)
+        )
+        // "标记" column: pin icon (only when the grid has multiple marks) sits
+        // left of the label; pinned (first) row's icon is grey, others pale
+        // yellow — tapping moves that mark to the top.
+        Row(
+            verticalAlignment = Alignment.CenterVertically,
+            horizontalArrangement = Arrangement.Center,
+            modifier = Modifier.weight(1f)
+        ) {
+            if (showPin) {
+                Icon(
+                    painter = painterResource(R.drawable.ic_pin),
+                    contentDescription = stringResource(R.string.grid_mark_pin),
+                    tint = if (isPinned) ComposeColor(0xFF9E9E9E) else ComposeColor(0xFFFFE082),
+                    modifier = Modifier
+                        .size(18.dp)
+                        .clickable(onClick = onPinMark)
+                )
+                Spacer(Modifier.width(2.dp))
+            }
+            Text(
+                text = stringResource(R.string.grid_mark_label),
+                style = MaterialTheme.typography.bodySmall,
+                color = MaterialTheme.colorScheme.onSurfaceVariant,
+                textAlign = androidx.compose.ui.text.style.TextAlign.Center
+            )
+        }
+        Row(
+            verticalAlignment = Alignment.CenterVertically,
+            horizontalArrangement = Arrangement.End,
+            modifier = Modifier.weight(1f)
+        ) {
+            Text(
+                text = formatDate(marked.epochMs, isUtc),
+                style = MaterialTheme.typography.bodySmall,
+                color = MaterialTheme.colorScheme.onSurfaceVariant
+            )
+            Icon(
+                painter = painterResource(R.drawable.ic_delete),
+                contentDescription = stringResource(R.string.grid_mark_delete),
+                tint = MaterialTheme.colorScheme.error,
+                modifier = Modifier
+                    .size(18.dp)
+                    .clickable(onClick = onRemoveMark)
+            )
+        }
+    }
 }
 
 @Composable
@@ -944,7 +1088,8 @@ private fun setGridMode(
     stationPosition: GeoPos?,
     centerOnStation: Boolean = false,
     showFirstCallLabels: Boolean = false,
-    firstCallsByGrid: Map<String, String> = emptyMap()
+    firstCallsByGrid: Map<String, String> = emptyMap(),
+    markedGrids: Map<String, List<com.rtbishop.look4sat.core.domain.model.MarkedStation>> = emptyMap()
 ) {
     try {
         val gridOverlay = mapView.overlays[OVERLAY_GRID]
@@ -955,6 +1100,7 @@ private fun setGridMode(
             // 首通呼号模式: 绿格标注第一个通联的呼号, 非绿格不显示标签.
             gridOverlay.showFirstCallLabels = showFirstCallLabels
             gridOverlay.firstCallsByGrid = firstCallsByGrid
+            gridOverlay.markedGrids = markedGrids
             // ownGrid must be set on EVERY update — the position is available
             // regardless of whether this frame centers (centering happens only
             // on entry, but passing null here would wipe the bold outline).
@@ -966,6 +1112,7 @@ private fun setGridMode(
                 this.roamedGrids = roamedGrids
                 this.showFirstCallLabels = showFirstCallLabels
                 this.firstCallsByGrid = firstCallsByGrid
+                this.markedGrids = markedGrids
                 this.ownGrid = ownGridOf(stationPosition)
             }
         }

feature/map/src/main/java/com/rtbishop/look4sat/feature/map/MapState.kt

@@ -34,6 +34,9 @@ data class MapState(
     val workedGridQsos: Map<String, List<com.rtbishop.look4sat.core.domain.model.GridQso>> = emptyMap(),
     /** 4-char gridsquares the station operated from (LoTW MY_GRIDSQUARE) — blue stripes. */
     val roamedGrids: Set<String> = emptySet(),
+    /** Stations the user marked in unworked gridsquares (grid -> ordered list;
+     *  first = pinned/top) — red fill. */
+    val markedGrids: Map<String, List<com.rtbishop.look4sat.core.domain.model.MarkedStation>> = emptyMap(),
     val stationPosition: GeoPos? = null,
     val orbitalPass: OrbitalPass,
     val track: List<List<GeoPos>>? = null,
@@ -52,6 +55,9 @@ sealed interface MapAction {
     data class SelectDefaultItem(val catnum: Int) : MapAction
     data class ToggleGridMode(val value: Boolean) : MapAction
     data class ToggleFirstCallLabels(val value: Boolean) : MapAction
+    data class SetMarkedStation(val grid: String, val call: String) : MapAction
+    data class RemoveMarkedStation(val grid: String, val call: String) : MapAction
+    data class PinMarkedStation(val grid: String, val call: String) : MapAction
     data class SetVisible(val isVisible: Boolean) : MapAction
 }
 

feature/map/src/main/java/com/rtbishop/look4sat/feature/map/MapViewModel.kt

@@ -90,11 +90,19 @@ class MapViewModel(
         }
         viewModelScope.launch {
             settingsRepo.wavelogSettings.collectLatest { _ ->
+                val workedGrids = settingsRepo.getWorkedGrids()
+                val markedGrids = settingsRepo.getMarkedGridStations()
+                // Marked stations auto-clear once their grid becomes worked:
+                // the reminder has served its purpose (user req: 网格变绿后标记自动清除).
+                val stale = markedGrids.keys.filter { it in workedGrids }
+                val activeMarks = if (stale.isEmpty()) markedGrids else markedGrids - stale.toSet()
+                if (stale.isNotEmpty()) settingsRepo.setMarkedGridStations(activeMarks)
                 _uiState.update {
                     it.copy(
-                        workedGrids = settingsRepo.getWorkedGrids(),
+                        workedGrids = workedGrids,
                         workedGridQsos = settingsRepo.getWorkedGridQsos(),
-                        roamedGrids = settingsRepo.getRoamedGrids()
+                        roamedGrids = settingsRepo.getRoamedGrids(),
+                        markedGrids = activeMarks
                     )
                 }
             }
@@ -112,6 +120,38 @@ class MapViewModel(
             is MapAction.SelectDefaultItem -> selectDefaultSatellite(action.catnum)
             is MapAction.ToggleGridMode -> settingsRepo.updateOtherSettings { it.copy(stateOfMapGrid = action.value) }
             is MapAction.ToggleFirstCallLabels -> settingsRepo.updateOtherSettings { it.copy(stateOfMapFirstCall = action.value) }
+            is MapAction.SetMarkedStation -> {
+                val call = action.call.trim().uppercase()
+                val existing = settingsRepo.getMarkedGridStations()
+                val current = existing[action.grid].orEmpty()
+                // 重复呼号忽略: 同一网格已标记过的呼号不再重复添加.
+                val updated = if (current.any { it.call == call }) existing
+                else existing + (action.grid to current + com.rtbishop.look4sat.core.domain.model.MarkedStation(
+                    call = call,
+                    epochMs = System.currentTimeMillis()
+                ))
+                settingsRepo.setMarkedGridStations(updated)
+                _uiState.update { it.copy(markedGrids = updated) }
+            }
+            is MapAction.RemoveMarkedStation -> {
+                val existing = settingsRepo.getMarkedGridStations()
+                val current = existing[action.grid].orEmpty()
+                val remaining = current.filterNot { it.call == action.call }
+                val updated = if (remaining.isEmpty()) existing - action.grid
+                else existing + (action.grid to remaining)
+                settingsRepo.setMarkedGridStations(updated)
+                _uiState.update { it.copy(markedGrids = updated) }
+            }
+            is MapAction.PinMarkedStation -> {
+                val existing = settingsRepo.getMarkedGridStations()
+                val current = existing[action.grid].orEmpty()
+                val target = current.firstOrNull { it.call == action.call }
+                if (target != null) {
+                    val updated = existing + (action.grid to listOf(target) + current.filterNot { it.call == action.call })
+                    settingsRepo.setMarkedGridStations(updated)
+                    _uiState.update { it.copy(markedGrids = updated) }
+                }
+            }
             is MapAction.SetVisible -> isScreenVisible.value = action.isVisible
         }
     }

feature/mutual/src/main/java/com/rtbishop/look4sat/feature/mutual/MutualScreen.kt

@@ -174,6 +174,8 @@ fun MutualScreen(
             onStationBMinElev = viewModel::onStationBMinElev,
             onUseCurrentPosition = viewModel::onUseCurrentPosition,
             onHoursAhead = viewModel::onHoursAhead,
+            onFilterFM = viewModel::onFilterFM,
+            onFilterLinear = viewModel::onFilterLinear,
             onClearError = viewModel::clearError
         )
     }
@@ -197,6 +199,8 @@ private fun MutualContent(
     onStationBMinElev: (Double) -> Unit,
     onUseCurrentPosition: () -> Unit,
     onHoursAhead: (Int) -> Unit,
+    onFilterFM: (Boolean) -> Unit,
+    onFilterLinear: (Boolean) -> Unit,
     onClearError: () -> Unit
 ) {
     val timeFormat = remember(state.isUtc) {
@@ -353,6 +357,10 @@ private fun MutualContent(
             MatchSearchCard(
                 hoursAhead = state.hoursAhead,
                 isCalculating = state.isCalculating,
+                filterFM = state.filterFM,
+                filterLinear = state.filterLinear,
+                onFilterFM = onFilterFM,
+                onFilterLinear = onFilterLinear,
                 onHoursAhead = onHoursAhead,
                 onQuery = onQuery
             )
@@ -570,6 +578,10 @@ private fun StationInputCard(
 private fun MatchSearchCard(
     hoursAhead: Int,
     isCalculating: Boolean,
+    filterFM: Boolean,
+    filterLinear: Boolean,
+    onFilterFM: (Boolean) -> Unit,
+    onFilterLinear: (Boolean) -> Unit,
     onHoursAhead: (Int) -> Unit,
     onQuery: () -> Unit,
     modifier: Modifier = Modifier
@@ -596,6 +608,28 @@ private fun MatchSearchCard(
                     )
                 }
             }
+            // 转发器类型筛选: 只匹配 AMSAT Live 清单里的 FM 话音 / 线性转发器卫星,
+            // 防止选入大量无转发器卫星占用匹配页.
+            Row(
+                modifier = Modifier.fillMaxWidth(),
+                horizontalArrangement = Arrangement.spacedBy(8.dp),
+                verticalAlignment = Alignment.CenterVertically
+            ) {
+                Text(
+                    text = stringResource(R.string.mutual_filter_transponder),
+                    style = MaterialTheme.typography.labelLarge
+                )
+                FilterChip(
+                    selected = filterFM,
+                    onClick = { onFilterFM(!filterFM) },
+                    label = { Text(stringResource(R.string.mutual_filter_fm)) }
+                )
+                FilterChip(
+                    selected = filterLinear,
+                    onClick = { onFilterLinear(!filterLinear) },
+                    label = { Text(stringResource(R.string.mutual_filter_linear)) }
+                )
+            }
             Button(
                 onClick = onQuery,
                 enabled = !isCalculating,

feature/mutual/src/main/java/com/rtbishop/look4sat/feature/mutual/MutualViewModel.kt

@@ -52,6 +52,13 @@ data class MutualUiState(
     val stationBGrid: String = "",
     val stationBMinElev: Double = 10.0,
     val hoursAhead: Int = 24,
+    /** 历史过境回看窗口(小时), 跟随主页面 Passes 设置; 匹配查询从
+     *  now-hoursBefore 开始, 使设置过历史回看时匹配页也包含历史过境. */
+    val hoursBefore: Int = 0,
+    /** 转发器类型筛选: 只匹配搭载 FM 话音转发器的卫星. 默认开启. */
+    val filterFM: Boolean = true,
+    /** 转发器类型筛选: 只匹配搭载线性(USB/LSB/CW/SSB)转发器的卫星. 默认开启. */
+    val filterLinear: Boolean = true,
     val mutualPasses: List<MutualPass> = emptyList(),
     val isCalculating: Boolean = false,
     val hasSearched: Boolean = false,
@@ -108,6 +115,12 @@ class MutualViewModel(
                 _uiState.update { it.copy(isUtc = settings.stateOfUtc) }
             }
         }
+        // 历史过境回看窗口跟随主页面 Passes 设置 (设置里改小时数, 匹配页同步生效)
+        viewModelScope.launch {
+            settingsRepo.passesSettings.collectLatest { settings ->
+                _uiState.update { it.copy(hoursBefore = settings.hoursBefore) }
+            }
+        }
     }
 
     fun onStationALat(value: String) {
@@ -192,6 +205,8 @@ class MutualViewModel(
         ) }
     }
     fun onHoursAhead(value: Int) = _uiState.update { it.copy(hoursAhead = value) }
+    fun onFilterFM(value: Boolean) = _uiState.update { it.copy(filterFM = value) }
+    fun onFilterLinear(value: Boolean) = _uiState.update { it.copy(filterLinear = value) }
     fun onSelectPass(index: Int) = _uiState.update { it.copy(selectedPassIndex = index) }
 
     /**
@@ -255,6 +270,17 @@ class MutualViewModel(
             return
         }
 
+        // 转发器类型筛选: 至少勾选一种(默认 FM + Linear 都开), 否则提示不查询.
+        // 防止用户选入大量无转发器卫星占用匹配页.
+        if (!state.filterFM && !state.filterLinear) {
+            _uiState.update { it.copy(errorMessage = "Select at least one transponder type (FM / Linear) to run the match.") }
+            return
+        }
+        // AMSAT Live 清单(同步自 AMSAT "Live FM/Linear Satellites" 页面)是本过滤的
+        // 权威来源: 只匹配当前在轨且话音/线性转发器实际工作的卫星. 清单为空
+        // (从未成功同步过)时回退到数据库 downlinkMode 过滤, 避免首启匹配页空结果.
+        // 过滤本身在下面的协程里执行 (getSatelliteIdsWithModes 是 suspend).
+
         _uiState.update {
             it.copy(
                 isCalculating = true,
@@ -276,14 +302,35 @@ class MutualViewModel(
         queryGeneration += 1
 
         viewModelScope.launch {
-            val time = System.currentTimeMillis()
+            val now = System.currentTimeMillis()
+            // 转发器类型过滤(协程上下文): AMSAT Live 清单优先, 为空时回退数据库.
+            val amSatFm = settingsRepo.getAmSatFmCatnums()
+            val amSatLinear = settingsRepo.getAmSatLinearCatnums()
+            val filteredSatellites = if (amSatFm.isEmpty() && amSatLinear.isEmpty()) {
+                val filterModes = buildList {
+                    if (state.filterFM) add("FM")
+                    if (state.filterLinear) addAll(listOf("USB", "LSB", "CW", "SSB"))
+                }
+                val idsWithModes = satelliteRepo.getSatelliteIdsWithModes(filterModes)
+                if (idsWithModes.isEmpty()) satellites
+                else satellites.filter { it.data.catnum in idsWithModes }
+            } else {
+                val allowed = buildSet {
+                    if (state.filterFM) addAll(amSatFm)
+                    if (state.filterLinear) addAll(amSatLinear)
+                }
+                satellites.filter { it.data.catnum in allowed }
+            }
+            // 历史回看: 查询窗口起点 = now - hoursBefore (跟随主页面 Passes 设置),
+            // 终点 = now + hoursAhead 不变.
+            val time = now - state.hoursBefore * 60L * 60L * 1000L
             val minElevA = state.stationAMinElev
             val minElevB = state.stationBMinElev
             val hours = state.hoursAhead
 
             val results = try {
                 withContext(computeDispatcher) {
-                    findMutualPasses(satellites, posA, posB, minElevA, minElevB, time, hours)
+                    findMutualPasses(filteredSatellites, posA, posB, minElevA, minElevB, time, hours, state.hoursBefore)
                 }
             } catch (t: Throwable) {
                 // Never leave the query stuck in "calculating" (which would also
@@ -328,15 +375,20 @@ class MutualViewModel(
         satellites: List<OrbitalObject>,
         posA: GeoPos, posB: GeoPos,
         minElevADeg: Double, minElevBDeg: Double,
-        time: Long, hours: Int
+        time: Long, hours: Int, hoursBefore: Int
     ): List<MutualPass> {
-        val endTime = time + hours * 60L * 60L * 1000L
+        // 终点始终是 now + hoursAhead; 起点已由调用方下移 hoursBefore 小时,
+        // 因此这里的 endTime 要在起点之上补回 hoursBefore, 保证窗口 = [now-hb, now+h].
+        val endTime = time + (hoursBefore + hours) * 60L * 60L * 1000L
         val sampleInterval = 5_000L
 
         // Use the main page's pass list for AOS/LOS times, then sample the curves
         // using the actual positions. The passes list is already computed by getLeoPass
         // and its AOS/LOS times match the Passes page exactly.
-        val existingPasses = satelliteRepo.passes.value
+        // The satellites argument may be a subset (transponder-type filter), so
+        // only passes belonging to the filtered satellites are reused.
+        val allowedCatnums = satellites.map { it.data.catnum }.toSet()
+        val existingPasses = satelliteRepo.passes.value.filter { it.catNum in allowedCatnums }
         val results = findMutualPassesFromList(existingPasses, satellites, posA, posB,
             minElevADeg, minElevBDeg, time, endTime, sampleInterval)
         if (results.isNotEmpty()) return results

feature/mutual/src/test/java/com/rtbishop/look4sat/feature/mutual/Fakes.kt

@@ -44,13 +44,18 @@ class FakeSatelliteRepo(
     override suspend fun getTrack(sat: OrbitalObject, pos: GeoPos, start: Long, end: Long): List<OrbitalPos> = TODO()
     override suspend fun getRadios(sat: OrbitalObject, pos: GeoPos, radios: List<SatRadio>, time: Long): List<SatRadio> = TODO()
     override suspend fun getRadiosWithId(id: Int): List<SatRadio> = TODO()
+    override suspend fun getSatelliteIdsWithModes(modes: List<String>): List<Int> = emptyList()
 }
 
 /**
  * Test fake for ISettingsRepo. Only [stationPosition] is backed by mutable
  * state; everything else the ViewModel never touches fails loudly.
  */
-class FakeSettingsRepo(initialPosition: GeoPos = GeoPos(23.13, 113.26)) : ISettingsRepo {
+class FakeSettingsRepo(
+    initialPosition: GeoPos = GeoPos(23.13, 113.26),
+    val amSatFm: Set<Int> = emptySet(),
+    val amSatLinear: Set<Int> = emptySet()
+) : ISettingsRepo {
 
     override val stationPosition = MutableStateFlow(initialPosition)
 
@@ -103,6 +108,10 @@ class FakeSettingsRepo(initialPosition: GeoPos = GeoPos(23.13, 113.26)) : ISetti
 
     override fun updateDataSourcesStatus(status: Map<String, Int>) = TODO()
 
+    override fun getAmSatFmCatnums(): Set<Int> = amSatFm
+    override fun getAmSatLinearCatnums(): Set<Int> = amSatLinear
+    override fun setAmSatCatnums(fmCatnums: Set<Int>, linearCatnums: Set<Int>) = TODO()
+
     override fun updateRadioControlSettings(settings: RadioControlSettings) = TODO()
     override fun getSatelliteOffset(catnum: Int): String = ""
     override fun setSatelliteOffset(catnum: Int, offset: String) = TODO()
@@ -115,6 +124,8 @@ class FakeSettingsRepo(initialPosition: GeoPos = GeoPos(23.13, 113.26)) : ISetti
     override fun setWorkedGridQsos(qsos: Map<String, List<GridQso>>) = TODO()
     override fun getRoamedGrids(): Set<String> = TODO()
     override fun setRoamedGrids(grids: Set<String>) = TODO()
+    override fun getMarkedGridStations(): Map<String, List<com.rtbishop.look4sat.core.domain.model.MarkedStation>> = emptyMap()
+    override fun setMarkedGridStations(stations: Map<String, List<com.rtbishop.look4sat.core.domain.model.MarkedStation>>) = Unit
     override fun updateLoTWSettings(settings: LoTWSettings) = TODO()
     override fun getLastLotwSyncDate(): String = ""
     override fun setLastLotwSyncDate(date: String) = Unit

feature/mutual/src/test/java/com/rtbishop/look4sat/feature/mutual/MutualViewModelTest.kt

@@ -31,10 +31,12 @@ class MutualViewModelTest {
     private fun TestScope.createVm(
         satellites: List<OrbitalObject> = emptyList(),
         passes: List<OrbitalPass> = emptyList(),
-        position: GeoPos = TestOrbits.GUANGZHOU
+        position: GeoPos = TestOrbits.GUANGZHOU,
+        amSatFm: Set<Int> = emptySet(),
+        amSatLinear: Set<Int> = emptySet()
     ): MutualViewModel = MutualViewModel(
         satelliteRepo = FakeSatelliteRepo(satellites, passes),
-        settingsRepo = FakeSettingsRepo(position),
+        settingsRepo = FakeSettingsRepo(position, amSatFm, amSatLinear),
         computeDispatcher = StandardTestDispatcher(mainDispatcherRule.dispatcher.scheduler)
     )
 
@@ -320,4 +322,67 @@ class MutualViewModelTest {
         assertEquals(4, vm.listScrollIndex)
         assertEquals(137, vm.listScrollOffset)
     }
+
+    // --------------------------------------------- transponder filters (AMSAT)
+
+    @Test
+    fun `both filters off sets an error and does not search`() = runTest(mainDispatcherRule.dispatcher.scheduler) {
+        val windows = TestOrbits.findPassWindows()
+        val vm = createVm(satellites = listOf(TestOrbits.ISS), passes = windows)
+        vm.onStationBGrid("OL62")
+        vm.onFilterFM(false)
+        vm.onFilterLinear(false)
+
+        queryAndSettle(vm)
+
+        assertEquals(
+            "Select at least one transponder type (FM / Linear) to run the match.",
+            vm.uiState.value.errorMessage
+        )
+        assertFalse(vm.uiState.value.hasSearched)
+    }
+
+    @Test
+    fun `AMSAT filter restricts results to listed catnums`() = runTest(mainDispatcherRule.dispatcher.scheduler) {
+        val windows = TestOrbits.findPassWindows(hoursAhead = 24) +
+            TestOrbits.findPassWindows(sat = TestOrbits.ISS_VARIANT, hoursAhead = 24)
+        assertTrue("fixture must produce windows", windows.isNotEmpty())
+        // Only ISS (25544) is on the AMSAT live FM list; ISS_VARIANT (25545) is not.
+        val vm = createVm(
+            satellites = listOf(TestOrbits.ISS, TestOrbits.ISS_VARIANT),
+            passes = windows,
+            amSatFm = setOf(25544)
+        )
+        vm.onStationBGrid("OL62")
+        vm.onHoursAhead(24)
+
+        queryAndSettle(vm)
+
+        val state = vm.uiState.value
+        assertNull(state.errorMessage)
+        assertTrue(state.mutualPasses.isNotEmpty())
+        assertTrue("only AMSAT-listed satellites should appear", state.mutualPasses.all { it.catNum == 25544 })
+    }
+
+    @Test
+    fun `AMSAT filter off for one type excludes its satellites`() = runTest(mainDispatcherRule.dispatcher.scheduler) {
+        val windows = TestOrbits.findPassWindows(hoursAhead = 24) +
+            TestOrbits.findPassWindows(sat = TestOrbits.ISS_VARIANT, hoursAhead = 24)
+        // FM filter off, Linear on: neither sat is linear-listed -> nothing matches.
+        val vm = createVm(
+            satellites = listOf(TestOrbits.ISS, TestOrbits.ISS_VARIANT),
+            passes = windows,
+            amSatFm = setOf(25544),
+            amSatLinear = setOf(25545)
+        )
+        vm.onStationBGrid("OL62")
+        vm.onHoursAhead(24)
+        vm.onFilterFM(false)
+
+        queryAndSettle(vm)
+
+        val state = vm.uiState.value
+        assertNull(state.errorMessage)
+        assertTrue("only linear-listed satellites should appear", state.mutualPasses.all { it.catNum == 25545 })
+    }
 }

feature/satellites/src/main/java/com/rtbishop/look4sat/feature/satellites/SatellitesScreen.kt

@@ -177,6 +177,7 @@ private fun SatellitesScreen(
                 )
             }
         }
+        // 转发器/活动筛选已在"卫星类型"对话框前三个选项中体现(AMSAT Live FM/Linear, Live SSTV).
         ElevatedCard(modifier = Modifier.fillMaxSize()) {
             val emptyMessage = stringResource(R.string.sat_empty_list_message)
             when {

gradle/libs.versions.toml

@@ -1,8 +1,8 @@
 [versions]
 #noinspection UnusedVersionCatalogEntry
-appVersionCode = "493"
+appVersionCode = "497"
 #noinspection UnusedVersionCatalogEntry
-appVersionName = "4.4.7-ba7opf.13"
+appVersionName = "4.4.7-ba7opf.15"
 #noinspection UnusedVersionCatalogEntry
 compileSdk = "37"
 #noinspection UnusedVersionCatalogEntry