feat(activity-updater): Add activity updater to automatically fetch activity info.

.github/workflows/sync_activity.yml

@@ -0,0 +1,55 @@
+name: sync_game_activity
+
+on:
+  schedule:
+    - cron: '30 20 * * *'
+  workflow_dispatch:
+
+permissions:
+  contents: write
+  pull-requests: write
+
+
+jobs:
+  sync-activities:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout activities repository
+        uses: actions/checkout@v4
+        with:
+          sparse-checkout: |
+            module/activities/
+      - name: Set up Python 3.9
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.9'
+      - name: Install requirements
+        run: |
+          python -m pip install --upgrade pip
+          pip install -r module/activities/requirements-activity-updater.txt
+      - name: Run activity updater
+        run: python3 module/activities/activity_updater.py
+      - name: Upload update log as artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: activity-update-log
+          path: module/activities/activity_update_log.md
+      - name: Copy updated activity.json if changed
+        if: success() && (hashFiles('module/activities/tmp_activity.json') != '')
+        # Only upload and create PR if any new updates to the existing activity data
+        run: cp module/activities/tmp_activity.json module/activities/activity.json
+      - name: Set the output log as PR body
+        if: success() && (hashFiles('module/activities/tmp_activity.json') != '')
+        id: pr_body
+        run: |
+          echo "body<<EOF" >> $GITHUB_OUTPUT
+          cat module/activities/activity_update_log.md >> $GITHUB_OUTPUT
+          echo "EOF" >> $GITHUB_OUTPUT
+      - name: Create Pull Request if updated
+        if: success() && (hashFiles('module/activities/tmp_activity.json') != '')
+        uses: peter-evans/create-pull-request@v7
+        with:
+          commit-message: "chore(activity): sync activity.json (auto-update by workflow)"
+          title: "CI/sync activity.json (auto-update by workflow)"
+          body: "${{ steps.pr_body.outputs.body }}"
+          branch: "auto-sync-activity"

core/Baas_thread.py

@@ -12,7 +12,6 @@
 import cv2
 import numpy as np
 import psutil
-import requests
 
 import module.ExploreTasks.explore_task
 from core import position, picture, utils
@@ -22,7 +21,6 @@
 from core.device.Screenshot import Screenshot
 from core.device.connection import Connection
 from core.device.emulator_manager import process_api
-from core.device.uiautomator2_client import BAAS_U2_Initer, __atx_agent_version__
 from core.device.uiautomator2_client import U2Client
 from core.exception import RequestHumanTakeOver, FunctionCallTimeout, PackageIncorrect, LogTraceback
 from core.notification import notify, toast
@@ -378,27 +376,6 @@ def _read_DeviceOption_ocr_language(self, _p):
             else:
                 raise Exception("Global Server Invalid Language : " + game_lan + ".")
 
-    def check_atx(self):
-        self.logger.info("--------------Check ATX install ----------------")
-        _d = self.u2._wait_for_device()
-        if not _d:
-            raise RuntimeError("USB device %s is offline " + self.serial)
-        self.logger.info("Device [ " + self.serial + " ] is online.")
-
-        version_url = self.u2.path2url("/version")
-        try:
-            version = requests.get(version_url, timeout=3).text
-            if version != __atx_agent_version__:
-                raise EnvironmentError("atx-agent need upgrade")
-        except (requests.RequestException, EnvironmentError):
-            self.set_up_atx_agent()
-        self.wait_uiautomator_start()
-        self.logger.info("Uiautomator2 service started.")
-
-    def set_up_atx_agent(self):
-        init = BAAS_U2_Initer(self.u2._adb_device, self.logger)
-        init.install()
-
     def send(self, msg, task=None):
         if msg == "start":
             if self.button_signal is not None:
@@ -863,8 +840,8 @@ def daily_config_refresh(self):
         last_refresh_hour = last_refresh.hour
         daily_reset = 4 - (self.server == 'JP' or self.server == 'Global')
         if now.day == last_refresh.day and now.year == last_refresh.year and now.month == last_refresh.month and \
-                ((hour < daily_reset and last_refresh_hour < daily_reset) or (
-                        hour >= daily_reset and last_refresh_hour >= daily_reset)):
+            ((hour < daily_reset and last_refresh_hour < daily_reset) or (
+                hour >= daily_reset and last_refresh_hour >= daily_reset)):
             return
         else:
             self.config.last_refresh_config_time = time.time()
@@ -981,9 +958,10 @@ def handle_resolution_dynamic_change(self):
         _new = self.connection.app_process_window.get_resolution()
         if self.resolution[0] == _new[0] and self.resolution[1] == _new[1]:
             return
-        self.logger.warning("Screen Resolution change detected, we don't recommend you to change screen resolution while running the script.")
+        self.logger.warning(
+            "Screen Resolution change detected, we don't recommend you to change screen resolution while running the script.")
 
-        _new = self._wait_resolution_change_finish(_new,10, 0.3)
+        _new = self._wait_resolution_change_finish(_new, 10, 0.3)
         if self.resolution[0] == _new[0] and self.resolution[1] == _new[1]:
             self.logger.info("Resolution unchanged.")
             return
@@ -1020,7 +998,6 @@ def _wait_resolution_change_finish(self, last_res, static_cnt=10, interval=0.3):
                 latest_res = _new
             time.sleep(interval)
 
-
     @staticmethod
     def _accept_resolution(x, y, std_x=16, std_y=9, threshold=0.05):
         return abs(x / y - std_x / std_y) <= threshold
@@ -1030,7 +1007,8 @@ def check_screen_ratio(self, width, height):
         screen_ratio = width // gcd, height // gcd
         if screen_ratio == (16, 9):
             return
-        self.logger.warning(f"Screen Ratio: {width}:{height} is not a precise 16:9 screen, we recommend you to use a precise 16:9 screen.")
+        self.logger.warning(
+            f"Screen Ratio: {width}:{height} is not a precise 16:9 screen, we recommend you to use a precise 16:9 screen.")
         if self._accept_resolution(width, height, 16, 9, 0.05):
             self.logger.info(f"Screen Ratio close to 16:9. Accept it.")
             return
@@ -1040,15 +1018,13 @@ def check_screen_ratio(self, width, height):
     def _get_android_device_resolution(self):
         self.u2_client = U2Client.get_instance(self.serial)
         self.u2 = self.u2_client.get_connection()
-        self.check_atx()
         self.last_refresh_u2_time = time.time()
         return self.resolution_uiautomator2()
 
     def resolution_uiautomator2(self):
         for i in range(0, 3):
             try:
-                info = self.u2.http.get('/info').json()
-                w, h = info['display']['width'], info['display']['height']
+                w, h = self.u2.info['displayWidth'], self.u2.info['displayHeight']
                 if w < h:
                     w, h = h, w
                 return w, h
@@ -1060,17 +1036,3 @@ def main_page_update_data(self):
         self.get_ap(True)
         self.get_creditpoints(True)
         self.get_pyroxene(True)
-
-
-if __name__ == '__main__':
-    print(os.path.exists(
-        "D:\\github\\bass\\blue_archive_auto_script\\src\\atx_app\\atx-agent_0.10.1_linux_386\\atx-agent"))
-    # "D:\\github\\bass\\blue_archive_auto_script\\src\\atx_app\\atx-agent_0.10.0_linux_386\\atx-agent"
-    import uiautomator2
-
-    u2 = uiautomator2.connect("127.0.0.1:16512")
-    from core.utils import Logger
-
-    logger = Logger(None)
-    init = BAAS_U2_Initer(u2._adb_device, logger)
-    init.uninstall()

core/device/screenshot/uiautomator2.py

@@ -9,6 +9,8 @@ def __init__(self, conn):
     def screenshot(self):
         for i in range(5):
             try:
-                return self.u2.screenshot()
+                screenshot = self.u2.screenshot()
+                if screenshot is not None:
+                    return screenshot
             except Exception as e:
                 print(e)