From f463751fb16787218f127743b83f78d64cc9f8ad Mon Sep 17 00:00:00 2001 From: WaterRain <109326062+CATMIAOZHI@users.noreply.github.com> Date: Sat, 1 Aug 2026 20:32:27 +0000 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=97=A5=E6=9C=9F=E6=A0=BC=E5=BC=8F?= =?UTF-8?q?=E4=B8=8E=E5=BA=94=E7=94=A8=E5=86=85=E8=AF=AD=E8=A8=80=E5=90=8C?= =?UTF-8?q?=E6=AD=A5=20+=20DeepSeek=20=E6=A0=87=E7=AD=BE=E5=8A=A8=E6=80=81?= =?UTF-8?q?=E5=8C=96=EF=BC=88Codex=20review=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/rainy/token/ui/dashboard/UsageOverviewScreen.kt | 8 ++++++-- .../com/rainy/token/ui/widget/OpenCodeGoWidgetProvider.kt | 3 +++ app/src/main/res/layout-night/widget_opencode_go.xml | 1 + app/src/main/res/layout/widget_opencode_go.xml | 1 + 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/rainy/token/ui/dashboard/UsageOverviewScreen.kt b/app/src/main/java/com/rainy/token/ui/dashboard/UsageOverviewScreen.kt index 03db324..463adda 100644 --- a/app/src/main/java/com/rainy/token/ui/dashboard/UsageOverviewScreen.kt +++ b/app/src/main/java/com/rainy/token/ui/dashboard/UsageOverviewScreen.kt @@ -40,6 +40,7 @@ import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color +import androidx.compose.ui.platform.LocalConfiguration import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.dp @@ -257,8 +258,11 @@ fun UsageOverviewScreen( @Composable private fun DailyDetailRow(day: com.rainy.token.data.local.DailyStats) { val datePattern = stringResource(R.string.date_format_md) - // 跟随系统语言（Locale.getDefault()），保证英文环境下日期符号与资源同语言 - val utcFmt = remember(datePattern, Locale.getDefault()) { SimpleDateFormat(datePattern, Locale.getDefault()).apply { timeZone = java.util.TimeZone.getTimeZone("UTC") } } + // 从当前资源 configuration 取 locale（跟随应用内语言切换）， + // 不能依赖 Locale.getDefault()：LocaleManager 只覆写 activity Configuration，不改变 JVM 默认 locale + val configuration = LocalConfiguration.current + val activeLocale = remember(configuration) { configuration.locales[0] } + val utcFmt = remember(datePattern, activeLocale) { SimpleDateFormat(datePattern, activeLocale).apply { timeZone = java.util.TimeZone.getTimeZone("UTC") } } Card(Modifier.fillMaxWidth(), RoundedCornerShape(12.dp), CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.surface)) { Row(Modifier.fillMaxWidth().padding(12.dp), verticalAlignment = Alignment.CenterVertically) { Text(utcFmt.format(Date(day.dayTs)), style = MaterialTheme.typography.bodyMedium, fontWeight = FontWeight.Medium, modifier = Modifier.weight(1f)) diff --git a/app/src/main/java/com/rainy/token/ui/widget/OpenCodeGoWidgetProvider.kt b/app/src/main/java/com/rainy/token/ui/widget/OpenCodeGoWidgetProvider.kt index f9f3dfb..99d974d 100644 --- a/app/src/main/java/com/rainy/token/ui/widget/OpenCodeGoWidgetProvider.kt +++ b/app/src/main/java/com/rainy/token/ui/widget/OpenCodeGoWidgetProvider.kt @@ -64,6 +64,9 @@ class OpenCodeGoWidgetProvider : AppWidgetProvider() { // 避免 XML 静态文本由宿主进程按系统语言渲染造成中英混搭 views.setTextViewText(R.id.widget_brand, context.getString(R.string.widget_brand)) + // DeepSeek 余额标签同样动态设置（静态 XML 文本由 Launcher 按系统语言解析） + views.setTextViewText(R.id.widget_ds_label, context.getString(R.string.widget_deepseek_balance)) + // 点击左上角品牌 → 打开 APP；点击其它内容区域 → 切换服务；刷新按钮单独刷新。 val openAppIntent = Intent(context, MainActivity::class.java).apply { flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP diff --git a/app/src/main/res/layout-night/widget_opencode_go.xml b/app/src/main/res/layout-night/widget_opencode_go.xml index 01e6fa9..a686d54 100644 --- a/app/src/main/res/layout-night/widget_opencode_go.xml +++ b/app/src/main/res/layout-night/widget_opencode_go.xml @@ -195,6 +195,7 @@ android:adjustViewBounds="true" android:layout_marginEnd="5dp" />