mirror of
https://github.com/atsunatsu/Look4Sat.git
synced 2026-10-02 03:15:37 +00:00
feat(gridfinder): VUCC 网格寻线实地导航 + LoTW 上传台址预填联动 + 移除地图入口
- GridGeometry 网格线/点几何 + QthConverter grid4/grid8；golden vectors 单测 - 独立定位流 ILocationRepo/LocationRepo（stop 时 removeUpdates），不自动写台址 - feature/gridfinder 模块：罗盘表盘、极坐标近距图、线上/点上精度门控（连续 3 次 ≤6.1m） - 「设为 LoTW 上传台址」：跳证书配置页并预填当前网格（1/2/4 格），只改台站 grid 字段 - 地图页入口移除，设置页单入口；顶部间距改 ScreenColumn 结构（与设置页同构） - 术语统一「最近网格点」（中英）
This commit is contained in:
atsunatsu committed
1 parent
33a7f23d7a
commit
4c3fdeaa9c
25 files changed
+2156
-9
No files matched your search
@@ -45,6 +45,14 @@ sealed class Screen(val iconResId: Int, val titleResId: Int) : NavKey {
|
||||
@Serializable
|
||||
data object RadarDestination : NavKey
|
||||
|
||||
/** Full-screen field tool: guides the operator onto a VUCC grid line or corner. */
|
||||
@Serializable
|
||||
data object GridFinderDestination : NavKey
|
||||
|
||||
/** LoTW upload certificate + station location page, reached from the Grid Finder. */
|
||||
@Serializable
|
||||
data object LoTWUploadDestination : NavKey
|
||||
|
||||
interface IDeeplinkMatcher {
|
||||
fun match(deeplink: String): NavKey?
|
||||
}
|
||||
|
||||
@@ -0,0 +1,13 @@
|
||||
<!--
|
||||
Grid Finder icon: a GPS crosshair.
|
||||
Ported from Material Design Icons (crosshairs-gps), Apache License 2.0.
|
||||
-->
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="24dp"
|
||||
android:height="24dp"
|
||||
android:viewportWidth="24"
|
||||
android:viewportHeight="24">
|
||||
<path
|
||||
android:fillColor="@android:color/white"
|
||||
android:pathData="M12,8A4,4 0 0,1 16,12A4,4 0 0,1 12,16A4,4 0 0,1 8,12A4,4 0 0,1 12,8M3.05,13H1V11H3.05C3.5,6.83 6.83,3.5 11,3.05V1H13V3.05C17.17,3.5 20.5,6.83 20.95,11H23V13H20.95C20.5,17.17 17.17,20.5 13,20.95V23H11V20.95C6.83,20.5 3.5,17.17 3.05,13M12,5A7,7 0 0,0 5,12A7,7 0 0,0 12,19A7,7 0 0,0 19,12A7,7 0 0,0 12,5Z" />
|
||||
</vector>
|
||||
@@ -416,4 +416,61 @@
|
||||
<string name="qso_edit_satellite_official">保存并签名时使用 %1$s</string>
|
||||
<string name="qso_edit_warn_no_freq">没有上行频率：LoTW 要求 BAND，补上频率前这条无法上传</string>
|
||||
|
||||
<!-- 网格寻线（VUCC 网格线／网格角实地导航） -->
|
||||
<string name="gridfinder_title">网格寻线</string>
|
||||
<string name="gridfinder_status_corner">位于网格点上</string>
|
||||
<string name="gridfinder_status_line">位于网格线上</string>
|
||||
<string name="gridfinder_status_inside">在网格内部</string>
|
||||
<string name="gridfinder_status_unknown">位置不可用</string>
|
||||
<string name="gridfinder_status_waiting">正在获取定位…</string>
|
||||
<string name="gridfinder_status_blocked">需要定位权限</string>
|
||||
<string name="gridfinder_status_disabled">本机定位服务未开启</string>
|
||||
<string name="gridfinder_status_confirmed">已由 %1$d 次连续满足 20 英尺规则的定位确认</string>
|
||||
<string name="gridfinder_status_unconfirmed">尚未确认：精度达 6.1 m 的连续定位 %1$d/%2$d 次</string>
|
||||
<string name="gridfinder_grant_permission">授予定位权限</string>
|
||||
<string name="gridfinder_card_location">位置</string>
|
||||
<string name="gridfinder_card_corner">最近网格点引导</string>
|
||||
<string name="gridfinder_card_line">最近网格线引导</string>
|
||||
<string name="gridfinder_card_lines">两条边界线</string>
|
||||
<string name="gridfinder_card_map">近距离网格图</string>
|
||||
<string name="gridfinder_card_fix">定位质量</string>
|
||||
<string name="gridfinder_card_compass">罗盘</string>
|
||||
<string name="gridfinder_label_claimable">此处可计分的网格</string>
|
||||
<string name="gridfinder_label_grid4">网格 (4)</string>
|
||||
<string name="gridfinder_label_grid6">网格 (6)</string>
|
||||
<string name="gridfinder_label_grid8">网格 (8)</string>
|
||||
<string name="gridfinder_label_latitude">纬度</string>
|
||||
<string name="gridfinder_label_longitude">经度</string>
|
||||
<string name="gridfinder_label_altitude">海拔</string>
|
||||
<string name="gridfinder_label_accuracy">水平精度</string>
|
||||
<string name="gridfinder_label_fix_age">定位时刻</string>
|
||||
<string name="gridfinder_label_provider">定位来源</string>
|
||||
<string name="gridfinder_value_provider_on">已开启</string>
|
||||
<string name="gridfinder_value_provider_off">未开启</string>
|
||||
<string name="gridfinder_label_distance">距离</string>
|
||||
<string name="gridfinder_label_bearing">方位角</string>
|
||||
<string name="gridfinder_label_direction">方向</string>
|
||||
<string name="gridfinder_label_grids">网格</string>
|
||||
<string name="gridfinder_label_lat_line">纬线</string>
|
||||
<string name="gridfinder_label_lon_line">经线</string>
|
||||
<string name="gridfinder_line_value">位于%2$s方向 %1$s</string>
|
||||
<string name="gridfinder_line_latitude">这是纬度边界，东西走向</string>
|
||||
<string name="gridfinder_line_longitude">这是经度边界，南北走向</string>
|
||||
<string name="gridfinder_label_heading">朝向</string>
|
||||
<string name="gridfinder_label_compass_accuracy">罗盘精度</string>
|
||||
<string name="gridfinder_action_set_station">设为我的台址</string>
|
||||
<string name="gridfinder_action_station_saved">台址已更新 —— 过境预报将使用这个位置</string>
|
||||
<string name="gridfinder_action_calibrate">校准罗盘</string>
|
||||
<string name="gridfinder_map_legend">中心点是你的位置，虚线是正北与正东，直线是两条网格边界，绿点是最近的网格点，圆环是最近网格线的垂足，红色指针是你的朝向</string>
|
||||
<string name="gridfinder_compass_disabled_hint">设置里未开启罗盘，表盘按正北朝上显示。方位角数字仍可引导你</string>
|
||||
<string name="gridfinder_compass_unavailable_hint">本机没有磁力传感器 —— 请按方位角数字导航</string>
|
||||
<string name="gridfinder_compass_hint">请平持手机，箭头指向应走的方向</string>
|
||||
<string name="gridfinder_vucc_rule_note">VUCC 20 英尺规则：%1$.1f m</string>
|
||||
<string name="gridfinder_direction_north">北</string>
|
||||
<string name="gridfinder_direction_south">南</string>
|
||||
<string name="gridfinder_direction_east">东</string>
|
||||
<string name="gridfinder_direction_west">西</string>
|
||||
<string name="gridfinder_action_set_lotw_station">设为 LoTW 上传台址（%1$s）</string>
|
||||
<string name="gridfinder_lotw_station_hint">预填上传台站网格：上传时 LoTW 按这些格记录（线上 2 格、角上 4 格）；证书呼号保持不变。</string>
|
||||
|
||||
</resources>
|
||||
@@ -444,4 +444,61 @@ Upstream: https://github.com/rt-bishop/Look4Sat</string>
|
||||
<string name="qso_edit_satellite_official">Saved and signed as %1$s</string>
|
||||
<string name="qso_edit_warn_no_freq">No uplink frequency: LoTW requires a band, so this QSO cannot be uploaded yet</string>
|
||||
|
||||
<!-- Grid Finder (VUCC grid line / corner field guide) -->
|
||||
<string name="gridfinder_title">Grid Finder</string>
|
||||
<string name="gridfinder_status_corner">ON GRID POINT</string>
|
||||
<string name="gridfinder_status_line">ON GRID LINE</string>
|
||||
<string name="gridfinder_status_inside">INSIDE GRID</string>
|
||||
<string name="gridfinder_status_unknown">Position unavailable</string>
|
||||
<string name="gridfinder_status_waiting">Waiting for a fix…</string>
|
||||
<string name="gridfinder_status_blocked">Location permission required</string>
|
||||
<string name="gridfinder_status_disabled">Location services are off on this device</string>
|
||||
<string name="gridfinder_status_confirmed">Confirmed by %1$d consecutive fixes inside the 20 ft rule</string>
|
||||
<string name="gridfinder_status_unconfirmed">Not confirmed yet: %1$d of %2$d consecutive fixes good to 6.1 m</string>
|
||||
<string name="gridfinder_grant_permission">Grant location access</string>
|
||||
<string name="gridfinder_card_location">Location</string>
|
||||
<string name="gridfinder_card_corner">Guide to the nearest grid point</string>
|
||||
<string name="gridfinder_card_line">Guide to the nearest grid line</string>
|
||||
<string name="gridfinder_card_lines">Both boundary lines</string>
|
||||
<string name="gridfinder_card_map">Close-up grid map</string>
|
||||
<string name="gridfinder_card_fix">Fix quality</string>
|
||||
<string name="gridfinder_card_compass">Compass</string>
|
||||
<string name="gridfinder_label_claimable">VUCC grids here</string>
|
||||
<string name="gridfinder_label_grid4">Grid (4)</string>
|
||||
<string name="gridfinder_label_grid6">Grid (6)</string>
|
||||
<string name="gridfinder_label_grid8">Grid (8)</string>
|
||||
<string name="gridfinder_label_latitude">Latitude</string>
|
||||
<string name="gridfinder_label_longitude">Longitude</string>
|
||||
<string name="gridfinder_label_altitude">Altitude</string>
|
||||
<string name="gridfinder_label_accuracy">Horizontal accuracy</string>
|
||||
<string name="gridfinder_label_fix_age">Fix age</string>
|
||||
<string name="gridfinder_label_provider">Location provider</string>
|
||||
<string name="gridfinder_value_provider_on">On</string>
|
||||
<string name="gridfinder_value_provider_off">Off</string>
|
||||
<string name="gridfinder_label_distance">Distance</string>
|
||||
<string name="gridfinder_label_bearing">Bearing</string>
|
||||
<string name="gridfinder_label_direction">Direction</string>
|
||||
<string name="gridfinder_label_grids">Grids</string>
|
||||
<string name="gridfinder_label_lat_line">Latitude line</string>
|
||||
<string name="gridfinder_label_lon_line">Longitude line</string>
|
||||
<string name="gridfinder_line_value">%1$s to the %2$s</string>
|
||||
<string name="gridfinder_line_latitude">This is the latitude boundary, which runs east to west</string>
|
||||
<string name="gridfinder_line_longitude">This is the longitude boundary, which runs north to south</string>
|
||||
<string name="gridfinder_label_heading">Heading</string>
|
||||
<string name="gridfinder_label_compass_accuracy">Compass accuracy</string>
|
||||
<string name="gridfinder_action_set_station">Set as my station</string>
|
||||
<string name="gridfinder_action_station_saved">Station position updated — pass predictions now use this fix</string>
|
||||
<string name="gridfinder_action_calibrate">Calibrate compass</string>
|
||||
<string name="gridfinder_map_legend">The centre dot is you, dashed axes are north and east, the straight lines are the two grid boundaries, the green dot is the nearest grid point, the ring is the closest point of the nearest line and the red needle is your heading</string>
|
||||
<string name="gridfinder_compass_disabled_hint">The compass is switched off in Settings, so the dials stay north-up. The bearing numbers still guide you</string>
|
||||
<string name="gridfinder_compass_unavailable_hint">This device has no magnetic sensor — navigate with the bearing numbers</string>
|
||||
<string name="gridfinder_compass_hint">Hold the phone flat; the arrow points the way to walk</string>
|
||||
<string name="gridfinder_vucc_rule_note">VUCC 20 ft rule: %1$.1f m</string>
|
||||
<string name="gridfinder_direction_north">north</string>
|
||||
<string name="gridfinder_direction_south">south</string>
|
||||
<string name="gridfinder_direction_east">east</string>
|
||||
<string name="gridfinder_direction_west">west</string>
|
||||
<string name="gridfinder_action_set_lotw_station">Set as LoTW station (%1$s)</string>
|
||||
<string name="gridfinder_lotw_station_hint">Prefills the upload station grid — LoTW then records these squares (2 on a line, 4 on a corner). The certificate callsign stays unchanged.</string>
|
||||
|
||||
</resources>
|
||||
Reference in new issue
Block a user