taotoolkit 2.0.0__tar.gz → 2.0.2__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: taotoolkit
-Version: 2.0.0
+Version: 2.0.2
 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.2; extra == "uiautomator"
 
 # TAO - Toolkit
 

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

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "taotoolkit"
-version = "2.0.0"
+version = "2.0.2"
 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.2",
 ]

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

@@ -25,6 +25,10 @@ from .tao_common import (
     sysVersion,
     sleep,
     parseArgs,
+    renameFile,
+    findFilesBySuffixKeyword,
+    findFilesWithSuffix,
+    removeAnyContainStr,
 )
 
 # 导入各模块
@@ -39,7 +43,7 @@ from .tao_camDvt import camDvtMain as camDvtMain, printHelp as camDvtHelp, CamDv
 
 from .asrVrf import Vrf
 
-__version__ = "2.0.0"
+__version__ = "2.0.2"
 
 __all__ = [
     "debugCtrl",
@@ -63,6 +67,9 @@ __all__ = [
     "createFolder",
     "fileExist",
     "findFilesBySuffixKeyword",
+    "findFilesWithSuffix",
+    "removeAnyContainStr",
+    "renameFile",
     "normalize_args",
     "register_command",
     "sysVersion",

{taotoolkit-2.0.0 → taotoolkit-2.0.2}/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
@@ -1206,20 +1246,25 @@ class DevOp:
 
 def CLI_pushSo(argsList):
     parser = argparse.ArgumentParser(prog="pushso", description="android设备push so文件")
-    parser.add_argument("-p", "--path", required=True, nargs="+", help="so文件名或路径,支持多so文件 push")
+    parser.add_argument("posPath", nargs="*", default=None, help="so文件名或路径, 可直接输入(pushso xxx.so)")
+    parser.add_argument("-p", "--path", required=False, nargs="+", default=None, help="so文件名或路径,支持多so文件 push")
     parser.add_argument("-s", "--serial", type=str, default="", help="设备SN号(多设备需指定)")
     args = parser.parse_args(argsList)
 
+    paths = list(args.path or []) + list(args.posPath or [])
+    if not paths:
+        parser.error("至少需要指定一个so文件或路径")
+
     dev = DevOp(args.serial)
     so = []
-    if len(args.path) == 1:
-        if os.path.isdir(args.path[0]):
-            so = findFilesBySuffixKeyword(args.path[0], ".so", "")
+    if len(paths) == 1:
+        if os.path.isdir(paths[0]):
+            so = findFilesBySuffixKeyword(paths[0], ".so", "")
             dev.pushso(so)
         else:
-            dev.pushso(args.path)
+            dev.pushso(paths)
     else:
-        dev.pushso(args.path)
+        dev.pushso(paths)
 
 
 def CLI_scrcpy(argsList):
@@ -1295,6 +1340,7 @@ def CLI_screenCap(argsList):
 
     # 默认：主屏或指定 display_id
     dev.adbScreenCap(args.file, display_id=args.display, hdr=args.hdr)
+    logi(f"screen capture {args.file}.png")
 
 
 def CLI_screenRec(argsList):
@@ -1387,12 +1433,15 @@ def CLI_kcam(args):
 
 def _capJpg(argsList):
     parser = argparse.ArgumentParser(prog="capjpg", description="拍摄jpg并导出到PC指定文件名")
-    parser.add_argument("-f", "--file", type=str, default="null", help="jpg名称")
+    parser.add_argument("posFile", nargs="?", default=None, help="jpg名称,无需后缀, 可直接输入(capjpg test)")
+    parser.add_argument("-f", "--file", type=str, default="null", help="jpg名称,无需后缀")
     parser.add_argument("-s", "--serial", type=str, default="", help="设备SN号")
     parser.add_argument("-w", "--wait", type=int, default=10, help="拍照后等待新照片写入完成的超时时间,单位秒,default 10s")
     parser.add_argument("-d", "--devname", type=str, default=None, help="jpg名称后缀标签")
     parser.add_argument("--reset", action="store_true", help="清除缓存，重新扫描设备")
     args = parser.parse_args(argsList)
+    if args.file == "null" and args.posFile is not None:
+        args.file = args.posFile
     if args.reset and os.path.exists(CACHE_FILE):
         os.remove(CACHE_FILE)
         logi("[cache] 缓存已清除")

{taotoolkit-2.0.0 → taotoolkit-2.0.2}/taotoolkit/tao_flash.py

@@ -748,9 +748,11 @@ class jenkinsTool:
         else:
             cmd = f"{self.aimgTool} download -t {finalCfg}"
         if sysVersion == "linux":
-            oCmd(cmd, sleep_s=1.0, showCmd=True, logLevel="info")
+            oCmd(cmd, sleep_s=1.0, showCmd=False, logLevel="info")
         else:
-            rCmdRealtime(cmd, showCmd=True, logLevel="info")
+            rCmdRealtime(cmd, showCmd=False, logLevel="info")
+
+        logh(cmd)
 
     def joinBackslash(self, *args):
         # 将字符串用/拼接起来，最后一个不加
@@ -776,7 +778,7 @@ class jenkinsTool:
         buildNumber, targetUrl = self.findTargetBuild(buildNumber, self.ciOwner, ciTag, buildBoard)
         buildBoard = targetUrl.split("/")[-2]
 
-        logi(f"download {buildNumber} {targetUrl}")
+        logh(f"download {buildNumber} {targetUrl}")
 
         packageName = buildTag + buildNumber + "android" + adVersion + "_" + buildBoard
         imgName = os.path.join(self.downloadPath, packageName + ".zip")

{taotoolkit-2.0.0 → taotoolkit-2.0.2}/taotoolkit/tao_tuning.py

@@ -717,9 +717,9 @@ class asrCamOp(DevOp):
         woke = False
         while True:
             if not self.uiClick(textList, slp=0):
-                # 相机控制面板会自动隐藏, 轻点预览区中心(参考分辨率)唤出后再试
+                # 相机控制面板会自动隐藏, 轻点预览区中心唤出后再试(参考分辨率坐标, adbTap 内部按实际分辨率换算)
                 if not woke:
-                    self.adbTap((360, 800), 0)
+                    self.adbTap((self.refScreenW // 2, self.refScreenH // 2), 0)
                     woke = True
                 if time.time() >= deadline:
                     loge(f"switch to {'video' if video else 'preview'} mode timeout")
@@ -1194,8 +1194,13 @@ class asrCamOp(DevOp):
 
 def CLI_tuningRemoveInfo(argsList):
     parser = argparse.ArgumentParser(prog="tuningRemoveInfo", description="移除tuning参数fw_info")
-    parser.add_argument("-p", "--path", required=True, help="tuning文件名或路径")
+    parser.add_argument("posPath", nargs="?", default=None, help="tuning文件名或路径, 可直接输入(tuningr xxx.data)")
+    parser.add_argument("-p", "--path", required=False, default=None, help="tuning文件名或路径")
     args = parser.parse_args(argsList)
+    if args.path is None:
+        args.path = args.posPath
+    if args.path is None:
+        parser.error("至少需要指定tuning文件名或路径")
     inFile = args.path
     if os.path.isfile(inFile):
         _fileProcessTuningRemoveInfo(inFile)
@@ -1223,7 +1228,8 @@ def CLI_tuningRemoveInfo(argsList):
 
 def CLI_pushVrf(argsList):
     parser = argparse.ArgumentParser(prog="pushvrf", description="push vrf到设备")
-    parser.add_argument("-p", "--path", required=True, help="vrf文件名或路径")
+    parser.add_argument("posPath", nargs="?", default=None, help="vrf文件名或路径, 可直接输入(psvrf xxx.vrf)")
+    parser.add_argument("-p", "--path", required=False, default=None, help="vrf文件名或路径")
     parser.add_argument(
         "-i",
         "--index",
@@ -1239,6 +1245,10 @@ def CLI_pushVrf(argsList):
     parser.add_argument("--matchcase", action="store_true", dest="matchcase", help="是否区分tag大小写")
     parser.set_defaults(matchcase=False)
     args = parser.parse_args(argsList)
+    if args.path is None:
+        args.path = args.posPath
+    if args.path is None:
+        parser.error("至少需要指定vrf文件名或路径")
 
     logi(f"psvrf {args.path} indxe={args.index}, rename={args.rename}, ignoreTag={args.tag}, matchcase={args.matchcase}")
 
@@ -1251,8 +1261,11 @@ def CLI_pushVrf(argsList):
 
 def CLI_capVrf(argsList):
     parser = argparse.ArgumentParser(prog="capvrf", description="抓取vrf")
-    parser.add_argument("-f", "--file", type=str, required=False, help="抓取vrf 文件名")
+    parser.add_argument("posFile", nargs="?", default=None, help="抓取vrf 文件名,,无需后缀 可直接输入(capvrf test)")
+    parser.add_argument("-f", "--file", type=str, required=False, help="抓取vrf 文件名,无需后缀")
     args = parser.parse_args(argsList)
+    if args.file is None and args.posFile is not None:
+        args.file = args.posFile
     asrCam = asrCamOp(True)
     asrCam.setRawDump(1)
     ok = False
@@ -1320,8 +1333,13 @@ def CLI_saveTuning(argsList):
 
 def CLI_pushTuning(argsList):
     parser = argparse.ArgumentParser(prog="pushtuning", description="push tuning参数")
-    parser.add_argument("-p", "--path", required=True, help="push tuning文件名或路径")
+    parser.add_argument("posPath", nargs="?", default=None, help="push tuning文件名或路径, 可直接输入(pushtuning xxx.data)")
+    parser.add_argument("-p", "--path", required=False, default=None, help="push tuning文件名或路径")
     args = parser.parse_args(argsList)
+    if args.path is None:
+        args.path = args.posPath
+    if args.path is None:
+        parser.error("至少需要指定tuning文件名或路径")
     inFile = args.path
     asrCam = asrCamOp()
     if os.path.isfile(inFile):
@@ -1337,9 +1355,14 @@ def CLI_pushTuning(argsList):
 
 def CLI_tuning2c(argsList):
     parser = argparse.ArgumentParser(prog="tuning2c", description="tuning参数转 .h文件")
-    parser.add_argument("-p", "--path", required=True, help="tuning文件名或路径")
+    parser.add_argument("posPath", nargs="?", default=None, help="tuning文件名或路径, 可直接输入(tuning2c xxx.data)")
+    parser.add_argument("-p", "--path", required=False, default=None, help="tuning文件名或路径")
     parser.add_argument("-s", "--prefix", required=False, help="转为头文件替换的前缀")
     args = parser.parse_args(argsList)
+    if args.path is None:
+        args.path = args.posPath
+    if args.path is None:
+        parser.error("至少需要指定tuning文件名或路径")
 
     inFile = args.path
     sensorName = args.prefix
@@ -1373,9 +1396,14 @@ def CLI_tuning2c(argsList):
 
 def CLI_c2tuning(argsList):
     parser = argparse.ArgumentParser(prog="c2tuning", description="将 .h文件转为 tuning文件")
-    parser.add_argument("-p", "--path", required=True, help="tuning文件名或路径")
+    parser.add_argument("posPath", nargs="?", default=None, help="tuning文件名或路径, 可直接输入(c2tuning xxx.h)")
+    parser.add_argument("-p", "--path", required=False, default=None, help="tuning文件名或路径")
     parser.add_argument("-s", "--prefix", required=False, help="转为头文件替换的前缀")
     args = parser.parse_args(argsList)
+    if args.path is None:
+        args.path = args.posPath
+    if args.path is None:
+        parser.error("至少需要指定tuning文件名或路径")
 
     sensorName = args.prefix
     inFile = args.path

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: taotoolkit
-Version: 2.0.0
+Version: 2.0.2
 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.2; extra == "uiautomator"
 
 # TAO - Toolkit
 

{taotoolkit-2.0.0 → taotoolkit-2.0.2}/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.2