chore: 统一品牌命名(Ollama 去 Pro 后缀、Codex 去 Plus 后缀)
This commit is contained in:
parent
43d8df90f6
commit
dcc93714be
12
README.en.md
12
README.en.md
@ -5,7 +5,7 @@
|
||||
[](https://github.com/CATMIAOZHI/Rainytoken/actions/workflows/ci.yml)
|
||||
[](https://github.com/CATMIAOZHI/Rainytoken/actions)
|
||||
[](https://github.com/CATMIAOZHI/Rainytoken/releases)
|
||||
Android app for checking AI balance & usage — unified view of DeepSeek, OpenCode Go, CommandCode Go, Codex / ChatGPT Plus, and Ollama Pro balances and usage quotas. Pink-toned brand UI, with companion home screen widgets.
|
||||
Android app for checking AI balance & usage — unified view of DeepSeek, OpenCode Go, CommandCode Go, Codex / ChatGPT, and Ollama balances and usage quotas. Pink-toned brand UI, with companion home screen widgets.
|
||||
RainyToken (雨晴Token) — AI Balance & Usage Quota Query · the Rainy Family tools.
|
||||
|
||||
---
|
||||
@ -16,20 +16,20 @@ RainyToken (雨晴Token) — AI Balance & Usage Quota Query · the Rainy Family
|
||||
<img src="docs/screenshots/dashboard-light.jpg" width="200" alt="Dashboard (light)" />
|
||||
<img src="docs/screenshots/dashboard-dark.jpg" width="200" alt="Dashboard (dark)" />
|
||||
<img src="docs/screenshots/detail.jpg" width="200" alt="Usage charts" />
|
||||
<img src="docs/screenshots/ollama-detail.jpg" width="200" alt="Ollama Pro model call counts" />
|
||||
<img src="docs/screenshots/ollama-detail.jpg" width="200" alt="Ollama model call counts" />
|
||||
</p>
|
||||
|
||||
<p align="center">
|
||||
<em>Dashboard (light) · Dashboard (dark) · Usage charts · Ollama Pro model call counts</em>
|
||||
<em>Dashboard (light) · Dashboard (dark) · Usage charts · Ollama model call counts</em>
|
||||
</p>
|
||||
|
||||
<p align="center">
|
||||
<img src="docs/screenshots/widget.jpg" width="300" alt="Home screen widget" />
|
||||
<img src="docs/screenshots/ollama-card.jpg" width="200" alt="Ollama Pro card" />
|
||||
<img src="docs/screenshots/ollama-card.jpg" width="200" alt="Ollama card" />
|
||||
</p>
|
||||
|
||||
<p align="center">
|
||||
<em>Home screen widget · Ollama Pro home card</em>
|
||||
<em>Home screen widget · Ollama home card</em>
|
||||
</p>
|
||||
|
||||
---
|
||||
@ -63,7 +63,7 @@ RainyToken (雨晴Token) — AI Balance & Usage Quota Query · the Rainy Family
|
||||
|
||||
Download the latest APK from [Releases](https://github.com/CATMIAOZHI/Rainytoken/releases).
|
||||
|
||||
> ⚠️ You need a DeepSeek API Key, OpenCode Go login credentials, CommandCode Go API Key, Codex (OAuth sign-in or pasted auth.json), or an Ollama Pro Cookie to fetch data.
|
||||
> ⚠️ You need a DeepSeek API Key, OpenCode Go login credentials, CommandCode Go API Key, Codex (OAuth sign-in or pasted auth.json), or an Ollama Cookie to fetch data.
|
||||
|
||||
---
|
||||
|
||||
|
||||
12
README.md
12
README.md
@ -5,7 +5,7 @@
|
||||
[](https://github.com/CATMIAOZHI/Rainytoken/actions/workflows/ci.yml)
|
||||
[](https://github.com/CATMIAOZHI/Rainytoken/actions)
|
||||
[](https://github.com/CATMIAOZHI/Rainytoken/releases)
|
||||
Android AI 余额与用量查询 APP —— 统一查看 DeepSeek、OpenCode Go、CommandCode Go、Codex / ChatGPT Plus、Ollama Pro 的余额与用量配额。粉色调品牌 UI,配套桌面小组件。
|
||||
Android AI 余额与用量查询 APP —— 统一查看 DeepSeek、OpenCode Go、CommandCode Go、Codex / ChatGPT、Ollama 的余额与用量配额。粉色调品牌 UI,配套桌面小组件。
|
||||
RainyToken(雨晴Token)— AI Balance & Usage Quota Query · the Rainy Family tools.
|
||||
|
||||
---
|
||||
@ -16,20 +16,20 @@ RainyToken(雨晴Token)— AI Balance & Usage Quota Query · the Rainy Famil
|
||||
<img src="docs/screenshots/dashboard-light.jpg" width="200" alt="仪表盘(亮色)" />
|
||||
<img src="docs/screenshots/dashboard-dark.jpg" width="200" alt="仪表盘(深色)" />
|
||||
<img src="docs/screenshots/detail.jpg" width="200" alt="用量图表" />
|
||||
<img src="docs/screenshots/ollama-detail.jpg" width="200" alt="Ollama Pro 模型调用次数" />
|
||||
<img src="docs/screenshots/ollama-detail.jpg" width="200" alt="Ollama 模型调用次数" />
|
||||
</p>
|
||||
|
||||
<p align="center">
|
||||
<em>仪表盘(亮色) · 仪表盘(深色) · 用量图表 · Ollama Pro 模型调用次数</em>
|
||||
<em>仪表盘(亮色) · 仪表盘(深色) · 用量图表 · Ollama 模型调用次数</em>
|
||||
</p>
|
||||
|
||||
<p align="center">
|
||||
<img src="docs/screenshots/widget.jpg" width="300" alt="桌面小组件" />
|
||||
<img src="docs/screenshots/ollama-card.jpg" width="200" alt="Ollama Pro 卡片" />
|
||||
<img src="docs/screenshots/ollama-card.jpg" width="200" alt="Ollama 卡片" />
|
||||
</p>
|
||||
|
||||
<p align="center">
|
||||
<em>桌面小组件 · Ollama Pro 首页卡片</em>
|
||||
<em>桌面小组件 · Ollama 首页卡片</em>
|
||||
</p>
|
||||
|
||||
---
|
||||
@ -63,7 +63,7 @@ RainyToken(雨晴Token)— AI Balance & Usage Quota Query · the Rainy Famil
|
||||
|
||||
前往 [Releases](https://github.com/CATMIAOZHI/Rainytoken/releases) 下载最新 APK。
|
||||
|
||||
> ⚠️ 需要配置 DeepSeek API Key、OpenCode Go 登录凭据、CommandCode Go API Key、Codex(OAuth 登录或粘贴 auth.json)或 Ollama Pro Cookie 才能拉取数据。
|
||||
> ⚠️ 需要配置 DeepSeek API Key、OpenCode Go 登录凭据、CommandCode Go API Key、Codex(OAuth 登录或粘贴 auth.json)或 Ollama Cookie 才能拉取数据。
|
||||
|
||||
---
|
||||
|
||||
|
||||
@ -15,7 +15,7 @@ import java.security.MessageDigest
|
||||
import java.security.SecureRandom
|
||||
|
||||
/**
|
||||
* Codex / ChatGPT Plus OAuth PKCE 辅助工具。
|
||||
* Codex / ChatGPT OAuth PKCE 辅助工具。
|
||||
*
|
||||
* 参考:7shi/codex-oauth 的 Python 实现,移植到 Kotlin/Android。
|
||||
* 流程:
|
||||
|
||||
@ -23,7 +23,7 @@ import java.util.TimeZone
|
||||
import javax.inject.Singleton
|
||||
|
||||
/**
|
||||
* Ollama Pro Cloud 用量仓库。
|
||||
* Ollama Cloud 用量仓库。
|
||||
*
|
||||
* Ollama 没有公开的 Usage API(见 ollama/ollama#12532),
|
||||
* 本 Repository 通过 OkHttp 搓 Cookie 请求 https://ollama.com/settings,
|
||||
|
||||
@ -155,7 +155,7 @@ object NetworkModule {
|
||||
): DeepSeekRepository = DeepSeekRepository(deepSeekApi, credentialRepository, balanceCache)
|
||||
|
||||
/**
|
||||
* Codex / ChatGPT Plus 额度仓库:用 OkHttp 调 chatgpt.com 后台 API。
|
||||
* Codex / ChatGPT 额度仓库:用 OkHttp 调 chatgpt.com 后台 API。
|
||||
*/
|
||||
@Provides
|
||||
@Singleton
|
||||
@ -166,7 +166,7 @@ object NetworkModule {
|
||||
): CodexRepository = CodexRepository(okHttpClient, credentialRepository, balanceCache)
|
||||
|
||||
/**
|
||||
* Ollama Pro Cloud 用量仓库:Cookie 认证 + OkHttp 抓 settings HTML 解析。
|
||||
* Ollama Cloud 用量仓库:Cookie 认证 + OkHttp 抓 settings HTML 解析。
|
||||
*/
|
||||
@Provides
|
||||
@Singleton
|
||||
|
||||
@ -8,7 +8,7 @@ import kotlinx.serialization.Serializable
|
||||
*
|
||||
* - [ApiKeyCredential] 用于 DeepSeek(API Key 形式)
|
||||
* - [SessionCredential] 用于 OpenCode Zen/Go(用户登录 dashboard 后粘贴的值)
|
||||
* - [CodexCredential] 用于 Codex / ChatGPT Plus(完整 OAuth 凭据,含自动刷新)
|
||||
* - [CodexCredential] 用于 Codex / ChatGPT(完整 OAuth 凭据,含自动刷新)
|
||||
*/
|
||||
@Serializable
|
||||
sealed class Credential {
|
||||
@ -41,15 +41,15 @@ sealed class Credential {
|
||||
val authCookie: String? = null,
|
||||
/** OpenCode Go 专用:workspace ID */
|
||||
val workspaceId: String? = null,
|
||||
/** Ollama Pro 专用:完整的 Cookie 字符串(用户从浏览器 DevTools 复制) */
|
||||
/** Ollama 专用:完整的 Cookie 字符串(用户从浏览器 DevTools 复制) */
|
||||
val ollamaCookie: String? = null,
|
||||
/** OpenCode Go / Ollama Pro 专用:API Key,用于一键激活用量 */
|
||||
/** OpenCode Go / Ollama 专用:API Key,用于一键激活用量 */
|
||||
val apiKey: String? = null,
|
||||
override val lastVerifiedAt: Long = 0L
|
||||
) : Credential()
|
||||
|
||||
/**
|
||||
* 用于 Codex / ChatGPT Plus:完整 OAuth 凭据,支持自动刷新。
|
||||
* 用于 Codex / ChatGPT:完整 OAuth 凭据,支持自动刷新。
|
||||
* 用户从 auth.json 粘贴整个 tokens 对象。
|
||||
*/
|
||||
@Serializable
|
||||
|
||||
@ -18,7 +18,7 @@ enum class ServiceType(
|
||||
COMMANDCODE_GO("CommandCode Go", "commandcode_go"),
|
||||
DEEPSEEK("DeepSeek", "deepseek"),
|
||||
CODEX("Codex / ChatGPT", "codex"),
|
||||
OLLAMA("Ollama Pro", "ollama");
|
||||
OLLAMA("Ollama", "ollama");
|
||||
|
||||
companion object {
|
||||
fun fromStorageKey(key: String): ServiceType? =
|
||||
|
||||
@ -112,7 +112,7 @@ fun ServiceIcon(
|
||||
) {
|
||||
Image(
|
||||
painter = painterResource(id = R.drawable.ic_ollama_logo),
|
||||
contentDescription = "Ollama Pro",
|
||||
contentDescription = "Ollama",
|
||||
modifier = Modifier.fillMaxSize()
|
||||
)
|
||||
}
|
||||
|
||||
@ -146,7 +146,7 @@ fun CredentialEditScreen(
|
||||
)
|
||||
}
|
||||
} else {
|
||||
// Ollama Pro:用户粘贴完整 Cookie 字符串
|
||||
// Ollama:用户粘贴完整 Cookie 字符串
|
||||
if (service == ServiceType.OLLAMA) {
|
||||
OllamaCookieForm(
|
||||
cookie = uiState.ollamaCookie,
|
||||
|
||||
Loading…
Reference in New Issue
Block a user