mangoautomation 1.0.58__tar.gz → 1.0.60__tar.gz

{mangoautomation-1.0.58/mangoautomation.egg-info → mangoautomation-1.0.60}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: mangoautomation
-Version: 1.0.58
+Version: 1.0.60
 Summary: 测试工具
 Home-page: https://gitee.com/mao-peng/testkit
 Author: 毛鹏
@@ -15,9 +15,17 @@ Requires-Dist: pydantic>=2.9.2
 Requires-Dist: playwright==1.43.0
 Requires-Dist: uiautomation>=2.0.20
 Requires-Dist: uiautomator2>=3.2.5
-Requires-Dist: mangotools>=1.1.39
+Requires-Dist: mangotools>=1.1.42
 Requires-Dist: adbutils~=2.8.9
 Requires-Dist: uiautodev>=0.9.0
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: home-page
+Dynamic: license-file
+Dynamic: requires-dist
+Dynamic: summary
 
 # testkit
 

mangoautomation-1.0.58/mangoautomation/exceptions/_error_msg.py → mangoautomation-1.0.60/mangoautomation/exceptions/error_msg.py

@@ -19,7 +19,7 @@ ERROR_MSG_0012 = (4012, '操作失败，请检查输入的值是否有空字符
 ERROR_MSG_0013 = (
     313, '打开url时超时，分为2个问题：1.启用的浏览器过多，应当减少浏览器并发个数；2.自行查看为啥60秒还未打开：{}')
 ERROR_MSG_0014 = (4014, '')
-ERROR_MSG_0015 = (4015, '的类型错误，请联系管理员进行排查问题')
+ERROR_MSG_0015 = (4015, '没有操作的类型，请联系管理员进行排查问题')
 ERROR_MSG_0016 = (4016, '')
 ERROR_MSG_0017 = (4017, '断言失败： {}')
 ERROR_MSG_0018 = (4018, '')

{mangoautomation-1.0.58 → mangoautomation-1.0.60}/mangoautomation/models/__init__.py

@@ -4,10 +4,11 @@
 # @Author : 毛鹏
 import sys
 
-from ..models._ui_model import ElementModel, ElementResultModel
+from ..models._ui_model import ElementModel, ElementResultModel, ElementListResultModel
 
 
 __all__ = [
     'ElementModel',
     'ElementResultModel',
+    'ElementListResultModel'
 ]

{mangoautomation-1.0.58 → mangoautomation-1.0.60}/mangoautomation/models/_ui_model.py

@@ -17,12 +17,16 @@ class EnvironmentConfigModel(BaseModel):
     mysql_config: MysqlConingModel | None = None
 
 
+class ElementListModel(BaseModel):
+    exp: int | None
+    loc: str | None
+
+
 class ElementModel(BaseModel):
     id: int
     type: int
     name: str | None
-    loc: str | None
-    exp: int | None
+    elements: list[ElementListModel] = []
     sleep: int | None
     sub: int | None
     is_iframe: int | None
@@ -34,11 +38,16 @@ class ElementModel(BaseModel):
     value: str | None = None
 
 
+class ElementListResultModel(BaseModel):
+    loc: str | None = None
+    exp: int | None = None
+    ele_quantity: int = 0
+    element_text: str | None = None
+
+
 class ElementResultModel(BaseModel):
     id: int
     name: str | None = None
-    loc: str | None = None
-    exp: int | None = None
     sleep: int | None = None
     sub: int | None = None
 
@@ -51,9 +60,7 @@ class ElementResultModel(BaseModel):
     key: str | None = None
     value: str | None = None
 
-    ele_quantity: int = 0
-    element_text: str | None = None
-
+    elements: list[ElementListResultModel] = []
     status: int = 0
     error_message: str | None = None
     picture_path: str | None = None

{mangoautomation-1.0.58 → mangoautomation-1.0.60}/mangoautomation/uidrive/_async_element.py

@@ -5,6 +5,7 @@
 # @Author : 毛鹏
 import asyncio
 import os
+import random
 import traceback
 from typing import Optional
 
@@ -15,8 +16,8 @@ from mangotools.decorator import async_retry
 from mangotools.enums import StatusEnum
 from ..enums import ElementOperationEnum, DriveTypeEnum
 from ..exceptions import MangoAutomationError
-from ..exceptions._error_msg import *
-from ..models import ElementResultModel, ElementModel
+from ..exceptions.error_msg import *
+from ..models import ElementResultModel, ElementModel, ElementListResultModel
 from ..uidrive.android import AndroidDriver
 from ..uidrive.web.async_web import AsyncWebDevice, AsyncWebAssertion
 
@@ -47,8 +48,6 @@ class AsyncElement(AsyncWebDevice, AndroidDriver):
         self.element_result_model = ElementResultModel(
             id=self.element_model.id,
             name=self.element_model.name,
-            loc=self.element_model.loc,
-            exp=self.element_model.exp,
             sub=self.element_model.sub,
             sleep=self.element_model.sleep,
 
@@ -62,6 +61,7 @@ class AsyncElement(AsyncWebDevice, AndroidDriver):
             status=StatusEnum.FAIL.value,
         )
         try:
+            await self.init_element()
             await self.__main()
             if self.element_model.sleep:
                 await asyncio.sleep(self.element_model.sleep)
@@ -90,16 +90,6 @@ class AsyncElement(AsyncWebDevice, AndroidDriver):
 
     @async_retry()
     async def __main(self):
-        try:
-            self.element_model.loc = self.base_data.test_data.replace(self.element_model.loc)
-            self.element_result_model.loc = self.element_model.loc
-            self.element_model.sleep = self.base_data.test_data.replace(self.element_model.sleep)
-            self.element_result_model.sleep = self.element_model.sleep
-            self.element_model.sub = self.base_data.test_data.replace(self.element_model.sub)
-            self.element_result_model.sub = self.element_model.sub
-        except MangoAutomationError as error:
-            self.base_data.log.error(f'操作元素解析数据失败，类型：{type(error)}, 详情：{error}')
-            raise MangoAutomationError(error.code, error.msg)
         self.base_data.verify_equipment(self.drive_type)
         if self.element_model.type == ElementOperationEnum.OPE.value:
             await self.__ope()
@@ -112,6 +102,20 @@ class AsyncElement(AsyncWebDevice, AndroidDriver):
         else:
             raise MangoAutomationError(*ERROR_MSG_0015)
 
+    async def init_element(self):
+        try:
+            for i in self.element_model.elements:
+                i.loc = self.base_data.test_data.replace(i.loc)
+                self.element_result_model.elements.append(ElementListResultModel(exp=i.exp, loc=i.loc))
+            self.element_model.sleep = self.base_data.test_data.replace(self.element_model.sleep)
+            self.element_result_model.sleep = self.element_model.sleep
+            self.element_model.sub = self.base_data.test_data.replace(self.element_model.sub)
+            self.element_result_model.sub = self.element_model.sub
+
+        except MangoAutomationError as error:
+            self.base_data.log.error(f'操作元素解析数据失败，类型：{type(error)}, 详情：{error}')
+            raise MangoAutomationError(error.code, error.msg)
+
     async def __ope(self):
         method_name = getattr(self.element_model, 'ope_key', None)
         if not method_name:
@@ -197,36 +201,33 @@ class AsyncElement(AsyncWebDevice, AndroidDriver):
             value = self.element_data.get('value')
         self.base_data.test_data.set_cache(key, self.base_data.test_data.replace(value))
 
-    async def __ope_value(self,is_ass: bool = False):
+    async def __ope_value(self, is_ass: bool = False):
         try:
             ope_key = 'actual' if is_ass else 'locating'
             for i in self.element_model.ope_value:
-                if i.f == ope_key and self.element_model.loc:
+                if i.f == ope_key and self.element_model.elements:
+                    random_element = random.randint(0, len(self.element_model.elements) - 1)
                     find_params = {
                         'name': self.element_model.name,
                         '_type': self.element_model.type,
-                        'exp': self.element_model.exp,
-                        'loc': self.element_model.loc,
+                        'exp': self.element_model.elements[random_element].exp,
+                        'loc': self.element_model.elements[random_element].loc,
                         'sub': self.element_model.sub
                     }
                     if self.drive_type == DriveTypeEnum.WEB.value:
-                        loc, self.element_result_model.ele_quantity, \
-                            self.element_result_model.element_text \
-                            = await self.web_find_ele(**find_params, is_iframe=self.element_model.is_iframe)
+                        loc, ele_quantity, element_text = await self.web_find_ele(
+                            **find_params, is_iframe=self.element_model.is_iframe)
                     elif self.drive_type == DriveTypeEnum.ANDROID.value:
-                        loc, self.element_result_model.ele_quantity, \
-                            self.element_result_model.element_text \
-                            = self.a_find_ele(**find_params)
+                        loc, ele_quantity, element_text = self.a_find_ele(**find_params)
                     else:
-                        loc, self.element_result_model.ele_quantity, \
-                            self.element_result_model.element_text \
-                            = None, 0, None
-
+                        loc, ele_quantity, element_text = None, 0, None
+                    self.element_result_model.elements[random_element].ele_quantity = ele_quantity
+                    self.element_result_model.elements[random_element].element_text = element_text
                     if is_ass:
                         if callable(getattr(AsyncWebAssertion, self.element_model.ope_key, None)):
                             i.v = loc
                         elif callable(getattr(MangoAssertion(), self.element_model.ope_key, None)):
-                            i.v = self.element_result_model.element_text
+                            i.v = element_text
                     else:
                         i.v = loc
                 elif self.element_data:

{mangoautomation-1.0.58 → mangoautomation-1.0.60}/mangoautomation/uidrive/_base_data.py

@@ -7,11 +7,13 @@ from typing import Optional
 from unittest.mock import MagicMock
 
 import sys
+from playwright.async_api import Page as ap, BrowserContext as ac
+from playwright.sync_api import Page as p, BrowserContext as c
 from uiautomator2 import Device
 
 from mangoautomation.enums import DriveTypeEnum
 from mangoautomation.exceptions import MangoAutomationError
-from mangoautomation.exceptions._error_msg import ERROR_MSG_0010, ERROR_MSG_0007
+from mangoautomation.exceptions.error_msg import ERROR_MSG_0010, ERROR_MSG_0007
 from mangotools.data_processor import DataProcessor
 from mangotools.database import MysqlConnect
 from mangotools.enums import StatusEnum
@@ -38,8 +40,8 @@ class BaseData:
 
         self.url: Optional[str | None] = None
         self.is_open_url = False
-        self.page = None
-        self.context = None
+        self.page: Optional[p | ap | None] = None
+        self.context: Optional[c | ac | None] = None
 
         self.package_name: Optional[str | None] = None
         self.android: Optional[Device | None] = None

{mangoautomation-1.0.58 → mangoautomation-1.0.60}/mangoautomation/uidrive/_sync_element.py

@@ -4,6 +4,7 @@
 # @Time   : 2025-04-12 15:55
 # @Author : 毛鹏
 import os
+import random
 import traceback
 from typing import Optional
 
@@ -15,8 +16,8 @@ from mangotools.decorator import sync_retry
 from mangotools.enums import StatusEnum
 from ..enums import ElementOperationEnum, DriveTypeEnum
 from ..exceptions import MangoAutomationError
-from ..exceptions._error_msg import *
-from ..models import ElementResultModel, ElementModel
+from ..exceptions.error_msg import *
+from ..models import ElementResultModel, ElementModel, ElementListResultModel
 from ..uidrive.android import AndroidDriver
 from ..uidrive.web.sync_web import SyncWebDevice, SyncWebAssertion
 
@@ -47,8 +48,6 @@ class SyncElement(SyncWebDevice, AndroidDriver):
         self.element_result_model = ElementResultModel(
             id=self.element_model.id,
             name=self.element_model.name,
-            loc=self.element_model.loc,
-            exp=self.element_model.exp,
             sub=self.element_model.sub,
             sleep=self.element_model.sleep,
 
@@ -62,6 +61,7 @@ class SyncElement(SyncWebDevice, AndroidDriver):
             status=StatusEnum.FAIL.value,
         )
         try:
+            self.init_element()
             self.__main()
             if self.element_model.sleep:
                 time.sleep(self.element_model.sleep)
@@ -90,16 +90,6 @@ class SyncElement(SyncWebDevice, AndroidDriver):
 
     @sync_retry()
     def __main(self):
-        try:
-            self.element_model.loc = self.base_data.test_data.replace(self.element_model.loc)
-            self.element_result_model.loc = self.element_model.loc
-            self.element_model.sleep = self.base_data.test_data.replace(self.element_model.sleep)
-            self.element_result_model.sleep = self.element_model.sleep
-            self.element_model.sub = self.base_data.test_data.replace(self.element_model.sub)
-            self.element_result_model.sub = self.element_model.sub
-        except MangoAutomationError as error:
-            self.base_data.log.debug(f'操作元素解析数据失败，类型：{type(error)}, 详情：{error}')
-            raise MangoAutomationError(error.code, error.msg)
         self.base_data.verify_equipment(self.drive_type)
         if self.element_model.type == ElementOperationEnum.OPE.value:
             self.__ope()
@@ -112,6 +102,20 @@ class SyncElement(SyncWebDevice, AndroidDriver):
         else:
             raise MangoAutomationError(*ERROR_MSG_0015)
 
+    def init_element(self):
+        try:
+            for i in self.element_model.elements:
+                i.loc = self.base_data.test_data.replace(i.loc)
+                self.element_result_model.elements.append(ElementListResultModel(exp=i.exp, loc=i.loc))
+            self.element_model.sleep = self.base_data.test_data.replace(self.element_model.sleep)
+            self.element_result_model.sleep = self.element_model.sleep
+            self.element_model.sub = self.base_data.test_data.replace(self.element_model.sub)
+            self.element_result_model.sub = self.element_model.sub
+
+        except MangoAutomationError as error:
+            self.base_data.log.error(f'操作元素解析数据失败，类型：{type(error)}, 详情：{error}')
+            raise MangoAutomationError(error.code, error.msg)
+
     def __ope(self):
         method_name = getattr(self.element_model, 'ope_key', None)
         if not method_name:
@@ -201,32 +205,29 @@ class SyncElement(SyncWebDevice, AndroidDriver):
         try:
             ope_key = 'actual' if is_ass else 'locating'
             for i in self.element_model.ope_value:
-                if i.f == ope_key and self.element_model.loc:
+                if i.f == ope_key and self.element_model.elements:
+                    random_element = random.randint(0, len(self.element_model.elements) - 1)
                     find_params = {
                         'name': self.element_model.name,
                         '_type': self.element_model.type,
-                        'exp': self.element_model.exp,
-                        'loc': self.element_model.loc,
+                        'exp': self.element_model.elements[random_element].exp,
+                        'loc': self.element_model.elements[random_element].loc,
                         'sub': self.element_model.sub
                     }
                     if self.drive_type == DriveTypeEnum.WEB.value:
-                        loc, self.element_result_model.ele_quantity, \
-                            self.element_result_model.element_text \
-                            = self.web_find_ele(**find_params, is_iframe=self.element_model.is_iframe)
+                        loc, ele_quantity, element_text = self.web_find_ele(**find_params,
+                                                                            is_iframe=self.element_model.is_iframe)
                     elif self.drive_type == DriveTypeEnum.ANDROID.value:
-                        loc, self.element_result_model.ele_quantity, \
-                            self.element_result_model.element_text \
-                            = self.a_find_ele(**find_params)
+                        loc, ele_quantity, element_text = self.a_find_ele(**find_params)
                     else:
-                        loc, self.element_result_model.ele_quantity, \
-                            self.element_result_model.element_text \
-                            = None, 0, None
-
+                        loc, ele_quantity, element_text = None, 0, None
+                    self.element_result_model.elements[random_element].ele_quantity = ele_quantity
+                    self.element_result_model.elements[random_element].element_text = element_text
                     if is_ass:
                         if callable(getattr(SyncWebAssertion, self.element_model.ope_key, None)):
                             i.v = loc
                         elif callable(getattr(MangoAssertion(), self.element_model.ope_key, None)):
-                            i.v = self.element_result_model.element_text
+                            i.v = element_text
                     else:
                         i.v = loc
                 elif self.element_data:

{mangoautomation-1.0.58 → mangoautomation-1.0.60}/mangoautomation/uidrive/android/__init__.py

@@ -17,7 +17,7 @@ from ..android._equipment import AndroidEquipment
 from ..android._page import AndroidPage
 from ...enums import ElementExpEnum
 from ...exceptions import MangoAutomationError
-from ...exceptions._error_msg import *
+from ...exceptions.error_msg import *
 
 __all__ = [
     'AndroidApplication',
@@ -75,7 +75,7 @@ class AndroidDriver(AndroidPage,
                 return Mango.s_e(AndroidAssertion(self.base_data), ope_key, ope_value)
             else:
                 self.base_data.log.debug(f'开始断言-2，方法：{ope_key}，断言值：{ope_value}')
-                return MangoAssertion(self.base_data.mysql_connect) \
+                return MangoAssertion(self.base_data.mysql_connect, self.base_data.test_data) \
                     .ass(ope_key, ope_value.get('actual'), ope_value.get('expect'))
         except AssertionError as error:
             self.base_data.log.error(f'安卓自动化失败-1，类型：{type(error)}，失败详情：{error}')

{mangoautomation-1.0.58 → mangoautomation-1.0.60}/mangoautomation/uidrive/android/_application.py

@@ -8,7 +8,7 @@ import time
 from mangotools.decorator import sync_method_callback
 from mangotools.models import MethodModel
 from ...exceptions import MangoAutomationError
-from ...exceptions._error_msg import ERROR_MSG_0046
+from ...exceptions.error_msg import ERROR_MSG_0046
 from ...tools import Meta
 from ...uidrive._base_data import BaseData
 
@@ -23,7 +23,7 @@ class AndroidApplication(metaclass=Meta):
         return any(package_name in str(i) for i in self.base_data.android.shell("pm list packages"))
 
     @sync_method_callback('android', '应用操作', 0,
-                          [MethodModel(f='package_name', p='请输入应用名称', d=True)])
+                          [MethodModel(n='包名', f='package_name', p='请输入应用名称', d=True)])
     def a_start_app(self, package_name: str):
         """启动应用"""
         if not package_name:
@@ -33,8 +33,8 @@ class AndroidApplication(metaclass=Meta):
         self.base_data.android.app_start(package_name)
         time.sleep(4)
 
-    @sync_method_callback('android', '应用操作', 1,[
-        MethodModel(f='package_name', p='请输入应用名称', d=True)])
+    @sync_method_callback('android', '应用操作', 1, [
+        MethodModel(n='包名', f='package_name', p='请输入应用名称', d=True)])
     def a_close_app(self, package_name: str):
         """关闭应用"""
         if not package_name:
@@ -44,8 +44,8 @@ class AndroidApplication(metaclass=Meta):
 
         self.base_data.android.app_stop(package_name)
 
-    @sync_method_callback('android', '应用操作', 2,[
-        MethodModel(f='package_name', p='请输入应用名称', d=True)])
+    @sync_method_callback('android', '应用操作', 2, [
+        MethodModel(n='包名', f='package_name', p='请输入应用名称', d=True)])
     def a_clear_app(self, package_name: str):
         """清除app数据"""
         if not package_name:
@@ -55,13 +55,13 @@ class AndroidApplication(metaclass=Meta):
 
         self.base_data.android.app_clear(package_name)
 
-    @sync_method_callback('android', '应用操作',3 )
+    @sync_method_callback('android', '应用操作', 3)
     def a_app_stop_all(self):
         """停止所有app"""
         self.base_data.android.app_stop_all()
 
-    @sync_method_callback('android', '应用操作',4, [
-        MethodModel(f='package_name', p='请输入应用名称列表', d=True)])
+    @sync_method_callback('android', '应用操作', 4, [
+        MethodModel(n='包名List', f='package_name', p='请输入应用名称列表', d=True)])
     def a_app_stop_appoint(self, package_name_list: list):
         """停止除指定app外所有app"""
         for i in package_name_list:

{mangoautomation-1.0.58 → mangoautomation-1.0.60}/mangoautomation/uidrive/android/_assertion.py

@@ -26,7 +26,7 @@ class AndroidAssertion(metaclass=Meta):
 
     @sync_method_callback('ass_android', '元素断言', 2, [
         MethodModel(f='actual'),
-        MethodModel(f='expect', p='请输入预期内容', d=True)])
+        MethodModel(n='预期值', f='expect', p='请输入预期内容', d=True)])
     def a_assert_ele_count(self, actual: UiObject, expect):
         """元素计数"""
         assert int(actual.count) == int(expect), f'实际={actual.count}, 预期={expect}'
@@ -34,7 +34,7 @@ class AndroidAssertion(metaclass=Meta):
 
     @sync_method_callback('ass_android', '元素断言', 3, [
         MethodModel(f='actual'),
-        MethodModel(f='expect', p='请输入预期文本', d=True)])
+        MethodModel(n='预期值', f='expect', p='请输入预期文本', d=True)])
     def a_assert_ele_text(self, actual: UiObject, expect: str):
         """元素文本内容"""
         assert actual.get_text() == expect, f"实际='{actual.get_text()}', 预期='{expect}'"
@@ -70,7 +70,7 @@ class AndroidAssertion(metaclass=Meta):
         return f"实际={actual.info['visible']}, 预期=元素不可见"
 
     @sync_method_callback('ass_android', '元素断言', 8, [
-        MethodModel(f='expect', p='请输入弹窗标题文本', d=False)])
+        MethodModel(n='预期值', f='expect', p='请输入弹窗标题文本', d=False)])
     def a_assert_dialog_exists(self, expect: str):
         """弹窗存在"""
         dialog = self.base_data.android(text=expect) if expect else self.base_data.android(
@@ -80,7 +80,7 @@ class AndroidAssertion(metaclass=Meta):
 
     @sync_method_callback('ass_android', '元素断言', 9, [
         MethodModel(f='actual'),
-        MethodModel(f='expect', p='请输入断言目标文本', d=True)])
+        MethodModel(n='预期值', f='expect', p='请输入断言目标文本', d=True)])
     def a_assert_ele_in_list(self, actual: UiObject, expect: str):
         """列表滑动后目标元素存在"""
         if not actual.exists:

{mangoautomation-1.0.58 → mangoautomation-1.0.60}/mangoautomation/uidrive/android/_element.py

@@ -10,7 +10,7 @@ from uiautomator2 import UiObject
 from uiautomator2.xpath import XPathSelector
 
 from ...exceptions import MangoAutomationError
-from ...exceptions._error_msg import ERROR_MSG_0043, ERROR_MSG_0044
+from ...exceptions.error_msg import ERROR_MSG_0043, ERROR_MSG_0044
 from ...tools import Meta
 from ...uidrive._base_data import BaseData
 from mangotools.decorator import sync_method_callback
@@ -36,7 +36,7 @@ class AndroidElement(metaclass=Meta):
         locating.click()
 
     @sync_method_callback('android', '元素操作', 2, [
-        MethodModel(f='locating'), MethodModel(f='text', p='请输入内容', d=True)])
+        MethodModel(n='输入文本', f='locating'), MethodModel(f='text', p='请输入内容', d=True)])
     def a_input(self, locating: UiObject, text):
         """单击输入"""
         locating.click()
@@ -45,29 +45,29 @@ class AndroidElement(metaclass=Meta):
         self.base_data.android.send_keys(text)
 
     @sync_method_callback('android', '元素操作', 3, [
-        MethodModel(f='locating'), MethodModel(f='text', p='请输入内容', d=True)])
+        MethodModel(f='locating'), MethodModel(n='设置文本', f='text', p='请输入内容', d=True)])
     def a_set_text(self, locating: UiObject, text):
         """设置文本"""
         locating.set_text(text)
 
     @sync_method_callback('android', '元素操作', 4, [
         MethodModel(f='locating'),
-        MethodModel(f='x', p='请输入x坐标', d=True),
-        MethodModel(f='y', p='请输入y坐标', d=True)])
+        MethodModel(n='x坐标', f='x', p='请输入x坐标', d=True),
+        MethodModel(n='y坐标', f='y', p='请输入y坐标', d=True)])
     def a_click_coord(self, x, y):
         """坐标单击"""
         self.base_data.android.click(x, y)
 
     @sync_method_callback('android', '元素操作', 5, [
-        MethodModel(f='x', p='请输入x坐标', d=True),
-        MethodModel(f='y', p='请输入y坐标', d=True)])
+        MethodModel(n='x坐标', f='x', p='请输入x坐标', d=True),
+        MethodModel(n='y坐标', f='y', p='请输入y坐标', d=True)])
     def a_double_click_coord(self, x, y):
         """坐标双击"""
         self.base_data.android.double_click(x, y)
 
     @sync_method_callback('android', '元素操作', 6, [
         MethodModel(f='locating'),
-        MethodModel(f='time_', p='请输入长按坐标时间', d=True)])
+        MethodModel(n='长按时间', f='time_', p='请输入长按时间', d=True)])
     def a_long_click(self, locating: UiObject, time_):
         """长按元素"""
         locating.long_click(duration=float(time_))
@@ -78,7 +78,7 @@ class AndroidElement(metaclass=Meta):
         locating.clear_text()
 
     @sync_method_callback('android', '元素操作', 8, [
-        MethodModel(f='locating'), MethodModel(f='set_cache_key', p='请输入元素文本存储的key', d=True)])
+        MethodModel(f='locating'), MethodModel(n='缓存的key', f='set_cache_key', p='请输入元素文本存储的key', d=True)])
     def a_get_text(self, locating: UiObject, set_cache_key=None):
         """获取元素文本"""
         value = locating.get_text()
@@ -88,7 +88,7 @@ class AndroidElement(metaclass=Meta):
 
     @sync_method_callback('android', '元素操作', 9, [
         MethodModel(f='locating'),
-        MethodModel(f='file_name', p='请输入元素截图存储的名称，后续可以通过名称获取', d=True)])
+        MethodModel(n='截图名称', f='file_name', p='请输入元素截图存储的名称，后续可以通过名称获取', d=True)])
     def a_element_screenshot(self, locating: UiObject, file_name: str):
         """元素截图"""
         im = locating.screenshot()
@@ -109,14 +109,14 @@ class AndroidElement(metaclass=Meta):
         locating.pinch_out()
 
     @sync_method_callback('android', '元素操作', 12, [
-        MethodModel(f='locating'), MethodModel(f='time_', p='请输入等待元素出现的时间', d=True)])
+        MethodModel(f='locating'), MethodModel(n='等待时间', f='time_', p='请输入等待元素出现的时间', d=True)])
     def a_wait(self, locating: UiObject, time_):
         """等待元素出现"""
         if not locating.wait(timeout=float(time_)):
             raise MangoAutomationError(*ERROR_MSG_0043)
 
     @sync_method_callback('android', '元素操作', 13, [
-        MethodModel(f='locating'), MethodModel(f='time_', p='请输入等待元素消失的时间', d=True)])
+        MethodModel(f='locating'), MethodModel(n='等待时间', f='time_', p='请输入等待元素消失的时间', d=True)])
     def a_wait_gone(self, locating: UiObject, time_: str):
         """等待元素消失"""
         if not locating.wait_gone(timeout=float(time_)):
@@ -130,8 +130,8 @@ class AndroidElement(metaclass=Meta):
 
     @sync_method_callback('android', '元素操作', 15, [
         MethodModel(f='locating'),
-        MethodModel(f='x', p='请输入x坐标', d=True),
-        MethodModel(f='y', p='请输入y坐标', d=True)])
+        MethodModel(n='x坐标', f='x', p='请输入x坐标', d=True),
+        MethodModel(n='y坐标', f='y', p='请输入y坐标', d=True)])
     def a_drag_to_coord(self, locating: UiObject, x, y):
         """拖动元素到坐标上"""
         locating.drag_to(x, y)
@@ -158,8 +158,8 @@ class AndroidElement(metaclass=Meta):
 
     @sync_method_callback('android', '元素操作', 20, [
         MethodModel(f='locating'),
-        MethodModel(f='x_key', p='请输入x坐标', d=True),
-        MethodModel(f='y_key', p='请输入y坐标', d=True)])
+        MethodModel(n='x坐标', f='x_key', p='请输入x坐标', d=True),
+        MethodModel(n='y坐标', f='y_key', p='请输入y坐标', d=True)])
     def a_get_center(self, locating: UiObject, x_key, y_key):
         """提取元素坐标"""
         x, y = locating.center()

{mangoautomation-1.0.58 → mangoautomation-1.0.60}/mangoautomation/uidrive/android/_equipment.py

@@ -18,7 +18,7 @@ class AndroidEquipment(metaclass=Meta):
         self.base_data = base_data
 
     @sync_method_callback('android', '设备操作', 1, [
-        MethodModel(f='_time', p='请输入等待时间', d=True)])
+        MethodModel(n='等待时间', f='_time', p='请输入等待时间', d=True)])
     def a_sleep(self, time_: int):
         """强制等待"""
         sleep(time_)
@@ -47,15 +47,15 @@ class AndroidEquipment(metaclass=Meta):
         return w, h
 
     @sync_method_callback('android', '设备操作', 6, [
-        MethodModel(f='feli_path', p='请输入计算机文件路径', d=True),
-        MethodModel(f='catalogue', p='请输入设备目录', d=True)])
-    def a_push(self, feli_path, catalogue):
+        MethodModel(n='文件路径', f='file_path', p='请输入计算机文件路径', d=True),
+        MethodModel(n='手机目录', f='catalogue', p='请输入设备目录', d=True)])
+    def a_push(self, file_path, catalogue):
         """推送一个文件到设备"""
-        self.base_data.android.push(feli_path, catalogue)
+        self.base_data.android.push(file_path, catalogue)
 
     @sync_method_callback('android', '设备操作', 7, [
-        MethodModel(f='feli_path', p='请输入设备文件路径', d=True),
-        MethodModel(f='catalogue', p='请输入计算机目录', d=True)])
+        MethodModel(n='文件路径', f='feli_path', p='请输入设备文件路径', d=True),
+        MethodModel(n='手机目录', f='catalogue', p='请输入计算机目录', d=True)])
     def a_pull(self, feli_path, catalogue):
         """提取文件"""
         self.base_data.android.pull(feli_path, catalogue)

{mangoautomation-1.0.58 → mangoautomation-1.0.60}/mangoautomation/uidrive/android/_new_android.py

@@ -11,7 +11,7 @@ from adbutils import AdbTimeout
 from uiautomator2 import ConnectError
 
 from ...exceptions import MangoAutomationError
-from ...exceptions._error_msg import ERROR_MSG_0042, ERROR_MSG_0045, ERROR_MSG_0040
+from ...exceptions.error_msg import ERROR_MSG_0042, ERROR_MSG_0045, ERROR_MSG_0040
 
 """
 python -m uiautomator2 init