taotoolkit 2.0.0__tar.gz → 2.0.1__tar.gz

{taotoolkit-2.0.0 → taotoolkit-2.0.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: taotoolkit
-Version: 2.0.0
+Version: 2.0.1
 Summary: Tao ToolKit
 Author-email: taotaoli <taotaoli@asrmicro.com>
 License-Expression: MIT
@@ -19,7 +19,7 @@ Requires-Dist: beautifulsoup4>=4.10.0
 Requires-Dist: pyyaml>=6.0.3
 Requires-Dist: pywinpty>=3.0.5; platform_system == "Windows"
 Provides-Extra: uiautomator
-Requires-Dist: uiautomator2>=2.0.0; extra == "uiautomator"
+Requires-Dist: uiautomator2>=2.0.1; extra == "uiautomator"
 
 # TAO - Toolkit
 

{taotoolkit-2.0.0 → taotoolkit-2.0.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "taotoolkit"
-version = "2.0.0"
+version = "2.0.1"
 description = "Tao ToolKit"
 readme = "README.md"
 requires-python = ">=3.8"
@@ -29,5 +29,5 @@ dependencies = [
 
 [project.optional-dependencies]
 uiautomator = [
-  "uiautomator2>=2.0.0",
+  "uiautomator2>=2.0.1",
 ]

{taotoolkit-2.0.0 → taotoolkit-2.0.1}/taotoolkit/__init__.py

@@ -39,7 +39,7 @@ from .tao_camDvt import camDvtMain as camDvtMain, printHelp as camDvtHelp, CamDv
 
 from .asrVrf import Vrf
 
-__version__ = "2.0.0"
+__version__ = "2.0.1"
 
 __all__ = [
     "debugCtrl",

{taotoolkit-2.0.0 → taotoolkit-2.0.1}/taotoolkit/tao_device.py

@@ -1034,27 +1034,67 @@ class DevOp:
             sleep(interval)
         return False
 
+    def getRefJpgSize(self, path: str, maxCount=5) -> Optional[int]:
+        """取目录内最近几张 jpg 的中位尺寸, 用于识别 offlineSession 先落盘的小图"""
+        out = rCmd(f"adb -s {self.serial} shell ls -lt {path}")[0]
+        sizes = []
+        for line in out.splitlines():
+            parts = line.split()
+            if len(parts) < 5 or not parts[4].isdigit():
+                continue
+            fileName = parts[-1].lower()
+            if fileName.endswith((".jpg", ".jpeg")) and "thumb" not in fileName:
+                sizes.append(int(parts[4]))
+            if len(sizes) >= maxCount:
+                break
+        if not sizes:
+            return None
+        sizes.sort()
+        return sizes[len(sizes) // 2]
+
     def capJPG(self, name="null", wait=10):
         outPath = self.curPath
         logi(f"capture {os.path.join(outPath, name)}.jpg")
         jpgPath = r"/sdcard/DCIM/Camera/"
         oldFileList = self.getSuffixList(jpgPath, "jpg", "jpeg")
+        refSize = self.getRefJpgSize(jpgPath)
+        logd(f"ref jpg size {refSize}")
         cmd = f"adb -s {self.serial} shell input keyevent 27"
         rCmd(cmd, showCmd=True, logLevel="info")
 
         # 轮询替代固定等待: wait 为总超时(秒), 新文件写入稳定后立即返回
+        # offlineSession 会先落一张小图(如 1440x1080)再替换为满尺寸图, 仅判稳定会拉到小图,
+        # 故尺寸明显小于历史照片时跳过, 等大图替换完成; 无历史照片时加长稳定窗口
+        stable_s = 1.0 if refSize else 2.5
         deadline = time.time() + wait
         jpgName = None
+        fallbackName = None
+        fallbackSize = 0
         while time.time() < deadline:
             fileList = [f for f in self.getSuffixList(jpgPath, "jpg", "jpeg") if "~" not in f]
-            jpgNameList = list(set(fileList) - set(oldFileList))
-            if jpgNameList:
-                jpgName = jpgNameList[0]
-                if self.waitFileStable(jpgPath + jpgName, timeOut=max(deadline - time.time(), 1.0)):
+            for file in [f for f in fileList if f not in oldFileList]:
+                size = self.getRemoteFileSize(jpgPath + file)
+                if not size:
+                    continue
+                if size > fallbackSize:
+                    fallbackName = file
+                    fallbackSize = size
+                if refSize and size < refSize * 0.5:
+                    logd(f"skip intermediate jpg {file} size {size} < ref {refSize}")
+                    continue
+                jpgName = file
+                break
+            if jpgName is not None:
+                if self.waitFileStable(jpgPath + jpgName, timeOut=max(deadline - time.time(), 1.0), stable_s=stable_s):
                     break
                 jpgName = None
             sleep(0.2)
 
+        if jpgName is None and fallbackName is not None:
+            # 超时仍无满尺寸图时退回最大新文件, 避免直接失败
+            logw(f"no full-size jpg before timeout, use largest new file {fallbackName}")
+            if self.waitFileStable(jpgPath + fallbackName, timeOut=1.0, stable_s=0.5):
+                jpgName = fallbackName
         if jpgName is None:
             loge(f"capture {os.path.join(outPath, name)}.jpg failed")
             return False

{taotoolkit-2.0.0 → taotoolkit-2.0.1}/taotoolkit.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: taotoolkit
-Version: 2.0.0
+Version: 2.0.1
 Summary: Tao ToolKit
 Author-email: taotaoli <taotaoli@asrmicro.com>
 License-Expression: MIT
@@ -19,7 +19,7 @@ Requires-Dist: beautifulsoup4>=4.10.0
 Requires-Dist: pyyaml>=6.0.3
 Requires-Dist: pywinpty>=3.0.5; platform_system == "Windows"
 Provides-Extra: uiautomator
-Requires-Dist: uiautomator2>=2.0.0; extra == "uiautomator"
+Requires-Dist: uiautomator2>=2.0.1; extra == "uiautomator"
 
 # TAO - Toolkit
 

{taotoolkit-2.0.0 → taotoolkit-2.0.1}/taotoolkit.egg-info/requires.txt

@@ -14,4 +14,4 @@ pyyaml>=6.0.3
 pywinpty>=3.0.5
 
 [uiautomator]
-uiautomator2>=2.0.0
+uiautomator2>=2.0.1