Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
5c00f3b7da
|
||
|
|
fdbed2b497
|
||
|
|
ee10816607
|
||
|
|
ecc747ff94
|
||
|
|
f04f38ec07
|
||
|
|
98088eeaf0
|
||
|
|
e1c9c16bcb |
|
Before Width: | Height: | Size: 5.9 KiB After Width: | Height: | Size: 6.0 KiB |
|
Before Width: | Height: | Size: 4.8 KiB After Width: | Height: | Size: 4.6 KiB |
|
Before Width: | Height: | Size: 5.4 KiB After Width: | Height: | Size: 5.5 KiB |
|
Before Width: | Height: | Size: 5.2 KiB After Width: | Height: | Size: 4.6 KiB |
|
Before Width: | Height: | Size: 6.1 KiB After Width: | Height: | Size: 5.8 KiB |
|
Before Width: | Height: | Size: 4.8 KiB After Width: | Height: | Size: 4.6 KiB |
@@ -360,7 +360,7 @@ class Ocr:
|
||||
|
||||
|
||||
class Digit(Ocr):
|
||||
def __init__(self, button: ButtonWrapper, lang=None, name=None):
|
||||
def __init__(self, button: ButtonWrapper, lang='en', name=None):
|
||||
super().__init__(button, lang=lang, name=name)
|
||||
|
||||
def format_result(self, result) -> int:
|
||||
@@ -380,7 +380,7 @@ class Digit(Ocr):
|
||||
|
||||
|
||||
class DigitCounter(Ocr):
|
||||
def __init__(self, button: ButtonWrapper, lang=None, name=None):
|
||||
def __init__(self, button: ButtonWrapper, lang='en', name=None):
|
||||
super().__init__(button, lang=lang, name=name)
|
||||
|
||||
@classmethod
|
||||
|
||||
@@ -195,7 +195,6 @@ class Updater(DeployConfig, GitManager, PipManager):
|
||||
|
||||
def update(self):
|
||||
logger.hr("Run update")
|
||||
self.set_repo()
|
||||
try:
|
||||
self.git_install()
|
||||
self.pip_install()
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
# pip-compile --annotation-style=line --output-file=requirements.txt requirements-in.txt
|
||||
#
|
||||
--index-url http://mirrors.aliyun.com/pypi/simple
|
||||
#--index-url https://mirrors.aliyun.com/pypi/simple
|
||||
|
||||
adbutils==1.2.9 # via -r requirements-in.txt, uiautomator2
|
||||
aiofiles==23.1.0 # via -r requirements-in.txt
|
||||
|
||||
@@ -103,24 +103,24 @@ CONFIRM_SORT = ButtonWrapper(
|
||||
name='CONFIRM_SORT',
|
||||
jp=Button(
|
||||
file='./assets/jp/momotalk/CONFIRM_SORT.png',
|
||||
area=(243, 403, 656, 440),
|
||||
search=(223, 383, 676, 460),
|
||||
area=(239, 457, 658, 495),
|
||||
search=(219, 437, 678, 515),
|
||||
color=(252, 253, 253),
|
||||
button=(243, 403, 656, 440),
|
||||
button=(239, 457, 658, 495),
|
||||
),
|
||||
en=Button(
|
||||
file='./assets/en/momotalk/CONFIRM_SORT.png',
|
||||
area=(239, 407, 657, 439),
|
||||
search=(219, 387, 677, 459),
|
||||
color=(248, 249, 249),
|
||||
button=(239, 407, 657, 439),
|
||||
area=(239, 456, 658, 496),
|
||||
search=(219, 436, 678, 516),
|
||||
color=(249, 250, 250),
|
||||
button=(239, 456, 658, 496),
|
||||
),
|
||||
zht=Button(
|
||||
file='./assets/zht/momotalk/CONFIRM_SORT.png',
|
||||
area=(240, 401, 656, 440),
|
||||
search=(220, 381, 676, 460),
|
||||
color=(249, 250, 250),
|
||||
button=(240, 401, 656, 440),
|
||||
area=(241, 457, 656, 495),
|
||||
search=(221, 437, 676, 515),
|
||||
color=(250, 251, 251),
|
||||
button=(241, 457, 656, 495),
|
||||
),
|
||||
)
|
||||
FIRST_UNREAD = ButtonWrapper(
|
||||
@@ -175,24 +175,24 @@ NOTIFICATION_BADGE = ButtonWrapper(
|
||||
name='NOTIFICATION_BADGE',
|
||||
jp=Button(
|
||||
file='./assets/jp/momotalk/NOTIFICATION_BADGE.png',
|
||||
area=(163, 107, 196, 129),
|
||||
search=(143, 87, 216, 149),
|
||||
color=(240, 110, 65),
|
||||
button=(163, 107, 196, 129),
|
||||
area=(139, 100, 158, 116),
|
||||
search=(119, 80, 178, 136),
|
||||
color=(245, 126, 85),
|
||||
button=(139, 100, 158, 116),
|
||||
),
|
||||
en=Button(
|
||||
file='./assets/en/momotalk/NOTIFICATION_BADGE.png',
|
||||
area=(171, 109, 200, 128),
|
||||
search=(151, 89, 220, 148),
|
||||
color=(242, 101, 47),
|
||||
button=(171, 109, 200, 128),
|
||||
area=(153, 106, 179, 125),
|
||||
search=(133, 86, 199, 145),
|
||||
color=(244, 115, 68),
|
||||
button=(153, 106, 179, 125),
|
||||
),
|
||||
zht=Button(
|
||||
file='./assets/zht/momotalk/NOTIFICATION_BADGE.png',
|
||||
area=(171, 109, 200, 128),
|
||||
search=(151, 89, 220, 148),
|
||||
color=(242, 101, 47),
|
||||
button=(171, 109, 200, 128),
|
||||
area=(153, 106, 179, 125),
|
||||
search=(133, 86, 199, 145),
|
||||
color=(244, 115, 68),
|
||||
button=(153, 106, 179, 125),
|
||||
),
|
||||
)
|
||||
REPLY = ButtonWrapper(
|
||||
|
||||
@@ -99,9 +99,10 @@ class MomoTalkUI(UI):
|
||||
If yes, open it otherwise it means no student available for interaction.
|
||||
"""
|
||||
self.ui_ensure(page_main)
|
||||
if self.match_color(NOTIFICATION_BADGE, threshold=80):
|
||||
if self.match_color(NOTIFICATION_BADGE, threshold=120):
|
||||
self.ui_ensure(page_momo_talk)
|
||||
while SWITCH_SIDEBAR.get(self) != "message":
|
||||
self.device.screenshot()
|
||||
SWITCH_SIDEBAR.set("message", self)
|
||||
return True
|
||||
logger.warning("No students available for interaction")
|
||||
|
||||