Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -408,6 +408,14 @@ private fun timeText(ms: Long): String =
SimpleDateFormat("HH:mm", Locale.US).format(Date(ms))

private fun dayLabel(dateKey: String): String {
// dailyEntries 的 key 是「日」数字(如 "16",供图表坐标标签),这里按当月渲染;
// 兼容完整日期 key("2026-08-16")——A4 真机曾因用 yyyy-MM-dd 解析 "16" 崩溃(ParseException)
val dayOnly = dateKey.toIntOrNull()
if (dayOnly != null) {
val cal = Calendar.getInstance()
cal.set(Calendar.DAY_OF_MONTH, dayOnly)
return (cal.get(Calendar.MONTH) + 1).toString() + "月" + dayOnly.toString() + "日"
}
val f = dayFormatter
val date = f.parse(dateKey) ?: return dateKey
val cal = Calendar.getInstance().apply { time = date }
Expand Down
29 changes: 22 additions & 7 deletions android/app/src/main/kotlin/com/deepseek/meter/app/LoginScreen.kt
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,19 @@ class TokenLoginWebView(
/** popup 的关闭按钮(第三方 IdP 拒绝 embedded WebView 时给用户的明确出口) */
private var popupCloseButton: AndroidButton? = null

// 注意:以下状态字段必须先于 init 初始化——init 会调用 startPolling(),
// 若声明在 init 之后,轮询 Timer 在登录页首次打开时仍为 null(真机发现:A3 遗留的 NPE 崩溃)
private val pollTimer = Timer()
private var isChecking = false
private var isValidating = false
private var tokenReceived = false
private var lastSignature = ""
private var polling = true
// 看门狗代数:evaluateJavascript / 校验回调在页面导航期间可能丢失(真机发现),
// 用代数区分过期回调,配合 postDelayed 复位,防止轮询永久卡死
private var checkGeneration = 0
private var validateGeneration = 0

init {
settings.javaScriptEnabled = true
settings.domStorageEnabled = true
Expand All @@ -182,13 +195,6 @@ class TokenLoginWebView(
startPolling()
}

private val pollTimer = Timer()
private var isChecking = false
private var isValidating = false
private var tokenReceived = false
private var lastSignature = ""
private var polling = true

private fun startPolling() {
pollTimer.schedule(object : TimerTask() {
override fun run() {
Expand Down Expand Up @@ -225,9 +231,14 @@ class TokenLoginWebView(
onStatus("请在官方登录页登录…")
return
}
val gen = ++checkGeneration
isChecking = true
// 看门狗:页面导航期间 evaluateJavascript 回调可能丢失,5 秒未归则复位 isChecking,
// 下一个轮询周期(1.5s)会重试,而不是永久卡死
postDelayed({ if (gen == checkGeneration) isChecking = false }, 5000)
val js = "(function() { try { var pairs = {}; for (var i = 0; i < localStorage.length; i++) { var k = localStorage.key(i); pairs[k] = localStorage.getItem(k); } return JSON.stringify({ ok: true, data: pairs }); } catch (e) { return JSON.stringify({ ok: false, error: String(e) }); } })()"
evaluateJavascript(js) { result ->
if (gen != checkGeneration) return@evaluateJavascript
isChecking = false
if (tokenReceived || isValidating) return@evaluateJavascript
if (result == null || result == "null") {
Expand Down Expand Up @@ -263,8 +274,12 @@ class TokenLoginWebView(
/// 逐候选交给 AppModel 原生侧校验(内部 fetchCurrentUser)
private fun validate(candidates: List<String>, index: Int) {
if (tokenReceived || index >= candidates.size) return
val gen = ++validateGeneration
isValidating = true
// 看门狗:校验链路(单线程执行器 + 网络请求)极端情况下最长约 90 秒,兜底复位防卡死
postDelayed({ if (gen == validateGeneration) isValidating = false }, 90000)
onToken(candidates[index]) { ok ->
if (gen != validateGeneration) return@onToken
isValidating = false
if (ok) {
tokenReceived = true
Expand Down
Loading