fix: 处理点击特定跳过按钮不生效的问题#2232
Open
A-nony-mous wants to merge 1 commit into
Open
Conversation
Contributor
|
No actionable comments were generated in the recent review. 🎉 ℹ️ Recent review info⚙️ Run configurationConfiguration used: Path: .coderabbit.yaml Review profile: CHILL Plan: Pro Run ID: 📒 Files selected for processing (3)
✅ Files skipped from review due to trivial changes (1)
🚧 Files skipped from review as they are similar to previous changes (1)
📝 WalkthroughWalkthrough在点击 UI 按钮前新增鼠标预激活步骤：添加并调用 Changes鼠标预激活模式统一应用
预计代码审查工作量🎯 2 (Simple) | ⏱️ ~8 minutes 诗文
🚥 Pre-merge checks | ✅ 4 | ❌ 1❌ Failed checks (1 warning)
✅ Passed checks (4 passed)
✏️ Tip: You can configure your own custom pre-merge checks in the settings. ✨ Finishing Touches🧪 Generate unit tests (beta)
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
引入甩动鼠标方法，在点击前激活可能被隐藏的鼠标
A-nony-mous
force-pushed
the
fix/cofee-click-skip
branch
from
20fdb37 to
b7d9bd6
Compare
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
Contributor
There was a problem hiding this comment.
Actionable comments posted: 2
🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
Inline comments:
In `@src/zzz_od/application/coffee/coffee_app.py`:
- Around line 282-283: The code calls self.ctx.screen_loader.get_area('咖啡店',
'点单后跳过') into skip_area and immediately uses skip_area.center without
null-checking, which can raise AttributeError and duplicates the same area
lookup done later by round_by_find_and_click_area; fix by checking skip_area for
None before using it (e.g., only call wake_mouse_at(self.ctx.controller,
skip_area.center) when skip_area is not None) and avoid redundant lookups by
reusing skip_area (pass it into or use it instead of calling get_area again
inside round_by_find_and_click_area) so both null-safety and single lookup are
ensured for skip_area, referencing skip_area, get_area, wake_mouse_at, and
round_by_find_and_click_area.
In `@src/zzz_od/application/suibian_temple/operations/suibian_temple_boo_box.py`:
- Around line 256-262: The code assumes get_area(...) returns an object but it
can be None; modify the block where skip_area is obtained (skip_area =
self.ctx.screen_loader.get_area(...)) to check for None before accessing
skip_area.center and before calling wake_mouse_at or self.ctx.controller.click;
if skip_area is None, handle gracefully (e.g., log a warning via
self.ctx.logger/processLogger or return/skip the click flow) to avoid
AttributeError; ensure the references to wake_mouse_at(self.ctx.controller,
skip_area.center) and self.ctx.controller.click(...) are only executed when
skip_area is not None.
🪄 Autofix (Beta)
Fix all unresolved CodeRabbit comments on this PR:
- Push a commit to this branch (recommended)
- Create a new PR with the fixes
ℹ️ Review info
⚙️ Run configuration
Configuration used: Path: .coderabbit.yaml
Review profile: CHILL
Plan: Pro
Run ID: dc4e047d-5e3b-47cf-8f0f-d689d8370df9
📒 Files selected for processing (2)
src/zzz_od/application/coffee/coffee_app.pysrc/zzz_od/application/suibian_temple/operations/suibian_temple_boo_box.py
Comment on lines
+282
to
+283
| skip_area = self.ctx.screen_loader.get_area('咖啡店', '点单后跳过') | ||
| wake_mouse_at(self.ctx.controller, skip_area.center) |
Contributor
There was a problem hiding this comment.
skip_area 未做空值判断，可能引发 AttributeError
与 suibian_temple_boo_box.py 中相同的问题：get_area 找不到对应区域时返回 None，直接访问 skip_area.center 将抛出 AttributeError。此外，round_by_find_and_click_area（第 284 行）内部会再次查询同一区域，造成轻微的重复查询。
🛡️ 建议加入空值保护
+ skip_area = self.ctx.screen_loader.get_area('咖啡店', '点单后跳过')
+ if skip_area is not None:
+ wake_mouse_at(self.ctx.controller, skip_area.center)
- skip_area = self.ctx.screen_loader.get_area('咖啡店', '点单后跳过')
- wake_mouse_at(self.ctx.controller, skip_area.center)
result = self.round_by_find_and_click_area(self.last_screenshot, '咖啡店', '点单后跳过')🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
In `@src/zzz_od/application/coffee/coffee_app.py` around lines 282 - 283, The code
calls self.ctx.screen_loader.get_area('咖啡店', '点单后跳过') into skip_area and
immediately uses skip_area.center without null-checking, which can raise
AttributeError and duplicates the same area lookup done later by
round_by_find_and_click_area; fix by checking skip_area for None before using it
(e.g., only call wake_mouse_at(self.ctx.controller, skip_area.center) when
skip_area is not None) and avoid redundant lookups by reusing skip_area (pass it
into or use it instead of calling get_area again inside
round_by_find_and_click_area) so both null-safety and single lookup are ensured
for skip_area, referencing skip_area, get_area, wake_mouse_at, and
round_by_find_and_click_area.
Comment on lines
+256
to
262
| skip_area = self.ctx.screen_loader.get_area('随便观-邦巢', '按钮-跳过') | ||
| # 点击前甩动一下激活鼠标 | ||
| wake_mouse_at(self.ctx.controller, skip_area.center) | ||
| self.ctx.controller.click( | ||
| pos=self.ctx.screen_loader.get_area('随便观-邦巢', '按钮-跳过').center, | ||
| pos=skip_area.center, | ||
| press_time=0.5, # 长按一点 | ||
| ) |
Contributor
There was a problem hiding this comment.
skip_area 未做空值判断，可能引发 AttributeError
get_area 的实际实现为 self._screen_area_map.get(key, None)，当区域名称在配置中不存在时会返回 None。此处直接访问 skip_area.center（第 258 行和第 260 行）未先判空，若区域缺失将抛出 AttributeError。
🛡️ 建议加入空值保护
skip_area = self.ctx.screen_loader.get_area('随便观-邦巢', '按钮-跳过')
+ if skip_area is None:
+ return self.round_retry(status='未找到跳过区域', wait=0.5)
# 点击前甩动一下激活鼠标
wake_mouse_at(self.ctx.controller, skip_area.center)
self.ctx.controller.click(
pos=skip_area.center,
press_time=0.5, # 长按一点
)📝 Committable suggestion
‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.
Suggested change
| skip_area = self.ctx.screen_loader.get_area('随便观-邦巢', '按钮-跳过') | |
| # 点击前甩动一下激活鼠标 | |
| wake_mouse_at(self.ctx.controller, skip_area.center) | |
| self.ctx.controller.click( | |
| pos=self.ctx.screen_loader.get_area('随便观-邦巢', '按钮-跳过').center, | |
| pos=skip_area.center, | |
| press_time=0.5, # 长按一点 | |
| ) | |
| skip_area = self.ctx.screen_loader.get_area('随便观-邦巢', '按钮-跳过') | |
| if skip_area is None: | |
| return self.round_retry(status='未找到跳过区域', wait=0.5) | |
| # 点击前甩动一下激活鼠标 | |
| wake_mouse_at(self.ctx.controller, skip_area.center) | |
| self.ctx.controller.click( | |
| pos=skip_area.center, | |
| press_time=0.5, # 长按一点 | |
| ) |
🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
In `@src/zzz_od/application/suibian_temple/operations/suibian_temple_boo_box.py`
around lines 256 - 262, The code assumes get_area(...) returns an object but it
can be None; modify the block where skip_area is obtained (skip_area =
self.ctx.screen_loader.get_area(...)) to check for None before accessing
skip_area.center and before calling wake_mouse_at or self.ctx.controller.click;
if skip_area is None, handle gracefully (e.g., log a warning via
self.ctx.logger/processLogger or return/skip the click flow) to avoid
AttributeError; ensure the references to wake_mouse_at(self.ctx.controller,
skip_area.center) and self.ctx.controller.click(...) are only executed when
skip_area is not None.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
引入甩动鼠标方法，在点击前激活可能被隐藏的鼠标
cc @Usagi-wusaqi
Summary by CodeRabbit
更新说明
New Features
Bug Fixes