Skip to content

Commit 297d4c5

Browse files
wty2019wtywty2019wty
committed
Merge branch 'main' of github.com:wty2019wty/Look4Sat_wty into v4.0.2.up
2 parents ed71c81 + e0060d1 commit 297d4c5

File tree

7 files changed

+295
-64
lines changed

7 files changed

+295
-64
lines changed

.github/workflows/release.yml renamed to .github/workflows/release.yml.wtybak

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,21 @@
1-
name: release
1+
name: release wty
22

33
on:
44
push:
55
tags:
66
- v**
77

8+
workflow_dispatch:
9+
inputs:
10+
version:
11+
description: 'Release version (e.g., v4.0.1)'
12+
required: true
13+
default: 'v4.0.1'
14+
type: string
15+
816
env:
917
TAG_NAME: ${{ github.ref_name }}
10-
GITHUB_TOKEN: ${{ secrets.RELEASE_TOKEN }}
18+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
1119

1220
jobs:
1321
release:
@@ -63,6 +71,7 @@ jobs:
6371
mv ${{steps.sign_apk.outputs.signedReleaseFile}} app/build/outputs/apk/release/look4sat.apk
6472
mv ${{steps.sign_bundle.outputs.signedReleaseFile}} app/build/outputs/apk/release/look4sat.aab
6573

74+
<<<<<<< HEAD:.github/workflows/release.yml
6675
- name: Deploy Bundle
6776
uses: r0adkll/upload-google-play@v1
6877
with:
@@ -72,7 +81,9 @@ jobs:
7281
track: production
7382
whatsNewDirectory: fastlane/metadata/android/en-US/whatsnew
7483

84+
=======
85+
>>>>>>> e0060d1c02f8c0bace9c9647267f88c51a41fae9:.github/workflows/release.yml.wtybak
7586
- name: Create Release
7687
run: |
7788
gh release create $TAG_NAME --title=$TAG_NAME --generate-notes
78-
gh release upload $TAG_NAME app/build/outputs/apk/release/look4sat.apk
89+
gh release upload $TAG_NAME app/build/outputs/apk/release/look4sat.apk

‎.github/workflows/release_wty.yml‎

Lines changed: 83 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,83 @@
1+
name: release wty
2+
3+
on:
4+
push:
5+
tags:
6+
- v** # 标签推送触发，匹配v开头的标签
7+
8+
workflow_dispatch:
9+
inputs:
10+
version:
11+
description: 'Release version (e.g., v4.0.1)'
12+
required: true
13+
default: 'v4.0.1'
14+
type: string
15+
16+
env:
17+
# 核心修改1：统一版本号变量，标签推送用原标签名，手动触发用输入的version
18+
TAG_NAME: ${{ github.event_name == 'push' && github.ref_name || github.event.inputs.version }}
19+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
20+
21+
jobs:
22+
release:
23+
runs-on: ubuntu-latest
24+
permissions:
25+
contents: write
26+
steps:
27+
- name: Checkout Repository
28+
uses: actions/checkout@v6
29+
with:
30+
fetch-depth: 0
31+
32+
- name: Setup Java
33+
uses: actions/setup-java@v5
34+
with:
35+
distribution: 'temurin'
36+
java-version: '21'
37+
38+
- name: Setup Gradle
39+
uses: gradle/actions/setup-gradle@v5
40+
41+
- name: Assemble Artifacts
42+
run: |
43+
./gradlew assembleRelease
44+
./gradlew bundleRelease
45+
46+
- name: Sign APK
47+
uses: r0adkll/sign-android-release@v1
48+
id: sign_apk
49+
with:
50+
releaseDirectory: app/build/outputs/apk/release
51+
signingKeyBase64: ${{ secrets.KEY_STORE }}
52+
keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }}
53+
alias: ${{ secrets.KEY_ALIAS }}
54+
keyPassword: ${{ secrets.KEY_PASSWORD }}
55+
env:
56+
BUILD_TOOLS_VERSION: "36.0.0"
57+
58+
- name: Sign Bundle
59+
uses: r0adkll/sign-android-release@v1
60+
id: sign_bundle
61+
with:
62+
releaseDirectory: app/build/outputs/bundle/release
63+
signingKeyBase64: ${{ secrets.KEY_STORE }}
64+
keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }}
65+
alias: ${{ secrets.KEY_ALIAS }}
66+
keyPassword: ${{ secrets.KEY_PASSWORD }}
67+
env:
68+
BUILD_TOOLS_VERSION: "36.0.0"
69+
70+
- name: Rename Artifacts
71+
run: |
72+
# 核心修改2：重命名产物，拼接TAG_NAME版本号到文件名
73+
mv ${{steps.sign_apk.outputs.signedReleaseFile}} app/build/outputs/apk/release/look4sat-${TAG_NAME}.apk
74+
mv ${{steps.sign_bundle.outputs.signedReleaseFile}} app/build/outputs/apk/release/look4sat-${TAG_NAME}.aab
75+
76+
- name: Create Release and Upload Artifacts
77+
run: |
78+
# 核心修改3：统一用TAG_NAME作为Release标签/标题，上传带版本号的产物
79+
gh release create $TAG_NAME --title="$TAG_NAME" --generate-notes
80+
# 上传带版本号的APK
81+
gh release upload $TAG_NAME app/build/outputs/apk/release/look4sat-${TAG_NAME}.apk
82+
# 可选：同时上传带版本号的AAB（建议保留，适配应用商店发布）
83+
gh release upload $TAG_NAME app/build/outputs/apk/release/look4sat-${TAG_NAME}.aab

‎README.md‎

Lines changed: 3 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,7 @@
11
# Look4Sat: Satellite tracker
22

3-
[![Look4Sat CI](https://github.com/rt-bishop/Look4Sat/actions/workflows/release.yml/badge.svg)](https://github.com/rt-bishop/Look4Sat/actions/workflows/release.yml)
43

5-
[<img src="https://play.google.com/intl/en_gb/badges/static/images/badges/en_badge_web_generic.png" alt="Get it on Google Play" height="80">](https://play.google.com/store/apps/details?id=com.rtbishop.look4sat)
6-
[<img src="https://fdroid.gitlab.io/artwork/badge/get-it-on.png" alt="Get it on F-Droid" height="80">](https://f-droid.org/packages/com.rtbishop.look4sat/)
4+
# [cf 反代加速worker.js](/wty_add_whitelist_worker.js)
5+
### 将卫星数据更新添加了代理，方便访问
76

8-
### Radio satellite tracker and pass predictor for Android, inspired by Gpredict
9-
10-
<p float="left">
11-
<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/1.png" width="192"/>
12-
<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/2.png" width="192"/>
13-
<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/3.png" width="192"/>
14-
<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/4.png" width="192">
15-
</p>
16-
17-
### Track satellite passes with ease!
18-
19-
Thanks to [Celestrak](https://celestrak.com/) and [SatNOGS](https://satnogs.org/) you have access to over 9000 active satellites.\
20-
You can search the entire database by NORAD Catalog Number or the satellite's name.
21-
22-
Orbital positions and passes are calculated relative to your location.\
23-
To get reliable data make sure to set the station position via the app Settings.
24-
25-
The application is built using Kotlin, Coroutines, Jetpack Compose and Navigation.\
26-
It is now and always will be completely ad-free and open-source.
27-
28-
## Main features:
29-
30-
* Predicting satellite positions and passes for up to 10 days
31-
* Showing the list of currently active and upcoming satellite passes
32-
* Showing the active pass progress, polar trajectory and transceivers info
33-
* Showing the satellite positional data, footprint and ground track on the map
34-
* Custom TLE satellite data import is available via Three Line Element .txt files
35-
* Offline first: calculations are made offline. Weekly TLE data update is recommended.
7+
### 修改了包名com.rtbishop_wty.look4sat

‎app/build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ android {
1111
namespace = "com.rtbishop.look4sat"
1212
compileSdk = 36
1313
defaultConfig {
14-
applicationId = "com.rtbishop.look4sat"
14+
applicationId = "com.rtbishop_wty.look4sat"
1515
minSdk = 24
1616
versionCode = 402
1717
versionName = "4.0.2"

‎app/src/main/AndroidManifest.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030

3131
<meta-data
3232
android:name="android.telephony.PROPERTY_SATELLITE_DATA_OPTIMIZED"
33-
android:value="com.rtbishop.look4sat" />
33+
android:value="com.rtbishop_wty.look4sat" />
3434

3535
</application>
3636
</manifest>

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

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -18,35 +18,35 @@
1818
package com.rtbishop.look4sat.domain.source
1919

2020
object Sources {
21-
const val RADIO_DATA_URL = "https://db.satnogs.org/api/transmitters/?format=json&status=active"
21+
const val RADIO_DATA_URL = "https://tle.486520.xyz/https://db.satnogs.org/api/transmitters/?format=json&status=active"
2222
val satelliteDataUrls = mapOf(
23-
"All" to "https://celestrak.org/NORAD/elements/gp.php?GROUP=active&FORMAT=csv",
24-
"Amateur" to "https://celestrak.org/NORAD/elements/gp.php?GROUP=amateur&FORMAT=csv",
25-
"Brightest" to "https://celestrak.org/NORAD/elements/gp.php?GROUP=visual&FORMAT=csv",
26-
"Classified" to "https://www.mmccants.org/tles/classfd.zip",
27-
"Cubesat" to "https://celestrak.org/NORAD/elements/gp.php?GROUP=cubesat&FORMAT=csv",
28-
"Education" to "https://celestrak.org/NORAD/elements/gp.php?GROUP=education&FORMAT=csv",
29-
"Engineer" to "https://celestrak.org/NORAD/elements/gp.php?GROUP=engineering&FORMAT=csv",
30-
"Geostationary" to "https://celestrak.org/NORAD/elements/gp.php?GROUP=geo&FORMAT=csv",
31-
"Globalstar" to "https://celestrak.org/NORAD/elements/gp.php?GROUP=globalstar&FORMAT=csv",
32-
"GNSS" to "https://celestrak.org/NORAD/elements/gp.php?GROUP=gnss&FORMAT=csv",
33-
"Intelsat" to "https://celestrak.org/NORAD/elements/gp.php?GROUP=intelsat&FORMAT=csv",
34-
"Iridium" to "https://celestrak.org/NORAD/elements/gp.php?GROUP=iridium-NEXT&FORMAT=csv",
35-
"McCants" to "https://www.mmccants.org/tles/inttles.zip",
36-
"Military" to "https://celestrak.org/NORAD/elements/gp.php?GROUP=military&FORMAT=csv",
37-
"New" to "https://celestrak.org/NORAD/elements/gp.php?GROUP=last-30-days&FORMAT=csv",
38-
"OneWeb" to "https://celestrak.org/NORAD/elements/gp.php?GROUP=oneweb&FORMAT=csv",
39-
"Orbcomm" to "https://celestrak.org/NORAD/elements/gp.php?GROUP=orbcomm&FORMAT=csv",
40-
"R4UAB" to "https://r4uab.ru/satonline.txt",
41-
"Resource" to "https://celestrak.org/NORAD/elements/gp.php?GROUP=resource&FORMAT=csv",
42-
"SatNOGS" to "https://celestrak.org/NORAD/elements/gp.php?GROUP=satnogs&FORMAT=csv",
43-
"Science" to "https://celestrak.org/NORAD/elements/gp.php?GROUP=science&FORMAT=csv",
44-
"Spire" to "https://celestrak.org/NORAD/elements/gp.php?GROUP=spire&FORMAT=csv",
45-
"Starlink" to "https://celestrak.org/NORAD/elements/gp.php?GROUP=starlink&FORMAT=csv",
46-
"Swarm" to "https://celestrak.org/NORAD/elements/gp.php?GROUP=swarm&FORMAT=csv",
47-
"Weather" to "https://celestrak.org/NORAD/elements/gp.php?GROUP=weather&FORMAT=csv",
48-
"X-Comm" to "https://celestrak.org/NORAD/elements/gp.php?GROUP=x-comm&FORMAT=csv",
49-
"Amsat" to "https://amsat.org/tle/current/nasabare.txt",
23+
"All" to "https://tle.486520.xyz/https://celestrak.org/NORAD/elements/gp.php?GROUP=active&FORMAT=csv",
24+
"Amateur" to "https://tle.486520.xyz/https://celestrak.org/NORAD/elements/gp.php?GROUP=amateur&FORMAT=csv",
25+
"Brightest" to "https://tle.486520.xyz/https://celestrak.org/NORAD/elements/gp.php?GROUP=visual&FORMAT=csv",
26+
"Classified" to "https://tle.486520.xyz/https://www.mmccants.org/tles/classfd.zip",
27+
"Cubesat" to "https://tle.486520.xyz/https://celestrak.org/NORAD/elements/gp.php?GROUP=cubesat&FORMAT=csv",
28+
"Education" to "https://tle.486520.xyz/https://celestrak.org/NORAD/elements/gp.php?GROUP=education&FORMAT=csv",
29+
"Engineer" to "https://tle.486520.xyz/https://celestrak.org/NORAD/elements/gp.php?GROUP=engineering&FORMAT=csv",
30+
"Geostationary" to "https://tle.486520.xyz/https://celestrak.org/NORAD/elements/gp.php?GROUP=geo&FORMAT=csv",
31+
"Globalstar" to "https://tle.486520.xyz/https://celestrak.org/NORAD/elements/gp.php?GROUP=globalstar&FORMAT=csv",
32+
"GNSS" to "https://tle.486520.xyz/https://celestrak.org/NORAD/elements/gp.php?GROUP=gnss&FORMAT=csv",
33+
"Intelsat" to "https://tle.486520.xyz/https://celestrak.org/NORAD/elements/gp.php?GROUP=intelsat&FORMAT=csv",
34+
"Iridium" to "https://tle.486520.xyz/https://celestrak.org/NORAD/elements/gp.php?GROUP=iridium-NEXT&FORMAT=csv",
35+
"McCants" to "https://tle.486520.xyz/https://www.mmccants.org/tles/inttles.zip",
36+
"Military" to "https://tle.486520.xyz/https://celestrak.org/NORAD/elements/gp.php?GROUP=military&FORMAT=csv",
37+
"New" to "https://tle.486520.xyz/https://celestrak.org/NORAD/elements/gp.php?GROUP=last-30-days&FORMAT=csv",
38+
"OneWeb" to "https://tle.486520.xyz/https://celestrak.org/NORAD/elements/gp.php?GROUP=oneweb&FORMAT=csv",
39+
"Orbcomm" to "https://tle.486520.xyz/https://celestrak.org/NORAD/elements/gp.php?GROUP=orbcomm&FORMAT=csv",
40+
"R4UAB" to "https://tle.486520.xyz/https://r4uab.ru/satonline.txt",
41+
"Resource" to "https://tle.486520.xyz/https://celestrak.org/NORAD/elements/gp.php?GROUP=resource&FORMAT=csv",
42+
"SatNOGS" to "https://tle.486520.xyz/https://celestrak.org/NORAD/elements/gp.php?GROUP=satnogs&FORMAT=csv",
43+
"Science" to "https://tle.486520.xyz/https://celestrak.org/NORAD/elements/gp.php?GROUP=science&FORMAT=csv",
44+
"Spire" to "https://tle.486520.xyz/https://celestrak.org/NORAD/elements/gp.php?GROUP=spire&FORMAT=csv",
45+
"Starlink" to "https://tle.486520.xyz/https://celestrak.org/NORAD/elements/gp.php?GROUP=starlink&FORMAT=csv",
46+
"Swarm" to "https://tle.486520.xyz/https://celestrak.org/NORAD/elements/gp.php?GROUP=swarm&FORMAT=csv",
47+
"Weather" to "https://tle.486520.xyz/https://celestrak.org/NORAD/elements/gp.php?GROUP=weather&FORMAT=csv",
48+
"X-Comm" to "https://tle.486520.xyz/https://celestrak.org/NORAD/elements/gp.php?GROUP=x-comm&FORMAT=csv",
49+
"Amsat" to "https://tle.486520.xyz/https://amsat.org/tle/current/nasabare.txt",
5050
"Other" to "" // key for sats filter
5151
)
5252
}

0 commit comments

Comments
 (0)