Compare commits

...
7 changed files with 334 additions and 9 deletions
+2 -2
View File
@@ -11,8 +11,8 @@ android {
applicationId = "cn.ilapage.goauto.agent"
minSdk = 23
targetSdk = 34
versionCode = 81
versionName = "0.9.68"
versionCode = 82
versionName = "0.9.69"
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
@@ -376,6 +376,7 @@ object PddScreenParser {
val candidates = panelVisible.asSequence()
.filter { it.clickable && inValueRegion(it) }
.filterNot { isExactHeadingLabel(it.label, config) }
.filterNot { containsDistinctOptionCard(it, sourceByPath) }
.filterNot { node ->
isExcludedOptionLabel(node.label) ||
descendants(node, visibleNodes).any { descendant -> isExcludedOptionLabel(descendant.label) }
@@ -586,8 +587,8 @@ object PddScreenParser {
/**
* Outermost labelled clickable ancestor inside the value region whose label
* prefixes every candidate nested in it. Rows that contain several distinct
* options never qualify because their members do not share its label.
* prefixes every candidate nested in it, or a single image/caption card with
* a truncated caption. A shared ancestor alone is not card identity.
*/
private fun optionBlock(
candidate: SnapshotNode,
@@ -605,9 +606,11 @@ object PddScreenParser {
// Only a block with its own label names the option; a blank row
// container resolved from its first child never merges options.
if (raw.clickable && raw.label.isNotBlank() && resolved != null && inValueRegion(resolved)) {
if (containsDistinctOptionCard(resolved, sourceByPath)) break
val outer = compact(resolved.label)
val members = candidates.filter { it.path == resolved.path || it.path.startsWith("${resolved.path}/") }
if (outer.isEmpty() || members.any { !compact(it.label).startsWith(outer) }) break
val existingBlock = outer.isNotEmpty() && members.all { compact(it.label).startsWith(outer) }
if (!existingBlock && !isTruncatedDisplayCard(resolved, members, sourceByPath)) break
block = resolved
}
parentPath = raw.parentPath
@@ -615,6 +618,57 @@ object PddScreenParser {
return block
}
/** A labelled group must neither name its children nor become a synthetic selected option. */
private fun containsDistinctOptionCard(block: SnapshotNode, sourceByPath: Map<String, SnapshotNode>): Boolean {
val raw = sourceByPath[block.path] ?: return false
if (raw.label.isBlank()) return false
val name = SpecValueNormalizer.normalizeColor(raw.label).filterNot { it.isWhitespace() }
return sourceByPath.values.any { child ->
child.path.startsWith("${block.path}/") && child.clickable && child.label.isNotBlank() &&
SpecValueNormalizer.normalizeColor(child.label).filterNot { it.isWhitespace() } != name &&
sourceByPath.values.any { it.parentPath == child.path }
}
}
/**
* #362: narrowly recognize one full-labelled image above one truncated text
* leaf. Do not reverse the old prefix rule for arbitrary nested options.
* Non-clickable layout wrappers are fine; another clickable container is
* ambiguous, even if its label/price also happens to be a prefix match.
*/
private fun isTruncatedDisplayCard(
block: SnapshotNode,
members: List<SnapshotNode>,
sourceByPath: Map<String, SnapshotNode>,
): Boolean {
fun name(label: String) = SpecValueNormalizer.normalizeColor(label).filterNot { it.isWhitespace() }
val full = name(block.label)
if (full.isEmpty()) return false
val children = members.filter { it.path != block.path }
val image = children.singleOrNull { it.className == "android.widget.ImageView" } ?: return false
val caption = children.singleOrNull { it.className == "android.widget.TextView" } ?: return false
if (children.size != 2 || name(image.label) != full) return false
val short = name(caption.label)
if (short.isEmpty() || short == full || !full.startsWith(short)) return false
val descendants = sourceByPath.values.filter { it.path.startsWith("${block.path}/") }
// Image and caption must be leaves, not two independently labelled cards.
if (children.any { child -> descendants.any { it.parentPath == child.path } }) return false
if (descendants.any { node ->
node.clickable && node.label.isNotBlank() &&
descendants.any { it.parentPath == node.path }
}) return false
if (children.any { child ->
child.bounds.left < block.bounds.left || child.bounds.right > block.bounds.right ||
child.bounds.top < block.bounds.top || child.bounds.bottom > block.bounds.bottom
}) return false
if (image.bounds.top >= caption.bounds.top || image.bounds.bottom >= caption.bounds.bottom ||
minOf(image.bounds.right, caption.bounds.right) <= maxOf(image.bounds.left, caption.bounds.left)) return false
val prices = members.mapNotNull { SpecValueNormalizer.trailingPriceAmount(it.label) }
return prices.isEmpty() || prices.all { it.compareTo(prices.first()) == 0 }
}
/** The nearby clickable row holding [node], or null when there is none or it is not a plausible entry row. */
private fun clickableEntryRow(node: SnapshotNode, sourceByPath: Map<String, SnapshotNode>, screenHeight: Int): SnapshotNode? {
var current: SnapshotNode? = node
@@ -13,6 +13,10 @@ object SpecValueNormalizer {
fun normalizeSize(value: String): String = normalizeTrailingPrice(value)
/** The same terminal-price grammar as normalization; never reads numbers inside a spec. */
internal fun trailingPriceAmount(value: String): java.math.BigDecimal? =
trailingPrice.find(value)?.value?.replace(currency, "")?.trim()?.toBigDecimalOrNull()
fun isSafeColor(value: String): Boolean = isSafeValue(value)
fun isSafeSize(value: String): Boolean = isSafeValue(value)
@@ -0,0 +1,255 @@
package cn.ilapage.goauto.agent
import cn.ilapage.goauto.agent.automation.*
import org.junit.Assert.*
import org.junit.Test
/** Synthetic cards only: no device tree, address or order data. */
class TruncatedSpecCardTest {
private val card = "r/sheet/body/list/color/o0"
private val other = "r/sheet/body/list/color/o1"
private val full = "黑色示例长裤【有抽绳】 有口袋不起球"
private val short = "黑色示例长裤【有抽绳】 有口袋"
private val size = "2XL建议130-150斤"
private fun sheet(
outer: String = "$full ¥18.8",
caption: String = "$short ¥18.8",
image: String = outer,
selected: Boolean = true,
otherSelected: Boolean = false,
): UiSnapshot = SpecPanelFixtures.taskOptionDedupSheet().let { snapshot ->
snapshot.copy(nodes = snapshot.nodes.map { node ->
when (node.path) {
card, "$card/img" -> node.copy(text = null, contentDescription = if (node.path == card) outer else image, selected = selected)
"$card/l/t" -> node.copy(text = caption, selected = selected)
"r/sheet/body/selected" -> node.copy(text = "请选择: 尺码")
else -> when {
node.path.startsWith("$card/") -> node.copy(selected = selected)
node.path == other || node.path.startsWith("$other/") -> node.copy(selected = otherSelected)
else -> node
}
}
})
}
private fun parse(snapshot: UiSnapshot) = PddScreenParser.parse(
snapshot, PurchaseRehearsalExecutor.DEFAULT_COLLECTOR, "123456789", null,
)
private fun colors(snapshot: UiSnapshot) = parse(snapshot).dimensions.single { it.key == "color" }.values
@Test fun `full image and truncated clickable caption are one selected color`() {
val result = colors(sheet())
assertEquals(listOf(full, "白条纹"), result.map { it.text })
assertTrue(result.first().node.selected)
assertFalse(result.last().node.selected)
assertEquals(5, parse(sheet()).dimensions.single { it.key == "size" }.values.size)
}
@Test fun `checked display state survives grouping`() {
val snapshot = sheet(selected = false).let { it.copy(nodes = it.nodes.map { n ->
if (n.path == "$card/l/t") n.copy(checked = true) else n
}) }
assertTrue(colors(snapshot).single { it.text == full }.node.checked)
assertFalse(colors(snapshot).any { it.text == short })
}
@Test fun `whitespace and equivalent terminal prices do not change full identity`() {
assertEquals(listOf(full, "白条纹"), colors(sheet(caption = "黑色示例长裤【有抽绳】\n有口袋 ¥18.80")).map { it.text })
}
@Test fun `one or both absent prices still require card evidence`() {
for ((outer, caption) in listOf(full to short, "$full ¥18.8" to short, full to "$short ¥18.8")) {
assertEquals(listOf(full, "白条纹"), colors(sheet(outer, caption)).map { it.text })
}
}
@Test fun `different prices refuse truncated merge`() {
assertTrue(colors(sheet(caption = "$short ¥28.8")).any { it.text == short })
}
@Test fun `non prefix caption remains independent`() {
assertTrue(colors(sheet(caption = "灰色示例 ¥18.8")).any { it.text == "灰色示例" })
}
@Test fun `empty price only and missing complete image are not prefix evidence`() {
for (caption in listOf("", "¥18.8")) {
val snapshot = sheet(caption = caption, selected = false).let { it.copy(nodes = it.nodes.map { n ->
if (n.path == "$card/l/t") n.copy(checked = true) else n
}) }
// An empty label may be omitted by the parser; a pure-price value
// must not be promoted into the full card via empty-prefix matching.
if (caption.isNotEmpty()) assertTrue(colors(snapshot).any { it.text.isEmpty() && it.node.checked })
}
assertTrue(colors(sheet(image = "$short ¥18.8")).any { it.text == short })
assertTrue(colors(sheet(outer = "¥18.8")).any { it.text == short })
}
@Test fun `truncated leaf outside card geometry is not merged`() {
val snapshot = sheet().let { it.copy(nodes = it.nodes.map { n ->
if (n.path == "$card/l/t") n.copy(bounds = NodeBounds(710, 1340, 1040, 1447)) else n
}) }
assertTrue(colors(snapshot).any { it.text == short })
}
@Test fun `clickable caption wrapper is not silently assumed to be a display leaf`() {
val snapshot = sheet().let { it.copy(nodes = it.nodes.map { n ->
if (n.path == "$card/l") n.copy(text = "$short ¥18.8", clickable = true) else n
}) }
assertTrue(colors(snapshot).any { it.text == short })
}
@Test fun `adjacent prefix named cards stay distinct even at same price`() {
val snapshot = sheet(outer = "黑色加绒 ¥18.8", caption = "黑色加 ¥18.8").let { it.copy(nodes = it.nodes.map { n ->
if (n.path == other || n.path == "$other/img" || n.path == "$other/l/t")
n.copy(text = "黑色 ¥18.8", contentDescription = null) else n
}) }
assertEquals(listOf("黑色加绒", "黑色"), colors(snapshot).map { it.text })
}
@Test fun `labelled clickable common parent cannot swallow independent cards`() {
val snapshot = sheet().let { it.copy(nodes = it.nodes.map { n ->
if (n.path == "r/sheet/body/list/color") n.copy(text = "$full ¥18.8", clickable = true,
bounds = NodeBounds(0, 1044, 1080, 1447)) else n
}) }
assertTrue(colors(snapshot).any { it.text == "白条纹" })
}
@Test fun `nested same price prefix card with own image and caption remains independent`() {
val base = sheet(outer = "黑色加绒 ¥18.8", caption = "黑色加 ¥18.8")
val parent = base.nodes.single { it.path == card }
val nested = listOf(
parent.copy(path = "$card/nested", parentPath = card, text = "黑色 ¥18.8", contentDescription = null),
parent.copy(path = "$card/nested/img", parentPath = "$card/nested", text = "黑色 ¥18.8", contentDescription = null, className = "android.widget.ImageView"),
parent.copy(path = "$card/nested/text", parentPath = "$card/nested", text = "黑色 ¥18.8", contentDescription = null, className = "android.widget.TextView"),
)
assertTrue(colors(base.copy(nodes = base.nodes + nested)).any { it.text == "黑色" })
}
@Test fun `short labelled common parent does not merge its longer independent cards`() {
val parent = "r/sheet/body/list/color/cards"
val base = sheet(outer = "黑色加绒", caption = "黑色加绒")
val nodes = base.nodes.map { n ->
val isOther = n.path == other || n.path == "$other/img" || n.path == "$other/l/t"
val child = if (isOther) n.copy(text = "黑色", contentDescription = null) else n
child.copy(
path = child.path.replace(card, "$parent/o0").replace(other, "$parent/o1"),
parentPath = child.parentPath?.replace(card, "$parent/o0")?.replace(other, "$parent/o1")
?.let { if ((n.path == card || n.path == other)) parent else it },
)
}
val container = base.nodes.single { it.path == card }.copy(
path = parent, parentPath = parent.substringBeforeLast('/'), text = "黑色", contentDescription = null,
bounds = NodeBounds(36, 1044, 698, 1447),
)
val values = colors(base.copy(nodes = nodes + container))
assertEquals(setOf("黑色加绒", "黑色"), values.map { it.text }.toSet())
assertTrue(values.single { it.text == "黑色加绒" }.node.selected)
assertFalse(values.single { it.text == "黑色" }.node.selected)
}
@Test fun `same named clickable caption wrapper keeps original badge merging`() {
val snapshot = SpecPanelFixtures.taskOptionDedupSheet().let { it.copy(nodes = it.nodes.map { n ->
if (n.path == "$card/l") n.copy(text = "兰条纹", clickable = true) else n
}) }
assertEquals(listOf("兰条纹", "白条纹"), colors(snapshot).map { it.text })
}
@Test fun `numeric and weight size values and badge regression remain intact`() {
val baseline = SpecPanelFixtures.taskOptionDedupSheet()
assertEquals(listOf("兰条纹", "白条纹"), colors(baseline).map { it.text })
val snapshot = sheet().let { it.copy(nodes = it.nodes.map { n ->
if (n.path.endsWith("size/o0/t")) n.copy(text = "42 ¥18.8") else n
}) }
val sizes = parse(snapshot).dimensions.single { it.key == "size" }.values.map { it.text }
assertTrue(sizes.containsAll(listOf("42", size, "3XL建议150-170斤")))
}
@Test fun `collector used by collection and spec probe emits only full color values`() {
var selectedColor = full
val driver = object : PddCollectorDriver {
override fun capture() = sheet(selected = selectedColor == full, otherSelected = selectedColor == "白条纹")
override fun clickFresh(target: SnapshotNode): FreshActionResult {
selectedColor = if (target.path.startsWith(card)) full else "白条纹"
return FreshActionResult.SUCCESS
}
override fun swipeSpec(direction: SwipeDirection, anchor: SnapshotNode?) = false
override fun pullDownGoodsPage() = false
override fun back() = false
}
var clock = 0L
val rule = CollectionRule(
schemaVersion = 2, steps = emptyList(), ruleType = "pddProductDetail",
pageEvidence = PageEvidence(SpecPanelFixtures.PDD, SpecPanelFixtures.ACTIVITY, NodeSelector(text = "颜色分类")),
collector = PurchaseRehearsalExecutor.DEFAULT_COLLECTOR,
)
val result = PddProductDetailCollector(driver, { clock }, { clock += it }).collect("123456789", rule)
assertTrue(result.message, result.successful)
assertEquals(listOf(full, "白条纹"), requireNotNull(result.payload).dimensions.single { it.key == "color" }.values)
}
private fun executor(driver: PurchaseUiDriver) = PurchaseRehearsalExecutor(driver, { true }, { null }, pause = {})
private class Driver(private val snapshot: UiSnapshot) : PurchaseUiDriver {
var opened = false
var sizeSelected = false
val clicks = mutableListOf<String>()
override fun capture() = if (opened) snapshot.copy(nodes = snapshot.nodes.map { n ->
if (n.path.contains("/size/o")) n.copy(selected = sizeSelected && n.path.startsWith("r/sheet/body/list/size/o2")) else n
}) else SpecPanelFixtures.productDetailPage()
override fun clickFresh(target: SnapshotNode): FreshActionResult {
clicks += target.label
if (target.label.startsWith("请选择")) opened = true
if (target.label == "2XL建议130-150斤") sizeSelected = true
return FreshActionResult.SUCCESS
}
override fun tapPurchaseFresh(target: SnapshotNode) = FreshActionResult.FAILED
override fun inputFresh(target: SnapshotNode, value: String) = FreshActionResult.FAILED
override fun swipePurchase(direction: SwipeDirection, durationMs: Long) = false
override fun swipePurchaseIn(target: SnapshotNode, direction: SwipeDirection, durationMs: Long) = false
override fun backPurchase() = false
}
private fun run(snapshot: UiSnapshot, target: String = full, driver: Driver = Driver(snapshot)) = executor(driver).execute(
PurchaseExecutionInput(362, "rehearsal", "purchase", "https://mobile.yangkeduo.com/goods.html?goods_id=123456789",
"123456789", target, size, quantity = 1, minUnitPriceCent = 1000, maxUnitPriceCent = 3000),
PurchaseRuleParser.parse("""{"schemaVersion":1,"ruleType":"pddPurchase","requiredCapabilities":["purchase.rehearsal.v1"],
"actions":[{"type":"openProduct"},{"type":"verifyProduct"},{"type":"openSpecPanel"},{"type":"selectSpec"},
{"type":"setQuantity"},{"type":"verifyUnitPrice"},{"type":"verifyOrderSummary"}]}"""),
PurchaseAgentCapabilities.supported,
)
@Test fun `dedup lets existing confirmation complete color size and rehearsal`() {
val snapshot = sheet()
val driver = Driver(snapshot)
val result = run(snapshot, driver = driver)
assertEquals(result.message, "rehearsal_completed", result.resultType)
assertEquals(1, driver.clicks.count { it == size })
assertFalse(driver.clicks.any { it.contains("订单") || it.contains("支付") })
}
@Test fun `other selected card still fails immediate confirmation`() {
for (selected in listOf(false, true)) {
val result = run(sheet(selected = selected, otherSelected = true))
assertEquals("PURCHASE_SPEC_SELECTION_UNCONFIRMED", result.errorCode)
}
}
@Test fun `old truncated mapped target is not silently upgraded`() {
assertEquals("PURCHASE_SPEC_TARGET_NOT_VISIBLE", run(sheet(), short).errorCode)
}
@Test fun `existing final confirmation target first ordering is documented not changed`() {
val screen = parse(sheet(otherSelected = true))
val executor = executor(Driver(sheet()))
val immediate = PurchaseRehearsalExecutor::class.java.declaredMethods.single { it.name == "isExactSpecSelected" }
immediate.isAccessible = true
assertEquals(false, immediate.invoke(executor, screen, "color", full))
val final = PurchaseRehearsalExecutor::class.java.declaredMethods.single { it.name == "verifyExactSpecSelection" }
final.isAccessible = true
val result = final.invoke(executor, screen, "color", full, null)
val confirmed = result.javaClass.getDeclaredField("confirmed").apply { isAccessible = true }
assertEquals(true, confirmed.get(result)) // Existing baseline; NOT a newly approved multi-selection behavior.
}
}
+1 -1
View File
@@ -3,7 +3,7 @@ generated: true (请先修改 Gitea Wiki,禁止直接编辑本文件)
wiki_page: Architecture-and-Code-Map
wiki_url: https://git.ilapage.cn/OPC/goauto/wiki/Architecture-and-Code-Map.-
wiki_revision: 3165d7d419a46f41fa70a63286799deda9a8ce9f
synchronized_at: 2026-10-06T09:17:36Z
synchronized_at: 2026-10-06T09:50:17Z
<!-- gitea-wiki-mirror:end -->
<!-- gitea-wiki-mirror:start -->
+14 -2
View File
@@ -2,8 +2,8 @@
generated: true (请先修改 Gitea Wiki,禁止直接编辑本文件)
wiki_page: Business-Rules-and-Glossary
wiki_url: https://git.ilapage.cn/OPC/goauto/wiki/Business-Rules-and-Glossary.-
wiki_revision: ec20bf476551c3dbc1d5aaa6301605bfe695e102
synchronized_at: 2026-10-06T09:17:39Z
wiki_revision: 81cec55e15c968efcc2cb4c4e5babcd17a40a3f4
synchronized_at: 2026-10-06T10:02:05Z
<!-- gitea-wiki-mirror:end -->
<!-- gitea-wiki-mirror:start -->
@@ -810,3 +810,15 @@ Android 0.9.64 / versionCode 77,源码 `6550b9f`(分支实现,尚未安装
- PDD 点击按最终接收动作的控件或最近可点击父容器检查尺码建议类明确短语,包含简繁体;无障碍直接点击、祖先点击与中心手势共享判断。不可因面板其他位置存在建议入口而拒绝所有规格;“M 建议80-100斤”等合法选项不按“建议”泛化拦截。命中返回 SIZE_ADVICE_CLICK_BLOCKED,规格入口/规格选择不再手势兜底,颜色采集不改点其他候选。
- 规格探测的结构化诊断复用本地诊断库,以 purchase 类型、task ID、服务端 attempt UUID、设备、phase 和规则快照哈希关联;不保存原始 trace/标签/树/截图。诊断失败不改变任务结果。
- 真机验证不能依赖探测失败作为停止边界:live 任务探测匹配成功后可继续正式下单。必须明确演练覆盖 spec_probe 的方式,或另获正式创建订单授权;永久禁止付款。
## Android 同一卡片截短规格显示去重(#362)
解析修复绑定 9a4495a + 1f5bab8(基于 main 64f0e49);用户随后授权构建安装,工单分支于 35119ea 集成 #361,Agent 0.9.69 / 82 已于 2026-10-06 覆盖安装到指定设备。尚未合并 main,现场采购效果未验证;集成不表示 #361 的诊断疑点已解决或整体验收通过。
- 共享 PddScreenParser.optionBlock 保留原“成员以外层完整标签开头”的分支(含徽标/附加说明)。只新增已知图片卡片形态的保守兼容:外层有自身完整标签,候选显示成员恰为一个完整标签 ImageView 叶节点和一个截短 TextView 叶节点;允许非点击布局包装,不跨另一个带标签且可点击的容器。
- 若带自身标签的候选容器包含另一个有不同规范化名称、可点击且有自身子节点的卡片,该容器不作为规格值,也不能成为这些卡片的合并块。这一结构边界同时保护原前缀分支,避免共同容器“黑色”吞并子卡片“黑色加绒”,以及容器聚合 selected 污染另一张卡片;同名包装和原徽标分支保留。
- 两个显示叶节点必须位于卡片边界内,图片在字幕上方且横向相交(允许图片/字幕边缘重叠)。缺少完整图片、多个字幕或图片、嵌套独立卡片、文字归属不明确时不采用新增合并分支。相邻同价且前缀相似的不同规格不能凭文字合并。
- 比较使用既有 SpecValueNormalizer 尾部价格语法和空白压缩,双方非空,截短名须为完整名的严格前缀;所有实际存在的尾价须数值一致,18.8 与 18.80 等价。缺失价格不构成同卡证据,必须仍满足全部结构条件。不去掉体重、尺码数字或款式文字。
- 合并后仍使用外层完整原文按既有规则去尾价作为规格值,沿用原点击节点排序、selected/checked 聚合;普通采集与采购探测共用这一路径。精确定位、即时确认、选中证明、最终复核及下单行为不改,不允许模糊点击。
- 历史任务若已映射到截短值,不自动升格为完整值,不修改任务快照、映射或历史数据;找不到精确目标仍明确失败。即时确认先查其他选中值,而最终确认先接受唯一目标已选中,是既有实现差异,本修复不调整或掩盖该差异。
- #361 的诊断未写入疑点继续独立核查。解析合成测试可先行,后续用于手机安装的集成版本须包含 #361,并经明确授权安装/真机验证;不以已有单次采购成功代替完整验收,不执行付款。
+1 -1
View File
@@ -3,7 +3,7 @@ generated: true (请先修改 Gitea Wiki,禁止直接编辑本文件)
wiki_page: Troubleshooting
wiki_url: https://git.ilapage.cn/OPC/goauto/wiki/Troubleshooting
wiki_revision: ac3a0b74704f398cec54149267089c87c8375a3e
synchronized_at: 2026-10-06T09:17:51Z
synchronized_at: 2026-10-06T09:50:33Z
<!-- gitea-wiki-mirror:end -->
# 故障排查