Merge pull request LmeSzinc#5093 from guoh064/handle_manjuu_2

Author: AzureG03

module/device/device.py

@@ -68,7 +68,7 @@ class Device(Screenshot, Control, AppControl, Input):
     click_record = collections.deque(maxlen=15)
     stuck_timer = Timer(60, count=60).start()
     stuck_timer_long = Timer(180, count=180).start()
-    stuck_long_wait_list = ['BATTLE_STATUS_S', 'PAUSE', 'LOGIN_CHECK']
+    stuck_long_wait_list = ['BATTLE_STATUS_S', 'PAUSE', 'LOGIN_CHECK', 'TEMPLATE_MANJUU']
 
     def __init__(self, *args, **kwargs):
         for trial in range(4):

module/handler/info_handler.py

@@ -535,11 +535,18 @@ def wait_until_manjuu_disappear(self):
         """
         Wait until manjuu loading disappear.
         """
+        # Abuse of notation. Template do not have readable name, so add string here.
+        self.device.stuck_record_add('TEMPLATE_MANJUU')
+        timer = Timer(1.5, count=3).start()
         while 1:
             self.device.screenshot()
-            if not self.manjuu_count():
-                break
-
+            if self.manjuu_count():
+                timer.reset()
+            else:
+                if timer.reached():
+                    logger.info(f'Manjuu disappeared')
+                    break
+    
     def handle_manjuu(self):
         """
         Handle manjuu loading.