Merge 962191d423 into 2cad7ebbac

module/device/platform/platform_windows.py

@@ -12,7 +12,6 @@ from module.device.platform.platform_base import PlatformBase
 from module.device.platform.emulator_windows import Emulator, EmulatorInstance, EmulatorManager
 from module.logger import logger
 
-import os
 
 class EmulatorUnknown(Exception):
     pass
@@ -102,11 +101,6 @@ class PlatformWindows(PlatformBase, EmulatorManager):
         elif instance == Emulator.BlueStacks4:
             # BlueStacks\Client\Bluestacks.exe -vmname Android_1
             self.execute(f'"{exe}" -vmname {instance.name}')
-        elif instance == Emulator.LDPlayer9:
-            directory, filename = os.path.split(exe)
-            new_filename = 'ldconsole.exe'
-            exe = os.path.join(directory, new_filename)
-            self.execute(f'"{exe}" launch --index {instance.name.replace("leidian", "")}')
         else:
             raise EmulatorUnknown(f'Cannot start an unknown emulator instance: {instance}')
 
@@ -161,11 +155,6 @@ class PlatformWindows(PlatformBase, EmulatorManager):
             self.execute(f'"{exe}" -clone:{instance.name} -quit')
         elif instance == Emulator.BlueStacks5:
             self.execute(f'taskkill /fi "WINDOWTITLE eq {instance.name}" /IM "HD-Player.exe" /F')
-        elif instance == Emulator.LDPlayer9:
-            directory, filename = os.path.split(exe)
-            new_filename = 'ldconsole.exe'
-            exe = os.path.join(directory, new_filename)
-            self.execute(f'"{exe}" quit --index {instance.name.replace("leidian", "")}')
         else:
             raise EmulatorUnknown(f'Cannot stop an unknown emulator instance: {instance}')
 

tasks/base/assets/assets_base_popup.py

@@ -261,21 +261,3 @@ NETWORK_RECONNECT_OK = ButtonWrapper(
         button=(540, 471, 744, 530),
     ),
 )
-QUIT = ButtonWrapper(
-    name='QUIT',
-    jp=None,
-    en=Button(
-        file='./assets/en/base/popup/QUIT.png',
-        area=(587, 309, 688, 357),
-        search=(567, 289, 708, 377),
-        color=(225, 225, 225),
-        button=(410, 473, 623, 532),
-    ),
-    zht=Button(
-        file='./assets/zht/base/popup/QUIT.png',
-        area=(556, 310, 713, 364),
-        search=(536, 290, 733, 384),
-        color=(215, 215, 215),
-        button=(411, 472, 620, 535),
-    ),
-)

tasks/base/popup.py

@@ -116,11 +116,4 @@ class PopupHandler(ModuleBase):
         if self.appear_then_click(LEVEL_UP, interval=interval):
             return True
 
-        return False
-    
-    def handle_quit(self, interval=5) -> bool:
-        if self.appear_then_click(QUIT, interval=interval):
-            return True
-
-        return False
-    
+        return False

tasks/base/ui.py

@@ -130,7 +130,7 @@ class UI(MainPage):
         self.interval_clear(list(Page.iter_check_buttons()))
 
         # loading_timer = Timer(0.5)
-        #back_timer = Timer(10, 10)
+        back_timer = Timer(10, 10)
         logger.hr(f"UI goto {destination}")
         while 1:
             if skip_first_screenshot:
@@ -177,14 +177,14 @@ class UI(MainPage):
             if self.ui_additional():
                 continue
 
-            #back_timer.start()
-            #if back_timer.reached_and_reset():
-            #    if self.match_color(LOGIN_LOADING, interval=5, threshold=80) or self.appear_trademark_year():
-            #        from tasks.login.login import Login
-            #        Login(self.config, self.device).handle_app_login()
-            #        continue
-            #    self.device.back()
-            #    logger.info("Unknown page, try to back")
+            back_timer.start()
+            if back_timer.reached_and_reset():
+                if self.match_color(LOGIN_LOADING, interval=5, threshold=80) or self.appear_trademark_year():
+                    from tasks.login.login import Login
+                    Login(self.config, self.device).handle_app_login()
+                    continue
+                self.device.back()
+                logger.info("Unknown page, try to back")
 
         # Reset connection
         Page.clear_connection()
@@ -372,8 +372,6 @@ class UI(MainPage):
             return True
         if self.handle_daily_news():
             return True
-        if self.handle_quit():
-            return True
         if self.handle_network_reconnect():
             return True
         if self.handle_affection_level_up():

tasks/shop/shop.py

@@ -83,7 +83,7 @@ class Shop(ShopUI):
                     return ShopStatus.SELECT_SHOP
                 return ShopStatus.END
             case ShopStatus.END:
-                if self.appear(page_shop.check_button) and self.match_color(page_shop.check_button):
+                if self.appear(page_shop.check_button):
                     self.task.pop(0)
                     return ShopStatus.SELECT_SHOP
                 self.click_with_interval(BACK, interval=2)