Add: 15-1 daemon

Add: plane statistics method

Upd: config MoveDownTime for 15-1 daemon and battle time in plane statistics

Opt: StopCondition RunCount for daemon 15-1

Opt: save screenshot in quit menu

Fix: use uiautomator2 long_click and pause retry

.github/pull.yml

@@ -0,0 +1,8 @@
+version: "1"
+rules:
+  - base: master
+    upstream: LmeSzinc:master
+    mergeMethod: merge
+    mergeUnstable: true
+label: ":arrow_heading_down: pull"
+conflictLabel: "merge-conflict": true

.github/workflows/main.yml

@@ -0,0 +1,34 @@
+name: Upstream Sync
+
+permissions:
+    contents: write
+
+on:
+    schedule:
+        - cron: "0 * * * *"
+    workflow_dispatch:
+
+jobs:
+    sync_with_upstream:
+        name: Sync with Upstream
+        runs-on: ubuntu-latest
+        if: ${{ github.event.repository.fork }}
+
+        steps:
+            - name: Checkout target repo
+              uses: actions/checkout@v3
+
+            - name: Sync Upstream
+              uses: aormsby/Fork-Sync-With-Upstream-action@v3.4
+              with:
+                  target_repo_token: ${{ secrets.GITHUB_TOKEN }}
+                  upstream_sync_repo: LmeSzinc/AzurLaneAutoScript
+                  upstream_sync_branch: master
+                  target_sync_branch: master
+                  test_mode: false
+
+            - name: Check for Failure
+              if: failure()
+              run: |
+                  echo "[Error] Due to a change in the workflow file of the upstream repository, GitHub has automatically suspended the scheduled automatic update. You need to manually sync your fork."
+                  exit 1

README.md

@@ -177,4 +177,3 @@ Alas 仍在活跃开发中，我们会不定期发布未来的工作在 [Issues]
 - QQ 七群：[1026960593](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=rPYxlGzFCRl1jK7cnUXrCzmX6KCEvc4U&authKey=XTLdoBWD6hFxx7sFVbF2L94XyjKnjAIoATzWQcJj98%2By%2BDW%2F%2BG6YbqVuF85FQkex&noverify=0&group_code=1026960593)
 - QQ 一群：[1087735381](https://jq.qq.com/?_wv=1027&k=I4NSqX7g) （有开发意向请加一群，入群需要提供你的Github用户名）
 - Bilibili 直播间：https://live.bilibili.com/22216705 ，偶尔直播写Alas，~~为了拯救Alas，Lme决定出道成为偶像~~
-

alas.py

@@ -14,6 +14,8 @@ from module.exception import *
 from module.logger import logger
 from module.notify import handle_notify
 
+RESTART_SENSITIVE_TASKS = ['OpsiObscure', 'OpsiAbyssal', 'OpsiCrossMonth']
+
 
 class AzurLaneAutoScript:
     stop_event: threading.Event = None
@@ -48,6 +50,9 @@ class AzurLaneAutoScript:
         except RequestHumanTakeover:
             logger.critical('Request human takeover')
             exit(1)
+        except EmulatorNotRunningError:
+            logger.critical('EmulatorNotRunningError')
+            exit(1)
         except Exception as e:
             logger.exception(e)
             exit(1)
@@ -96,12 +101,10 @@ class AzurLaneAutoScript:
             if self.checker.is_available():
                 logger.critical('Game page unknown')
                 self.save_error_log()
-                handle_notify(
+                logger.warning('Restart to reset Game page in 10 seconds')
-                    self.config.Error_OnePushConfig,
+                self.config.task_call('Restart')
-                    title=f"Alas <{self.config_name}> crashed",
+                self.device.sleep(10)
-                    content=f"<{self.config_name}> GamePageUnknownError",
+                return False
-                )
-                exit(1)
             else:
                 self.checker.wait_until_available()
                 return False
@@ -122,6 +125,10 @@ class AzurLaneAutoScript:
                 content=f"<{self.config_name}> RequestHumanTakeover",
             )
             exit(1)
+        except AutoSearchSetError:
+            logger.critical('Auto search could not be set correctly. Maybe your ships in hard mode are changed.')
+            logger.critical('Request human takeover.')
+            exit(1)
         except Exception as e:
             logger.exception(e)
             self.save_error_log()
@@ -379,6 +386,10 @@ class AzurLaneAutoScript:
         from module.event_hospital.hospital import Hospital
         Hospital(config=self.config, device=self.device).run()
 
+    def hospital_event(self):
+        from module.event_hospital.hospital_event import HospitalEvent
+        HospitalEvent(config=self.config, device=self.device).run()
+
     def coalition(self):
         from module.coalition.coalition import Coalition
         Coalition(config=self.config, device=self.device).run()
@@ -407,6 +418,10 @@ class AzurLaneAutoScript:
         GemsFarming(config=self.config, device=self.device).run(
             name=self.config.Campaign_Name, folder=self.config.Campaign_Event, mode=self.config.Campaign_Mode)
 
+    def daemon_15_1(self):
+        from module.daemon.daemon_15_1 import AzurLaneDaemon
+        AzurLaneDaemon(config=self.config, device=self.device, task="Daemon_15_1").run()
+
     def daemon(self):
         from module.daemon.daemon import AzurLaneDaemon
         AzurLaneDaemon(config=self.config, device=self.device, task="Daemon").run()
@@ -419,6 +434,10 @@ class AzurLaneAutoScript:
         from module.eventstory.eventstory import EventStory
         EventStory(config=self.config, device=self.device, task="EventStory").run()
 
+    def box_disassemble(self):
+        from module.storage.box_disassemble import StorageBox
+        StorageBox(config=self.config, device=self.device, task="BoxDisassemble").run()
+
     def azur_lane_uncensored(self):
         from module.daemon.uncensored import AzurLaneUncensored
         AzurLaneUncensored(config=self.config, device=self.device, task="AzurLaneUncensored").run()
@@ -541,8 +560,12 @@ class AzurLaneAutoScript:
             _ = self.device
             self.device.config = self.config
             # Skip first restart
-            if self.is_first_task and task == 'Restart':
+            if task == 'Restart':
-                logger.info('Skip task `Restart` at scheduler start')
+                if self.is_first_task:
+                    logger.info('Skip task `Restart` at scheduler start')
+                else:
+                    from module.handler.login import LoginHandler
+                    LoginHandler(self.config, self.device).app_restart()
                 self.config.task_delay(server_update=True)
                 del_cached_property(self, 'config')
                 continue
@@ -560,17 +583,21 @@ class AzurLaneAutoScript:
             failed = deep_get(self.failure_record, keys=task, default=0)
             failed = 0 if success else failed + 1
             deep_set(self.failure_record, keys=task, value=failed)
-            if failed >= 3:
+            if failed >= 3 or (self.config.Error_StrictRestart and failed >= 1 and task in RESTART_SENSITIVE_TASKS):
-                logger.critical(f"Task `{task}` failed 3 or more times.")
+                logger.critical(f"Task `{task}` failed {failed} or more times.")
                 logger.critical("Possible reason #1: You haven't used it correctly. "
                                 "Please read the help text of the options.")
                 logger.critical("Possible reason #2: There is a problem with this task. "
                                 "Please contact developers or try to fix it yourself.")
+                if self.config.Error_StrictRestart and task in RESTART_SENSITIVE_TASKS:
+                    logger.critical("Possible reason #3: This is a restart sensitive task. "
+                                    "Please take over the game manually or turn off 'StrictRestart' option.")
                 logger.critical('Request human takeover')
+
                 handle_notify(
                     self.config.Error_OnePushConfig,
                     title=f"Alas <{self.config_name}> crashed",
-                    content=f"<{self.config_name}> RequestHumanTakeover\nTask `{task}` failed 3 or more times.",
+                    content=f"<{self.config_name}> RequestHumanTakeover\nTask `{task}` failed {failed} or more times.",
                 )
                 exit(1)
 

assets/gui/css/alas-mobile.css

@@ -35,6 +35,14 @@
     grid-template-columns: 1fr auto;
     grid-template-rows: 1fr auto;
 }
+#pywebio-scope-dashboard {
+    font-weight: 400;
+    width: 100%;
+    display: grid;
+    grid-auto-flow: row;
+    grid-template-columns: repeat(auto-fit,minmax(6rem,1fr));
+    overflow: hidden;
+}
 
 #pywebio-scope-_groups {
     grid-template-columns: 0fr 1fr;
@@ -59,4 +67,26 @@
 #pywebio-scope-waiting,
 #pywebio-scope-log {
     overflow-y: auto;
+}
+
+#output-container .status-point {
+    margin: 45% 50% 55% 50%;
+    width: .4rem;
+    height: .4rem;
+    border-radius: 50%;
+}
+
+*[style*="--dashboard-limit--"] {
+    font-size: .8rem;
+    padding: 0.2rem 0 0 0;
+}
+*[style*="--dashboard-value--"] {
+    font-size: 1rem;
+    margin: 0 0 0 0.4rem !important;
+}
+*[style*="--dashboard-total--"] {
+    font-size: 1rem;
+}
+*[style*="--dashboard-help--"] {
+    font-size: .6rem;
 }

assets/gui/css/alas-pc.css

@@ -44,4 +44,4 @@
     display: grid;
     grid-auto-flow: column;
     grid-template-columns: auto auto;
-}
+}

assets/gui/css/alas.css

@@ -117,6 +117,13 @@ footer {
     margin-bottom: .25rem !important;
 }
 
+.status-point {
+    margin: 37% 50% 63% 50%;
+    width: .75rem;
+    height: .75rem;
+    border-radius: 50%;
+}
+
 .hr-task-group-box {
     display: flex;
     align-items: center;
@@ -288,7 +295,7 @@ pre.rich-traceback-code {
 }
 
 *[style*="--header-text--"] {
-    font-size: 1.5rem;
+    font-size: 1rem;
     font-weight: bold;
     margin: auto !important;
 }
@@ -399,11 +406,31 @@ pre.rich-traceback-code {
     justify-content: space-between;
 }
 
+#pywebio-scope-log-bar {
+    flex-wrap: wrap;
+}
+
 #pywebio-scope-log-bar-btns {
     display: grid;
     grid-auto-flow: column;
 }
 
+#pywebio-scope-log-bar .hr-group {
+    width: 100%;
+}
+
+#pywebio-scope-dashboard {
+    font-weight: 400;
+    width: 100%;
+    display: grid;
+    grid-auto-flow: row;
+    grid-template-columns: repeat(auto-fit,minmax(10rem,1fr));
+}
+
+#pywebio-scope-dashboard .form-control{
+    padding: 0 0 0;
+    }
+
 #pywebio-scope-log {
     line-height: 1.2;
     font-size: 0.85rem;
@@ -467,8 +494,7 @@ pre.rich-traceback-code {
     display: grid;
 }
 
-.bs-title-option,
+.bs-title-option {
-.form-check-input[id*="ch_S"] {
     display: none;
 }
 
@@ -523,4 +549,50 @@ pre.rich-traceback-code {
     width: 1.5rem;
     height: 1.5rem;
     border: .2em solid currentColor;
-}
+}
+
+/**[style*="--dashboard-value--"] {*/
+/*    font-size: 1.3rem;*/
+/*    font-weight: 400;*/
+/*    margin: 0 0 -0.2rem 0.6rem !important;*/
+/*    overflow-wrap: break-word;*/
+/*    overflow: visible;*/
+/*    border-bottom: 0;*/
+/*}*/
+
+*[style*="--dashboard-value--"] {
+    font-size: 1.2rem;
+    font-weight: 400;
+    margin: 0 0 0 0.6rem !important;
+    font-family:
+             "Arial",
+             serif;
+}
+
+*[style*="--dashboard-total--"] {
+    font-size: 1.2rem;
+    font-weight: 400;
+    margin: 0 0 0 0.15rem !important;
+    font-family:
+             "Arial",
+             serif;
+}
+
+*[style*="--dashboard-help--"] {
+    font-size: .8rem;
+    margin: 0 0 0 0.6rem !important;
+    font-family:
+             "Arial",
+             serif;
+}
+
+*[style*="--dashboard-limit--"] {
+    font-weight: 400;
+    font-size: .9rem;
+    margin: 0 0 0 0 !important;
+    vertical-align: text-bottom;
+    overflow-wrap: normal;
+    font-family:
+             "Arial",
+             serif;
+}

assets/gui/css/dark-alas.css

@@ -149,7 +149,19 @@ pre.rich-traceback-code {
     border-bottom: 1px solid #36393f;
 }
 
+#pywebio-scope-dashboard input {
+    background-color: #2f3136 !important;
+}
+
 *[style*="--arg-help--"],
 [id^="pywebio-scope-group_"] > p + p {
     color: #adb5bd;
-}
+}
+
+*[style*="--dashboard-help--"]{
+    color: #adb5bd;
+}
+
+*[style*="--dashboard-limit--"]{
+    color: #adb5bd;
+}

assets/gui/css/light-alas.css

@@ -56,6 +56,10 @@
     box-shadow: 0 0.06rem 0 #4e4c97;
 }
 
+#pywebio-scope-dashboard input {
+    background-color: white !important;
+}
+
 input[type="checkbox"] {
     accent-color: #7a77bb;
 }
@@ -151,4 +155,12 @@ pre.rich-traceback-code {
 *[style*="--arg-help--"],
 [id^="pywebio-scope-group_"] > p + p {
     color: #777777;
+}
+
+*[style*="--dashboard-help--"]{
+    color: #777777;
+}
+
+*[style*="--dashboard-limit--"]{
+    color: #777777;
 }