mirror of
https://github.com/LmeSzinc/StarRailCopilot.git
synced 2024-11-25 10:01:10 +00:00
Fix: Images of launching page are detected as FLOAT_WINDOW
This commit is contained in:
parent
78d556c7f8
commit
3180e10356
@ -180,6 +180,15 @@ class LoginAndroidCloud(ModuleBase):
|
||||
self.config.stored.CloudRemainPaid.value = paid
|
||||
self.config.stored.CloudRemainFree.value = free
|
||||
|
||||
def _is_cloud_ingame(self):
|
||||
button = self.xpath(XPath.FLOAT_WINDOW)
|
||||
if self.appear(button):
|
||||
# Confirm float window size
|
||||
width, height = button.size
|
||||
if (width < 120 and height < 120) and (width / height < 0.6 or height / width < 0.6):
|
||||
return True
|
||||
return False
|
||||
|
||||
def _cloud_enter(self, skip_first=False):
|
||||
"""
|
||||
Pages:
|
||||
@ -194,11 +203,7 @@ class LoginAndroidCloud(ModuleBase):
|
||||
self.device.dump_hierarchy()
|
||||
|
||||
# End
|
||||
button = self.xpath(XPath.FLOAT_WINDOW)
|
||||
if self.appear(button):
|
||||
# Confirm float window size
|
||||
width, height = button.size
|
||||
if (width < 120 and height < 120) and (width / height < 0.6 or height / width < 0.6):
|
||||
if self._is_cloud_ingame():
|
||||
logger.info('Cloud game entered')
|
||||
break
|
||||
|
||||
@ -366,7 +371,7 @@ class LoginAndroidCloud(ModuleBase):
|
||||
self._cloud_get_remain()
|
||||
self._cloud_enter()
|
||||
return True
|
||||
elif self.appear(XPath.FLOAT_WINDOW):
|
||||
elif self.is_in_cloud_page():
|
||||
logger.info('Cloud game is in game')
|
||||
return True
|
||||
elif self.appear(XPath.FLOAT_DELAY):
|
||||
|
Loading…
Reference in New Issue
Block a user