核心重构 — 去除 channel 字段,引入 sourceAccount 模型: - 从 ImportedEvent、Rule、EnhancedRule、OcrRule 等接口中彻底移除 channel 字段 - rules.ts 中 resolveChannelAccount → resolveSourceAccount,规则匹配与账户解析不再依赖渠道概念 - dedup.ts 重写去重逻辑:从基于渠道匹配改为基于交易对手(counterparty)匹配,支持相同金额/交易对手/时间窗口的多级置信度判断 - transferRecognizer.ts 增加资产负债表账户校验,确保转账双方均为 Assets/Liabilities 类账户 - 全局替换影响:types、rules、ocr、adapters、adapters-migrations、所有服务层和测试 新增基础设施: - domain/constants.ts — 统一常量定义(支付包名、截图关键词、去重参数、方向检测函数 detectDirection()),消除 OCR/SMS/截图等模块的重复定义 - domain/channelConfig.ts — 渠道配置系统(支付宝/微信/银行),支持按包名和名称查找 - domain/pipelineSingleton.ts — 共享 BillPipeline 单例,解决 importStore/automationStore 的互斥锁共享问题 - domain/transactionBuilder.ts — 统一交易构建入口 buildAndSaveTransaction(),同时服务手动录入和无障碍监听 OCR 增强: - 新增账单详情页解析(parseDetailPageBill),支持支付宝/微信详情页结构化提取 - checkIsDetailPage() 识别详情页特征词,防止误提取(如"消费1次"被误读为金额) - 金额正则支持千分位逗号分隔,商户名正则改用 lookahead 边界匹配 - 时间解析支持中文格式(年月日)和跨年推断 - OcrProcessor 新增详情页路由,跳过 Layer 1 规则匹配 UI 全面升级: - 主题重设计:accent 色从绿色改为靛蓝(#4F46E5),深色模式适配 OLED 纯黑,引入 Quicksand/Caveat 字体 - 新增 commonStyles.ts 统一 chip/input/modal 等通用样式 - 首页 Bento 网格布局:净资产英雄卡片 + 定期账单/月度统计并排展示 - 报表新增周报标签页,月报整合日历视图(支持点击查看当日交易明细) - TrendLine 图表从 View 条形图重写为 SVG 贝塞尔曲线 - CategoryPicker 从水平滚动改为 4 列网格 + emoji 图标 - Button/Card 增加 press 缩放动画 管道与自动化改进: - automationPipeline.ts 新增 handleIncomingBillEvent() 实时账单处理(悬浮账单卡片 + 前台 Alert 确认) - 新增无障碍文本直解析 parseAndProcessAccessibilityTexts(),微信/支付宝详情页绕过 OCR - rules.ts 新增智能还款检测(花呗/信用卡还款自动路由)和退款视为收入处理 - metadataStore 默认规则精简为 6 条通用规则,移除约 20 条个人化硬编码规则 存储与同步: - storePersistence.ts 原子写入 + 崩溃恢复 + 重试机制 - 备份升级到 v2 格式,包含 settings 和 metadata - 同步路径统一从 mobile.bean 改为 main.bean - _layout.tsx 启动时自动迁移旧 mobile.bean 到 main.bean 其他: - 删除独立日历页面,功能合并到报表月报标签 - i18n 清理:移除渠道相关翻译,新增 50+ 翻译键 - docs/android-build-guide.md 重写为 APK 体积优化指南 - 新增 design-system/beancount-mobile/MASTER.md 设计系统文档 - 测试全面更新覆盖以上所有变更
129 lines
4.5 KiB
Kotlin
129 lines
4.5 KiB
Kotlin
package com.beancount.mobile.accessibility
|
||
|
||
import android.content.Context
|
||
import android.graphics.PixelFormat
|
||
import android.os.Handler
|
||
import android.os.Looper
|
||
import android.util.Log
|
||
import android.view.Gravity
|
||
import android.view.LayoutInflater
|
||
import android.view.View
|
||
import android.view.WindowManager
|
||
import android.widget.LinearLayout
|
||
import android.widget.ProgressBar
|
||
import android.widget.TextView
|
||
import java.util.concurrent.CountDownLatch
|
||
import java.util.concurrent.TimeUnit
|
||
|
||
/**
|
||
* 浮窗提示(plan.md「3.8 浮窗账单提示」)。
|
||
*
|
||
* 参考 AutoAccounting 的 FloatingTip + RepeatToast:
|
||
* - 轻量浮窗(非全屏),滑入动画,自动消失
|
||
* - 三种布局:顶部 / 左侧 / 右侧
|
||
* - 倒计时进度环
|
||
* - 重复账单提示(RepeatToast)
|
||
*
|
||
* 比 FloatingBillView 更轻:仅展示提示,不交互。
|
||
* 需 SYSTEM_ALERT_WINDOW 权限(由 Config Plugin 注册)。
|
||
*/
|
||
class FloatingTip(
|
||
private val context: Context,
|
||
private val message: String,
|
||
private val position: TipPosition = TipPosition.TOP,
|
||
private val durationMs: Long = 3000L,
|
||
) {
|
||
companion object {
|
||
private const val TAG = "FloatingTip"
|
||
private const val ANIM_DURATION = 300L
|
||
}
|
||
|
||
enum class TipPosition { TOP, LEFT, RIGHT }
|
||
|
||
private val windowManager = context.getSystemService(Context.WINDOW_SERVICE) as WindowManager
|
||
private var view: View? = null
|
||
private val handler = Handler(Looper.getMainLooper())
|
||
|
||
/** 显示浮窗提示。 */
|
||
fun show() {
|
||
try {
|
||
val layoutParams = WindowManager.LayoutParams(
|
||
WindowManager.LayoutParams.WRAP_CONTENT,
|
||
WindowManager.LayoutParams.WRAP_CONTENT,
|
||
WindowManager.LayoutParams.TYPE_APPLICATION_OVERLAY,
|
||
WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE,
|
||
PixelFormat.TRANSLUCENT,
|
||
).apply {
|
||
gravity = when (position) {
|
||
TipPosition.TOP -> Gravity.TOP or Gravity.CENTER_HORIZONTAL
|
||
TipPosition.LEFT -> Gravity.LEFT or Gravity.CENTER_VERTICAL
|
||
TipPosition.RIGHT -> Gravity.RIGHT or Gravity.CENTER_VERTICAL
|
||
}
|
||
y = if (position == TipPosition.TOP) 100 else 0
|
||
x = if (position != TipPosition.TOP) 50 else 0
|
||
}
|
||
|
||
val container = LinearLayout(context).apply {
|
||
orientation = LinearLayout.HORIZONTAL
|
||
setBackgroundColor(0xF0333333.toInt())
|
||
setPadding(32, 16, 32, 16)
|
||
}
|
||
val text = TextView(context).apply {
|
||
text = message
|
||
textSize = 13f
|
||
setTextColor(0xFFFFFFFF.toInt())
|
||
}
|
||
// 倒计时进度条
|
||
val progress = ProgressBar(context, null, android.R.attr.progressBarStyleHorizontal)
|
||
progress.max = 100
|
||
progress.progress = 100
|
||
progress.layoutParams = LinearLayout.LayoutParams(200, 8).apply {
|
||
setMargins(16, 0, 0, 0)
|
||
}
|
||
container.addView(text)
|
||
container.addView(progress)
|
||
view = container
|
||
|
||
windowManager.addView(view, layoutParams)
|
||
Log.d(TAG, "FloatingTip 显示: $message")
|
||
|
||
// 倒计时动画(300ms 内 progress 从 100 到 0)
|
||
val steps = 30
|
||
val stepMs = durationMs / steps
|
||
var currentStep = 0
|
||
handler.post(object : Runnable {
|
||
override fun run() {
|
||
currentStep++
|
||
progress.progress = 100 - (currentStep * 100 / steps)
|
||
if (currentStep < steps) {
|
||
handler.postDelayed(this, stepMs)
|
||
}
|
||
}
|
||
})
|
||
|
||
handler.postDelayed({ dismiss() }, durationMs)
|
||
} catch (e: Exception) {
|
||
Log.e(TAG, "FloatingTip 显示失败: ${e.message}")
|
||
}
|
||
}
|
||
|
||
/** 关闭浮窗。 */
|
||
fun dismiss() {
|
||
handler.removeCallbacksAndMessages(null)
|
||
try { view?.let { windowManager.removeView(it) } } catch (_: Exception) {}
|
||
view = null
|
||
}
|
||
}
|
||
|
||
/**
|
||
* 重复账单提示(plan.md「3.8」+ AutoAccounting RepeatToast)。
|
||
* 当检测到重复账单时,轻量提示用户(不弹浮窗,用系统 Toast 风格)。
|
||
*/
|
||
class RepeatToast(private val context: Context, private val message: String) {
|
||
fun show() {
|
||
val tip = FloatingTip(context, "⚠ $message", FloatingTip.TipPosition.TOP, 2000L)
|
||
tip.show()
|
||
Log.d("RepeatToast", "重复提示: $message")
|
||
}
|
||
}
|