Compare commits

...
Author SHA1 Message Date
atsunatsu d13af978af build: release version 4.4.8-ba7opf.2.4 (549) 2026-09-29 17:58:10 +08:00
atsunatsu b48e23804f feat(radar): 生成通联记录帖子只含当前过境窗口
generatePost 的筛选从最近 24 小时改为当前过境窗口(aos..los),
与日志列表 recent 同一套过滤逻辑,不再混入其他过境的 QSO
2026-09-29 17:58:07 +08:00
atsunatsu a2b3ce5d69 docs: 补充第三方声明(MIT 合规)
- GridGeometry.kt 头部注明移植自 OrbitDeckiOS(Paul Stoetzer, N8HM, MIT)
- 新增 THIRD_PARTY_NOTICES.md:OrbitDeckiOS (MIT) + Material Design Icons (Apache-2.0)
2026-09-29 15:45:55 +08:00
5 changed files with 57 additions and 7 deletions

No files matched your search

+46
View File
@@ -0,0 +1,46 @@
# Third-Party Notices
Look4Sat-BA7OPF (this fork) bundles or adapts the following third-party
components:
## OrbitDeckiOS
- Source: https://github.com/prstoetzer/OrbitDeckiOS
- Copyright (c) 2025 Paul Stoetzer, N8HM
- License: MIT
- Used for: the Grid Finder feature — the VUCC grid line / grid point
geometry in `core/domain/.../utility/GridGeometry.kt` is ported from
OrbitDeckiOS' GridGeometry.
### MIT License
```
MIT License
Copyright (c) 2025 Paul Stoetzer, N8HM
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
```
## Material Design Icons
- Source: https://materialdesignicons.com (Pictogrammers)
- License: Apache-2.0
- Used for: `core/presentation/src/main/res/drawable/ic_grid_finder.xml`
(crosshairs-gps icon). Attribution is also noted in the icon file header.
@@ -14,6 +14,10 @@
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*
* Contains code ported from OrbitDeckiOS (https://github.com/prstoetzer/OrbitDeckiOS),
* Copyright (c) 2025 Paul Stoetzer, N8HM, licensed under the MIT License.
* See THIRD_PARTY_NOTICES.md for the full MIT license text.
*/
package com.rtbishop.look4sat.core.domain.utility
@@ -178,7 +178,7 @@ fun LogPage(
Row(horizontalArrangement = Arrangement.spacedBy(6.dp), modifier = Modifier.fillMaxWidth()) {
OutlinedButton(
onClick = { logViewModel.generatePost(satName, maxElev) },
onClick = { logViewModel.generatePost(satName, maxElev, passWindow) },
enabled = recent.isNotEmpty(),
modifier = Modifier.weight(1f)
) { Text("生成通联记录", fontSize = 13.sp) }
@@ -142,16 +142,16 @@ class LogViewModel(
*/
fun updateRecord(record: QsoRecord) = viewModelScope.launch { qsoRepository.save(record) }
/** English social post from the recorded QSOs of the current satellite (last 24h). */
fun generatePost(satName: String, maxElev: Double) {
/** English social post from the recorded QSOs of the current satellite.
* Same window logic as the on-screen list: only the current pass (aos..los). */
fun generatePost(satName: String, maxElev: Double, passWindow: ClosedRange<Long>?) {
viewModelScope.launch {
val now = System.currentTimeMillis()
// Records carry the ARRL name while the pass carries the tracker's name, so the
// operator's own contacts are collected by identity, not by the raw name.
val identity = satelliteIdentity(satName)
val list = qsoRepository.records.first()
.filter { satelliteIdentity(it.satelliteName) == identity }
.filter { it.startUtcMillis > now - 24 * 3_600_000L }
.filter { passWindow?.contains(it.startUtcMillis) == true }
.sortedBy { it.startUtcMillis }
if (list.isEmpty()) return@launch
val shortName = officialSatelliteName(satName).substringBefore('(').trim().uppercase(Locale.US)
+2 -2
View File
@@ -1,8 +1,8 @@
[versions]
#noinspection UnusedVersionCatalogEntry
appVersionCode = "548"
appVersionCode = "549"
#noinspection UnusedVersionCatalogEntry
appVersionName = "4.4.8-ba7opf.2.3"
appVersionName = "4.4.8-ba7opf.2.4"
#noinspection UnusedVersionCatalogEntry
compileSdk = "37"
#noinspection UnusedVersionCatalogEntry