feat(*): 移除 device.update_screenshot() 方法

kotonebot/backend/context/context.py

@@ -618,10 +618,6 @@ class ContextDevice(DeviceABC):
     def __init__(self, device: DeviceABC):
         self._device = device
 
-    @deprecated('使用 device.screenshot() 代替')
-    def update_screenshot(self):
-        return self.screenshot()
-
     def screenshot(self):
         """
         截图。返回截图数据，同时更新当前上下文的截图数据。
@@ -636,13 +632,13 @@ class ContextDevice(DeviceABC):
         return img
 
     def __getattribute__(self, name: str) -> Any:
-        if name in ['update_screenshot', '_device', 'screenshot']:
+        if name in ['_device', 'screenshot']:
             return object.__getattribute__(self, name)
         else:
             return getattr(self._device, name)
         
     def __setattr__(self, name: str, value: Any):
-        if name in ['update_screenshot', '_device', 'screenshot']:
+        if name in ['_device', 'screenshot']:
             return object.__setattr__(self, name, value)
         else:
             return setattr(self._device, name, value)

kotonebot/backend/dispatch.py

@@ -93,14 +93,14 @@ def dispatcher(
         ctx = DispatcherContext()
         while not ctx.finished:
             from kotonebot import device
-            device.update_screenshot()
+            device.screenshot()
             ret = func(ctx, *args, **kwargs)
             ctx._first_run = False
         return ret
     def fragment_wrapper(*args: P.args, **kwargs: P.kwargs):
         ctx = DispatcherContext()
         from kotonebot import device
-        device.update_screenshot()
+        device.screenshot()
         return func(ctx, *args, **kwargs)
     setattr(wrapper, ATTR_ORIGINAL_FUNC, func)
     setattr(fragment_wrapper, ATTR_ORIGINAL_FUNC, func)

kotonebot/tasks/produce.py

@@ -48,15 +48,15 @@ def select_idol(target_titles: list[str] | PIdol):
     
     logger.info(f"Find and select idol: {target_titles}")
     # 进入总览
-    device.update_screenshot()
+    device.screenshot()
     device.click(image.expect(R.Produce.ButtonPIdolOverview))
     while not image.find(R.Common.ButtonConfirmNoIcon):
-        device.update_screenshot()
+        device.screenshot()
 
     if isinstance(target_titles, PIdol):
         target_titles = target_titles.value
     _target_titles = [equals(t, remove_space=True) for t in target_titles]
-    device.update_screenshot()
+    device.screenshot()
     # 定位滑动基准
     results = image.find_all(R.Produce.IconPIdolLevel)
     results.sort(key=lambda r: tuple(r.position))
@@ -78,7 +78,7 @@ def select_idol(target_titles: list[str] | PIdol):
         # 如果不是，就挨个选中，判断名称
         for r in results:
             device.click(r)
-            device.update_screenshot()
+            device.screenshot()
             if all(ocr.find_all(_target_titles, rect=R.Produce.KbIdolOverviewName)):
                 found = True
                 break
@@ -89,7 +89,7 @@ def select_idol(target_titles: list[str] | PIdol):
             # 翻页
             device.swipe(x1=100, x2=100, y1=max_y, y2=min_y)
             sleep(2)
-            device.update_screenshot()
+            device.screenshot()
             results = image.find_all(R.Produce.IconPIdolLevel)
             results.sort(key=lambda r: tuple(r.position))
 

kotonebot/tasks/purchase.py

@@ -28,7 +28,7 @@ def money_items2(items: Optional[list[DailyMoneyShopItems]] = None):
     if items is None:
         items = conf().purchase.money_items
     
-    device.update_screenshot()
+    device.screenshot()
     if DailyMoneyShopItems.Recommendations in items:
         dispatch_recommended_items()
         items.remove(DailyMoneyShopItems.Recommendations)
@@ -51,7 +51,7 @@ def money_items2(items: Optional[list[DailyMoneyShopItems]] = None):
         else:
             device.swipe_scaled(x1=0.5, x2=0.5, y1=0.8, y2=0.5)
             sleep(0.5)
-            device.update_screenshot()
+            device.screenshot()
             scroll += 1
             if scroll >= max_scroll:
                 break