Fix: No orientation handle in MaaTouch

This commit is contained in:
LmeSzinc 2023-08-03 00:51:21 +08:00
parent 28d5c43602
commit fc91221240
2 changed files with 12 additions and 3 deletions

View File

@ -94,7 +94,7 @@ class MaaTouch(Connection):
@cached_property
def maatouch_builder(self):
self.maatouch_init()
return CommandBuilder(self)
return CommandBuilder(self, handle_orientation=False)
def maatouch_init(self):
logger.hr('MaaTouch init')

View File

@ -1,5 +1,6 @@
import asyncio
import json
import re
import socket
import time
from functools import wraps
@ -183,7 +184,7 @@ class CommandBuilder:
max_x = 1280
max_y = 720
def __init__(self, device):
def __init__(self, device, handle_orientation=True):
"""
Args:
device:
@ -191,10 +192,18 @@ class CommandBuilder:
self.device = device
self.commands = []
self.delay = 0
self.handle_orientation = handle_orientation
@property
def orientation(self):
if self.handle_orientation:
return self.device.orientation
else:
return 0
def convert(self, x, y):
max_x, max_y = self.device.max_x, self.device.max_y
orientation = self.device.orientation
orientation = self.orientation
if orientation == 0:
pass