mower-ng/mower-ng
4
0
Fork 0
Code Issues 61 Pull requests Projects 1 Wiki Activity

拖动参数修复；更精准的计时
All checks were successful
ci/woodpecker/push/check_format Pipeline was successful
Details

Browse source
This commit is contained in:
zhbaor 2025-06-30 12:46:19 +08:00
parent 33aa10a593
commit bbd35f667b
2 changed files with 18 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

13
mower/utils/device/method/mumu_ipc.py
View file

@ -360,7 +360,8 @@ class MuMu12IPC:
interval (float): 滑动完成后的等待时间，单位为秒，默认 0 interval (float): 滑动完成后的等待时间，单位为秒，默认 0
func (Callable[[np.ndarray], Any]): 截图后处理的函数，默认空函数 func (Callable[[np.ndarray], Any]): 截图后处理的函数，默认空函数
""" """
frame_time = 1 / 120 frame_rate = 120
frame_time = 1 / frame_rate
start_time = time.perf_counter() start_time = time.perf_counter()
if fall: if fall:
@ -372,11 +373,15 @@ class MuMu12IPC:
trajectory = HumanizeMouseTrajectory( trajectory = HumanizeMouseTrajectory(
(x0, y0), (x1, y1), duration (x0, y0), (x1, y1), duration
).generate_curve(frame_time) ).generate_curve(frame_rate)
for point in trajectory[1:]: start_time = time.perf_counter()
for i, point in enumerate(trajectory[1:], 1):
target_time = start_time + i * frame_time
self.touch_down(point[0], point[1]) self.touch_down(point[0], point[1])
time.sleep(frame_time) now = time.perf_counter()
if now < target_time:
time.sleep(target_time - now)
if lift: if lift:
self.touch_up() self.touch_up()

13
mower/utils/device/method/scrcpy/core.py
View file

@ -221,7 +221,8 @@ class Client:
interval (float, optional): 拖动后的等待时间. Defaults to 0. interval (float, optional): 拖动后的等待时间. Defaults to 0.
func (Callable[[tp.Image], Any], optional): 处理截图的函数. Defaults to lambda _: None. func (Callable[[tp.Image], Any], optional): 处理截图的函数. Defaults to lambda _: None.
""" """
frame_time = 1 / 120 frame_rate = 120
frame_time = 1 / frame_rate
start_time = time.perf_counter() start_time = time.perf_counter()
if fall: if fall:
@ -233,11 +234,15 @@ class Client:
trajectory = HumanizeMouseTrajectory( trajectory = HumanizeMouseTrajectory(
(x0, y0), (x1, y1), duration (x0, y0), (x1, y1), duration
).generate_curve(frame_time) ).generate_curve(frame_rate)
for point in trajectory[1:]: start_time = time.perf_counter()
for i, point in enumerate(trajectory[1:], 1):
target_time = start_time + i * frame_time
self.control.touch(point[0], point[1], const.ACTION_MOVE) self.control.touch(point[0], point[1], const.ACTION_MOVE)
time.sleep(frame_time) now = time.perf_counter()
if now < target_time:
time.sleep(target_time - now)
if lift: if lift:
self.control.touch(x1, y1, const.ACTION_UP) self.control.touch(x1, y1, const.ACTION_UP)