Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
4233f13994
|
||
|
|
47c773b90c
|
||
|
|
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: 8.0 KiB After Width: | Height: | Size: 6.9 KiB |
|
Before Width: | Height: | Size: 5.9 KiB After Width: | Height: | Size: 5.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):
|
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)
|
super().__init__(button, lang=lang, name=name)
|
||||||
|
|
||||||
def format_result(self, result) -> int:
|
def format_result(self, result) -> int:
|
||||||
@@ -380,7 +380,7 @@ class Digit(Ocr):
|
|||||||
|
|
||||||
|
|
||||||
class DigitCounter(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)
|
super().__init__(button, lang=lang, name=name)
|
||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
|
|||||||
@@ -195,7 +195,6 @@ class Updater(DeployConfig, GitManager, PipManager):
|
|||||||
|
|
||||||
def update(self):
|
def update(self):
|
||||||
logger.hr("Run update")
|
logger.hr("Run update")
|
||||||
self.set_repo()
|
|
||||||
try:
|
try:
|
||||||
self.git_install()
|
self.git_install()
|
||||||
self.pip_install()
|
self.pip_install()
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
#
|
#
|
||||||
# pip-compile --annotation-style=line --output-file=requirements.txt requirements-in.txt
|
# 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
|
adbutils==1.2.9 # via -r requirements-in.txt, uiautomator2
|
||||||
aiofiles==23.1.0 # via -r requirements-in.txt
|
aiofiles==23.1.0 # via -r requirements-in.txt
|
||||||
|
|||||||
@@ -103,24 +103,24 @@ CONFIRM_SORT = ButtonWrapper(
|
|||||||
name='CONFIRM_SORT',
|
name='CONFIRM_SORT',
|
||||||
jp=Button(
|
jp=Button(
|
||||||
file='./assets/jp/momotalk/CONFIRM_SORT.png',
|
file='./assets/jp/momotalk/CONFIRM_SORT.png',
|
||||||
area=(243, 403, 656, 440),
|
area=(239, 457, 658, 495),
|
||||||
search=(223, 383, 676, 460),
|
search=(219, 437, 678, 515),
|
||||||
color=(252, 253, 253),
|
color=(252, 253, 253),
|
||||||
button=(243, 403, 656, 440),
|
button=(239, 457, 658, 495),
|
||||||
),
|
),
|
||||||
en=Button(
|
en=Button(
|
||||||
file='./assets/en/momotalk/CONFIRM_SORT.png',
|
file='./assets/en/momotalk/CONFIRM_SORT.png',
|
||||||
area=(239, 407, 657, 439),
|
area=(239, 456, 658, 496),
|
||||||
search=(219, 387, 677, 459),
|
search=(219, 436, 678, 516),
|
||||||
color=(248, 249, 249),
|
color=(249, 250, 250),
|
||||||
button=(239, 407, 657, 439),
|
button=(239, 456, 658, 496),
|
||||||
),
|
),
|
||||||
zht=Button(
|
zht=Button(
|
||||||
file='./assets/zht/momotalk/CONFIRM_SORT.png',
|
file='./assets/zht/momotalk/CONFIRM_SORT.png',
|
||||||
area=(240, 401, 656, 440),
|
area=(241, 457, 656, 495),
|
||||||
search=(220, 381, 676, 460),
|
search=(221, 437, 676, 515),
|
||||||
color=(249, 250, 250),
|
color=(250, 251, 251),
|
||||||
button=(240, 401, 656, 440),
|
button=(241, 457, 656, 495),
|
||||||
),
|
),
|
||||||
)
|
)
|
||||||
FIRST_UNREAD = ButtonWrapper(
|
FIRST_UNREAD = ButtonWrapper(
|
||||||
@@ -175,24 +175,24 @@ NOTIFICATION_BADGE = ButtonWrapper(
|
|||||||
name='NOTIFICATION_BADGE',
|
name='NOTIFICATION_BADGE',
|
||||||
jp=Button(
|
jp=Button(
|
||||||
file='./assets/jp/momotalk/NOTIFICATION_BADGE.png',
|
file='./assets/jp/momotalk/NOTIFICATION_BADGE.png',
|
||||||
area=(163, 107, 196, 129),
|
area=(139, 100, 158, 116),
|
||||||
search=(143, 87, 216, 149),
|
search=(119, 80, 178, 136),
|
||||||
color=(240, 110, 65),
|
color=(245, 126, 85),
|
||||||
button=(163, 107, 196, 129),
|
button=(139, 100, 158, 116),
|
||||||
),
|
),
|
||||||
en=Button(
|
en=Button(
|
||||||
file='./assets/en/momotalk/NOTIFICATION_BADGE.png',
|
file='./assets/en/momotalk/NOTIFICATION_BADGE.png',
|
||||||
area=(171, 109, 200, 128),
|
area=(153, 106, 179, 125),
|
||||||
search=(151, 89, 220, 148),
|
search=(133, 86, 199, 145),
|
||||||
color=(242, 101, 47),
|
color=(244, 115, 68),
|
||||||
button=(171, 109, 200, 128),
|
button=(153, 106, 179, 125),
|
||||||
),
|
),
|
||||||
zht=Button(
|
zht=Button(
|
||||||
file='./assets/zht/momotalk/NOTIFICATION_BADGE.png',
|
file='./assets/zht/momotalk/NOTIFICATION_BADGE.png',
|
||||||
area=(171, 109, 200, 128),
|
area=(153, 106, 179, 125),
|
||||||
search=(151, 89, 220, 148),
|
search=(133, 86, 199, 145),
|
||||||
color=(242, 101, 47),
|
color=(244, 115, 68),
|
||||||
button=(171, 109, 200, 128),
|
button=(153, 106, 179, 125),
|
||||||
),
|
),
|
||||||
)
|
)
|
||||||
REPLY = ButtonWrapper(
|
REPLY = ButtonWrapper(
|
||||||
@@ -367,10 +367,10 @@ SWITCH_MESSAGE_CHECK = ButtonWrapper(
|
|||||||
name='SWITCH_MESSAGE_CHECK',
|
name='SWITCH_MESSAGE_CHECK',
|
||||||
jp=Button(
|
jp=Button(
|
||||||
file='./assets/jp/momotalk/SWITCH_MESSAGE_CHECK.png',
|
file='./assets/jp/momotalk/SWITCH_MESSAGE_CHECK.png',
|
||||||
area=(231, 167, 379, 190),
|
area=(232, 170, 356, 189),
|
||||||
search=(211, 147, 399, 210),
|
search=(212, 150, 376, 209),
|
||||||
color=(197, 201, 202),
|
color=(195, 199, 201),
|
||||||
button=(231, 167, 379, 190),
|
button=(232, 170, 356, 189),
|
||||||
),
|
),
|
||||||
en=Button(
|
en=Button(
|
||||||
file='./assets/en/momotalk/SWITCH_MESSAGE_CHECK.png',
|
file='./assets/en/momotalk/SWITCH_MESSAGE_CHECK.png',
|
||||||
@@ -439,10 +439,10 @@ UNREAD = ButtonWrapper(
|
|||||||
name='UNREAD',
|
name='UNREAD',
|
||||||
jp=Button(
|
jp=Button(
|
||||||
file='./assets/jp/momotalk/UNREAD.png',
|
file='./assets/jp/momotalk/UNREAD.png',
|
||||||
area=(454, 158, 570, 194),
|
area=(475, 158, 590, 197),
|
||||||
search=(434, 138, 590, 214),
|
search=(455, 138, 610, 217),
|
||||||
color=(242, 243, 243),
|
color=(242, 243, 244),
|
||||||
button=(454, 158, 570, 194),
|
button=(475, 158, 590, 197),
|
||||||
),
|
),
|
||||||
en=Button(
|
en=Button(
|
||||||
file='./assets/en/momotalk/UNREAD.png',
|
file='./assets/en/momotalk/UNREAD.png',
|
||||||
|
|||||||
@@ -99,7 +99,7 @@ class MomoTalkUI(UI):
|
|||||||
If yes, open it otherwise it means no student available for interaction.
|
If yes, open it otherwise it means no student available for interaction.
|
||||||
"""
|
"""
|
||||||
self.ui_ensure(page_main)
|
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)
|
self.ui_ensure(page_momo_talk)
|
||||||
while SWITCH_SIDEBAR.get(self) != "message":
|
while SWITCH_SIDEBAR.get(self) != "message":
|
||||||
SWITCH_SIDEBAR.set("message", self)
|
SWITCH_SIDEBAR.set("message", self)
|
||||||
|
|||||||