fix: 13项数据存储与排行榜修复
致命修复:
- leaderboard: 日榜日期比较改用 dateOnly() 替代严格全等
- plan: 计划天数计算日期比较改用 dateOnly()
- cloud: pullAll 添加 orderBy('updatedAt','desc') 确保取最新文档避免数据丢失
严重修复:
- cloud: 新增 cancelPendingPush() 防止清除数据后被延迟推送复活
- settings: _doClearData 补充 user_profile 清除, 先取消推送再清除
- app: 云端同步改为时间戳比对策略, 支持跨设备拉取
- app: _restoreFromCloud 增加空数据保护和 profile 恢复
- storage: 记录ID改用时间戳+自增计数器确保唯一性
中等修复:
- cloud: init/_fetchOpenid 日志升级, 新增 syncStatus getter
- leaderboard云函数: 添加90天活跃过滤减少全表扫描
- storage: validateStreak 增加lastDate无记录时的通用修复
- leaderboard页面: 云函数失败时Toast提示用户而非静默降级
轻微修复:
- timer: onUnload 添加 voice.destroy() 释放音频上下文
- records: onLongPressDelete 委托给 onDeleteRecord 消除重复代码
Co-Authored-By: Claude <noreply@anthropic.com>
This commit is contained in:
+34
-4
@@ -24,8 +24,10 @@ const init = () => {
|
||||
try {
|
||||
wx.cloud.init({ env: ENV_ID, traceUser: true })
|
||||
_enabled = true
|
||||
console.log('[cloud] init ok, env:', ENV_ID)
|
||||
} catch (e) {
|
||||
_enabled = false
|
||||
console.warn('[cloud] init failed — cloud sync disabled:', e.message || e)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -40,10 +42,13 @@ const pullAll = async () => {
|
||||
}
|
||||
if (!_openid) return null // cloud function call failed; bail
|
||||
|
||||
// Locate our doc by _openid, not by limit(1) which can pick someone
|
||||
// else's doc when the custom rule is in effect.
|
||||
// Locate our doc by _openid, ordered by updatedAt descending so
|
||||
// we always get the MOST RECENT doc. Without orderBy, limit(1)
|
||||
// returns the OLDEST doc (_id ascending), which causes data loss
|
||||
// when duplicate docs exist from the old cold-start-add() bug.
|
||||
const mine = await db.collection(DB_COLLECTION)
|
||||
.where({ _openid: _openid })
|
||||
.orderBy('updatedAt', 'desc')
|
||||
.limit(1)
|
||||
.get()
|
||||
if (mine && mine.data && mine.data.length > 0) {
|
||||
@@ -67,7 +72,10 @@ const _fetchOpenid = async () => {
|
||||
try {
|
||||
const res = await wx.cloud.callFunction({ name: 'getOpenid' })
|
||||
if (res && res.result && res.result.openid) return res.result.openid
|
||||
} catch (e) { /* function not deployed, etc. */ }
|
||||
console.warn('[cloud] getOpenid returned no openid:', JSON.stringify(res))
|
||||
} catch (e) {
|
||||
console.warn('[cloud] getOpenid call failed — cloud functions may not be deployed:', e.message || e)
|
||||
}
|
||||
return null
|
||||
}
|
||||
|
||||
@@ -111,6 +119,17 @@ const pushAll = () => {
|
||||
})
|
||||
}
|
||||
|
||||
const cancelPendingPush = () => {
|
||||
if (_pushTimer) {
|
||||
clearTimeout(_pushTimer)
|
||||
_pushTimer = null
|
||||
}
|
||||
}
|
||||
|
||||
const _markSynced = () => {
|
||||
try { wx.setStorageSync('_cloud_sync_at', Date.now()) } catch (e) {}
|
||||
}
|
||||
|
||||
const _doPush = async () => {
|
||||
console.log('[cloud] _doPush starting...')
|
||||
const db = getDb()
|
||||
@@ -135,6 +154,7 @@ const _doPush = async () => {
|
||||
try {
|
||||
await db.collection(DB_COLLECTION).doc(_docId).update({ data })
|
||||
console.log('[cloud] _doPush update ok')
|
||||
_markSynced()
|
||||
return
|
||||
} catch (e) {
|
||||
// Most commonly: doc was deleted out from under us (user cleared
|
||||
@@ -163,6 +183,7 @@ const _doPush = async () => {
|
||||
try {
|
||||
await db.collection(DB_COLLECTION).doc(_docId).update({ data })
|
||||
console.log('[cloud] _doPush update ok (re-located by _openid)')
|
||||
_markSynced()
|
||||
return
|
||||
} catch (e) {
|
||||
// If even the freshly-located doc rejects our update (custom
|
||||
@@ -185,6 +206,7 @@ const _doPush = async () => {
|
||||
if (res && res._id) _docId = res._id
|
||||
if (res && res._openid) _openid = res._openid
|
||||
console.log('[cloud] _doPush add ok, docId=', _docId)
|
||||
_markSynced()
|
||||
} catch (e) {
|
||||
console.log('[cloud] _doPush error:', e.message || e)
|
||||
}
|
||||
@@ -227,4 +249,12 @@ const clearAll = async () => {
|
||||
_docId = null
|
||||
}
|
||||
|
||||
module.exports = { init, pullAll, pushAll, clearAll, get enabled() { return _enabled } }
|
||||
module.exports = {
|
||||
init, pullAll, pushAll, clearAll, cancelPendingPush,
|
||||
get enabled() { return _enabled },
|
||||
get syncStatus() {
|
||||
if (!_enabled) return 'disabled'
|
||||
if (!_openid) return 'unauthenticated'
|
||||
return 'ok'
|
||||
}
|
||||
}
|
||||
|
||||
+2
-2
@@ -1,4 +1,4 @@
|
||||
const { formatDate } = require('./util')
|
||||
const { formatDate, dateOnly } = require('./util')
|
||||
|
||||
/**
|
||||
* Build the per-day target array for a plan from its formula fields.
|
||||
@@ -90,7 +90,7 @@ const getPlanDay = (planId, records, planStartDate) => {
|
||||
// Filter records: same plan, after plan start date, and not today
|
||||
const eligibleRecords = records.filter(r => {
|
||||
if (r.planId !== planId) return false
|
||||
if (r.date === today) return false
|
||||
if (dateOnly(r.date) === dateOnly(today)) return false
|
||||
if (planStartDate && r.date < planStartDate) return false
|
||||
return true
|
||||
})
|
||||
|
||||
+33
-4
@@ -7,6 +7,8 @@ const STREAK_KEY = 'current_streak'
|
||||
const CUSTOM_PLANS_KEY = 'custom_plans'
|
||||
const PROFILE_KEY = 'user_profile'
|
||||
|
||||
let _idSeq = 0
|
||||
|
||||
/**
|
||||
* Backfill an `id` for any record that doesn't have one.
|
||||
* Older records (e.g. data restored from cloud or migrated from a build
|
||||
@@ -46,7 +48,7 @@ const getRecords = () => {
|
||||
}
|
||||
|
||||
const saveRecord = (record) => {
|
||||
record.id = String(Date.now())
|
||||
record.id = String(Date.now()) + '_' + (++_idSeq)
|
||||
const records = getRecords()
|
||||
const month = record.date.substring(0, 7)
|
||||
if (!records[month]) records[month] = []
|
||||
@@ -190,8 +192,10 @@ const validateStreak = () => {
|
||||
monthRecs.forEach(r => allDates.add(dateOnly(r.date)))
|
||||
})
|
||||
|
||||
const lastOnly = dateOnly(streak.lastDate)
|
||||
|
||||
// If lastDate is today, check today still has records
|
||||
if (dateOnly(streak.lastDate) === todayOnly) {
|
||||
if (lastOnly === todayOnly) {
|
||||
if (!allDates.has(todayOnly)) {
|
||||
// Today's records were deleted
|
||||
if (allDates.has(yesterdayOnly)) {
|
||||
@@ -206,8 +210,33 @@ const validateStreak = () => {
|
||||
return streak
|
||||
}
|
||||
|
||||
// If lastDate is not today and not yesterday, streak is already broken
|
||||
// (updateStreak handles reset on next training), no action needed here
|
||||
// If lastDate points to a date that no longer has ANY records,
|
||||
// recompute the streak from actual recorded dates.
|
||||
if (!allDates.has(lastOnly)) {
|
||||
const sorted = Array.from(allDates).sort().reverse()
|
||||
if (sorted.length === 0) {
|
||||
streak.count = 0
|
||||
streak.lastDate = ''
|
||||
} else {
|
||||
let count = 1
|
||||
let prev = sorted[0]
|
||||
for (let i = 1; i < sorted.length; i++) {
|
||||
const prevDate = new Date(prev.replace(/-/g, '/'))
|
||||
const curDate = new Date(sorted[i].replace(/-/g, '/'))
|
||||
const diff = Math.round((prevDate - curDate) / (1000 * 60 * 60 * 24))
|
||||
if (diff === 1) {
|
||||
count++
|
||||
prev = sorted[i]
|
||||
} else {
|
||||
break
|
||||
}
|
||||
}
|
||||
streak.count = count
|
||||
streak.lastDate = sorted[0]
|
||||
}
|
||||
wx.setStorageSync(STREAK_KEY, streak)
|
||||
}
|
||||
|
||||
return streak
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user