mangoautomation 1.1.22__py3-none-any.whl → 1.1.24__py3-none-any.whl

mangoautomation/enums/__init__.py

@@ -6,7 +6,6 @@
 
 from ..enums._ui_enum import ElementExpEnum, ElementOperationEnum, DeviceEnum, BrowserTypeEnum, DriveTypeEnum
 
-
 __all__ = [
     'ElementOperationEnum',
     'DeviceEnum',

mangoautomation/exceptions/__init__.py

@@ -6,6 +6,4 @@
 
 from ._exceptions import MangoAutomationError
 
-
-
 __all__ = ['MangoAutomationError']

mangoautomation/exceptions/error_msg.py

@@ -33,7 +33,7 @@ ERROR_MSG_0025 = (4025, '无法元素对应的下标，请检查通过下标获
 ERROR_MSG_0026 = (4026, '')
 ERROR_MSG_0027 = (4027,
                   '您元素的操作内容中没有任何的数据，请检查：1.页面步骤详情中字段->元素操作值是否是空，是空可能是你删除了，也可能是执行器的操作选项没有同步需要点击执行器的同步发送缓存数据；2.元素表达式错误导致查询不到元素；')
-ERROR_MSG_0028 = (4028, '')
+ERROR_MSG_0028 = (4028, 'AI查找元素出现顶级异常，请联系管理员检查！')
 ERROR_MSG_0029 = (4029, '页面无元素【{}】，表达式：{}')
 ERROR_MSG_0030 = (4030, '断言时没有找到元素')
 ERROR_MSG_0031 = (4031, '元素未找到准备进行断言获取元素文本类容异常')
@@ -48,13 +48,13 @@ ERROR_MSG_0043 = (4043, '元素【{}】可能不存在，报错信息：{}')
 ERROR_MSG_0044 = (4044, '元素【{}】可能无法消失，报错信息：{}')
 ERROR_MSG_0045 = (4045, '设备启动超时！请检查设备是否已成功连接电脑，设备号：{}')
 ERROR_MSG_0046 = (4046, '您要测试的设备中，没有您输入的包名，请检查包名是否正确，或者设备是否安装了这个软件包')
-ERROR_MSG_0047 = (4047, '')
+ERROR_MSG_0047 = (4047, 'AI定位元素超过最大次数')
 ERROR_MSG_0048 = (4048, '选项发生错误，请在执行器点击发送缓存数据，然后重新修改步骤的操作！或联系管理员处理！')
 ERROR_MSG_0049 = (4049, 'url格式错误，请检查url或者是选择的测试环境不正确')
 ERROR_MSG_0050 = (4050, 'xpath定位未找到元素')
 ERROR_MSG_0051 = (4051, '')
 ERROR_MSG_0052 = (4052, '元素【{}】 进行断言时发生异常，请检查元素是否可以正常使用')
-ERROR_MSG_0053 = (4053, '')
+ERROR_MSG_0053 = (4053, '元素个数小于1，准备对元素的操作默认失败，请检查元素定位是否准确')
 ERROR_MSG_0054 = (4054, '步骤是操作类型，但是你没有输入操作内容，请查看文档中对元素操作的介绍')
 ERROR_MSG_0055 = (4055, '您的电脑未安装指定浏览器！')
 ERROR_MSG_0056 = (4056, '输入的参数类型不正确，请检查操作输入框的类型是否正确')

mangoautomation/mangos/__init__.py

@@ -0,0 +1,14 @@
+# -*- coding: utf-8 -*-
+# @Project: 芒果测试平台
+# @Description: 
+# @Time   : 2025-10-27 17:09
+# @Author : 毛鹏
+from .mangos import *
+
+__all__ = [
+    'ElementMain','mango_send',
+    'AsyncWebAssertion', 'AsyncWebBrowser', 'AsyncWebCustomization', 'AsyncWebElement', 'AsyncWebDeviceInput', 'AsyncWebNewBrowser', 'AsyncWebPage',
+    'SyncWebAssertion', 'SyncWebBrowser', 'SyncWebCustomization', 'SyncWebElement', 'SyncWebDeviceInput', 'SyncWebNewBrowser', 'SyncWebPage',
+    'AndroidApplication','AndroidAssertion', 'AndroidCustomization','AndroidElement','AndroidEquipment', 'NewAndroid', 'AndroidPage',
+    'WebAIFinder'
+]

mangoautomation/models/__init__.py

@@ -5,7 +5,6 @@
 
 from ..models._ui_model import ElementModel, ElementResultModel, ElementListResultModel
 
-
 __all__ = [
     'ElementModel',
     'ElementResultModel',

mangoautomation/models/_ui_model.py

@@ -23,6 +23,7 @@ class ElementListModel(BaseModel):
     loc: str
     sub: int | None = None
     is_iframe: int | None = None
+    prompt: str | None = None
 
 
 class ElementModel(BaseModel):

mangoautomation/tools/__init__.py

@@ -7,5 +7,4 @@
 from ..tools._mate import Meta
 from ..tools._uiautodev import start_uiautodev, stop_uiautodev
 
-
 __all__ = ['Meta', 'start_uiautodev', 'stop_uiautodev']

mangoautomation/tools/_uiautodev.py

@@ -37,7 +37,7 @@ def stop_uiautodev():
     try:
         uiautodev_process.terminate()
         uiautodev_process.wait(timeout=5)
-        return  "uiautodev 服务已关闭"
+        return "uiautodev 服务已关闭"
     except subprocess.TimeoutExpired:
         uiautodev_process.kill()
         return "uiautodev 服务被强制终止"

mangoautomation/uidrives/__init__.py

@@ -3,17 +3,16 @@
 # @Description: # @Time   : 2023-07-15 11:57
 # @Author : 毛鹏
 
-from .web.async_web import AsyncWebDevice, AsyncWebCustomization
-from .web.sync_web import SyncWebDevice, SyncWebCustomization
+from .web import AsyncWebDevice, AsyncWebCustomization, SyncWebDevice, SyncWebCustomization
 from ..uidrives._async_element import AsyncElement
 from ..uidrives._base_data import BaseData
 from ..uidrives._driver_object import DriverObject
 from ..uidrives._sync_element import SyncElement
 
 __all__ = [
-    'AsyncElement',
     'BaseData',
     'DriverObject',
+    'AsyncElement',
     'SyncElement',
     'AsyncWebDevice',
     'SyncWebDevice',

mangoautomation/uidrives/_async_element.py

@@ -5,12 +5,15 @@
 # @Author : 毛鹏
 import asyncio
 import os
-import random
 import traceback
 from typing import Optional
 
+import itertools
 from playwright._impl._errors import TargetClosedError, Error
 
+from mangoautomation.mangos import WebAIFinder
+from mangoautomation.uidrives.android import AndroidDriver
+from mangoautomation.uidrives.web import AsyncWebDevice, AsyncWebAssertion
 from mangotools.assertion import MangoAssertion
 from mangotools.decorator import async_retry
 from mangotools.enums import StatusEnum
@@ -18,8 +21,6 @@ from ..enums import ElementOperationEnum, DriveTypeEnum
 from ..exceptions import MangoAutomationError
 from ..exceptions.error_msg import *
 from ..models import ElementResultModel, ElementModel, ElementListResultModel
-from ..uidrives.android import AndroidDriver
-from ..uidrives.web.async_web import AsyncWebDevice, AsyncWebAssertion
 
 
 class AsyncElement(AsyncWebDevice, AndroidDriver):
@@ -31,6 +32,12 @@ class AsyncElement(AsyncWebDevice, AndroidDriver):
         self.element_result_model: Optional[ElementResultModel | None] = None
         self.element_list_model: list[ElementModel] = []
         self.test_data = self.base_data.test_data
+        self.elements = itertools.cycle([])
+        self.elements_count = 0
+        self.failed_expression = []
+        if self.base_data.is_ai:
+            self.agent = WebAIFinder(self.base_data.log, self.base_data.api_key, self.base_data.base_url,
+                                     self.base_data.model)
 
     async def open_device(self, is_open: bool = False):
         if self.drive_type == DriveTypeEnum.WEB.value:
@@ -47,6 +54,8 @@ class AsyncElement(AsyncWebDevice, AndroidDriver):
                            element_model: ElementModel,
                            element_list_model: list[ElementModel] | None = None) -> ElementResultModel:
         self.element_model = element_model
+        if self.element_model and self.element_model.elements:
+            self.elements = itertools.cycle(self.element_model.elements)
         self.element_list_model = element_list_model
         self.element_result_model = ElementResultModel(
             id=self.element_model.id,
@@ -194,8 +203,6 @@ class AsyncElement(AsyncWebDevice, AndroidDriver):
                 await run(i.get('sql'), i.get('key_list'))
 
     async def __custom(self):
-        for i in self.element_model.custom:
-            self.base_data.test_data.set_cache(i.get('key'), self.base_data.test_data.replace(i.get('value')))
         for i in self.element_model.custom:
             value = self.base_data.test_data.replace(i.get('value'))
             self.base_data.log.debug(f'开始执行自定义-1：key: {i.get("key")}, value: {value}')
@@ -226,53 +233,72 @@ class AsyncElement(AsyncWebDevice, AndroidDriver):
             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.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.elements[random_element].exp,
-                        'loc': self.element_model.elements[random_element].loc,
-                        'sub': self.element_model.elements[random_element].sub
-                    }
-                    if self.drive_type == DriveTypeEnum.WEB.value:
-                        loc, ele_quantity, element_text = await self.web_find_ele(
-                            **find_params, is_iframe=self.element_model.elements[random_element].is_iframe)
-                    elif self.drive_type == DriveTypeEnum.ANDROID.value:
-                        loc, ele_quantity, element_text = self.a_find_ele(**find_params)
-                    else:
-                        loc, ele_quantity, element_text = None, 0, None
-                    new_element = ElementListResultModel(
-                        exp=self.element_model.elements[random_element].exp,
-                        loc=self.element_model.elements[random_element].loc,
-                        sub=self.element_model.elements[random_element].sub,
-                        ele_quantity=ele_quantity,
-                        element_text=element_text,
-                        is_iframe=self.element_model.elements[random_element].is_iframe
-                    )
-
-                    element_exists = any(
-                        existing.exp == new_element.exp and
-                        existing.loc == new_element.loc and
-                        existing.sub == new_element.sub and
-                        existing.is_iframe == new_element.is_iframe
-                        for existing in self.element_result_model.elements
-                    )
-
-                    if not element_exists:
-                        self.element_result_model.elements.append(new_element)
-                    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 = element_text
-                    else:
-                        i.v = loc
-                i.v = self.base_data.test_data.replace(i.v)
+                    await self.query_element(i, is_ass)
+                else:
+                    i.v = self.base_data.test_data.replace(i.v)
         except AttributeError as error:
             self.base_data.log.debug(
                 f'获取操作值失败-1，类型：{type(error)}，失败详情：{error}，失败明细：{traceback.format_exc()}')
             raise MangoAutomationError(*ERROR_MSG_0027)
 
+    async def query_element(self, i, is_ass):
+        random_element = next(self.elements)
+        self.elements_count += 1
+        find_params = {
+            'name': self.element_model.name,
+            '_type': self.element_model.type,
+            'exp': random_element.exp,
+            'loc': random_element.loc,
+            'sub': random_element.sub
+        }
+        loc_text = random_element.loc
+        try:
+            if self.drive_type == DriveTypeEnum.WEB.value:
+                loc, ele_quantity, element_text = await self.web_find_element(**find_params,
+                                                                              is_iframe=random_element.is_iframe)
+            elif self.drive_type == DriveTypeEnum.ANDROID.value:
+                loc, ele_quantity, element_text = self.a_find_ele(**find_params)
+            else:
+                loc, ele_quantity, element_text = None, 0, None
+        except MangoAutomationError as e:
+            if not self.base_data.is_ai:
+                raise e
+            if self.elements_count < len(self.element_model.elements):
+                raise e
+            self.failed_expression.append(find_params.get('loc'))
+            self.elements_count = 0
+            loc, loc_text = await self.agent.ai_find_element_async(self.base_data.page,
+                                                                   self.element_model.name,
+                                                                   random_element.prompt,
+                                                                   failed_expression=self.failed_expression)
+            loc, ele_quantity, element_text = await self.ai_element_info(loc)
+        if loc_text not in self.failed_expression:
+            self.failed_expression.append(loc_text)
+        element_exists = any(
+            existing.exp == random_element.exp and
+            existing.loc == random_element.loc and
+            existing.sub == random_element.sub and
+            existing.is_iframe == random_element.is_iframe
+            for existing in self.element_result_model.elements
+        )
+        if not element_exists:
+            new_element = ElementListResultModel(
+                exp=random_element.exp,
+                loc=random_element.loc,
+                sub=random_element.sub,
+                ele_quantity=ele_quantity,
+                element_text=element_text,
+                is_iframe=random_element.is_iframe
+            )
+            self.element_result_model.elements.append(new_element)
+        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 = element_text
+        else:
+            i.v = loc
+
     async def __error(self, msg: str, is_screenshot: bool = True):
         try:
             self.element_result_model.status = StatusEnum.FAIL.value
@@ -286,7 +312,7 @@ class AsyncElement(AsyncWebDevice, AndroidDriver):
                 """
             )
             if is_screenshot:
-                file_name = f'失败截图-{self.element_model.name}{self.base_data.test_data.get_time_for_min()}.jpg'
+                file_name = f'失败截图-{self.element_model.name}{self.base_data.test_data.time_stamp()}.jpg'
                 await self.__error_screenshot(file_name)
                 self.element_result_model.picture_path = os.path.join(self.base_data.screenshot_path, file_name)
                 self.element_result_model.picture_name = file_name

mangoautomation/uidrives/_base_data.py

@@ -7,8 +7,8 @@ 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 playwright.async_api import Page as AsyncPage, BrowserContext as AsyncBrowserContext
+from playwright.sync_api import Page as SyncPage, BrowserContext as SyncBrowserContext
 from uiautomator2 import Device
 
 from mangoautomation.enums import DriveTypeEnum
@@ -35,13 +35,18 @@ class BaseData:
         self.download_path: Optional[str | None] = None
         self.screenshot_path: Optional[str | None] = None
 
+        self.is_ai = False
+        self.api_key = None
+        self.base_url = None
+        self.model = None
+
         self.mysql_config: Optional[MysqlConingModel | None] = None
         self.mysql_connect: Optional[MysqlConnect | None] = None
 
         self.url: Optional[str | None] = None
         self.is_open_url = False
-        self.page: Optional[p | ap | None] = None
-        self.context: Optional[c | ac | None] = None
+        self.page: Optional[AsyncPage | SyncPage | None] = None
+        self.context: Optional[AsyncBrowserContext | SyncBrowserContext | None] = None
 
         self.package_name: Optional[str | None] = None
         self.android: Optional[Device | None] = None
@@ -116,3 +121,10 @@ class BaseData:
                 raise MangoAutomationError(*ERROR_MSG_0007)
         else:
             pass
+
+    def set_agent(self, is_ai: bool, api_key: str, base_url: str='https://api.siliconflow.cn/v1', model: str='THUDM/GLM-Z1-9B-0414'):
+        self.is_ai = is_ai
+        self.api_key = api_key
+        self.base_url = base_url
+        self.model = model
+        return self

mangoautomation/uidrives/_driver_object.py

@@ -5,11 +5,9 @@
 # @Author : 毛鹏
 
 from typing import Optional
-
-from ..uidrives.android._new_android import NewAndroid
+from mangoautomation.mangos import NewAndroid, AsyncWebNewBrowser, SyncWebNewBrowser
 from ..uidrives.pc.new_windows import NewWindows
-from ..uidrives.web.async_web._new_browser import AsyncWebNewBrowser
-from ..uidrives.web.sync_web._new_browser import SyncWebNewBrowser
+
 
 
 class DriverObject:
@@ -21,46 +19,15 @@ class DriverObject:
         self.android: Optional[NewAndroid] = None
         self.windows: Optional[NewWindows] = None
 
-    def set_web(self,
-                web_type: int,
-                web_path: str | None = None,
-                web_max=False,
-                web_headers=False,
-                web_recording=False,
-                web_h5=None,
-                is_header_intercept=False,
-                web_is_default=False,
-                videos_path=None
-                ):
+    def set_web(self, **kwargs):
+        kwargs['log'] = self.log
         if self.is_async:
-            self.web = AsyncWebNewBrowser(
-                web_type,
-                web_path,
-                web_max,
-                web_headers,
-                web_recording,
-                web_h5,
-                is_header_intercept,
-                web_is_default,
-                videos_path,
-                log=self.log,
-            )
+            self.web = AsyncWebNewBrowser(**kwargs)
         else:
-            self.web = SyncWebNewBrowser(
-                web_type,
-                web_path,
-                web_max,
-                web_headers,
-                web_recording,
-                web_h5,
-                is_header_intercept,
-                web_is_default,
-                videos_path,
-                log=self.log,
-            )
+            self.web = SyncWebNewBrowser(**kwargs)
 
     def set_android(self, and_equipment: str):
         self.android = NewAndroid(and_equipment)
 
     def set_windows(self, win_path: str, win_title: str):
-        self.windows = NewWindows(win_path, win_title)
+        self.windows = NewWindows(win_path, win_title)

mangoautomation/uidrives/_sync_element.py

@@ -4,22 +4,23 @@
 # @Time   : 2025-04-12 15:55
 # @Author : 毛鹏
 import os
-import random
 import traceback
 from typing import Optional
 
+import itertools
 import time
 from playwright._impl._errors import TargetClosedError, Error
 
 from mangotools.assertion import MangoAssertion
 from mangotools.decorator import sync_retry
 from mangotools.enums import StatusEnum
+from mangoautomation.mangos import WebAIFinder
 from ..enums import ElementOperationEnum, DriveTypeEnum
 from ..exceptions import MangoAutomationError
 from ..exceptions.error_msg import *
 from ..models import ElementResultModel, ElementModel, ElementListResultModel
 from ..uidrives.android import AndroidDriver
-from ..uidrives.web.sync_web import SyncWebDevice, SyncWebAssertion
+from ..uidrives.web import SyncWebDevice, SyncWebAssertion
 
 
 class SyncElement(SyncWebDevice, AndroidDriver):
@@ -31,6 +32,12 @@ class SyncElement(SyncWebDevice, AndroidDriver):
         self.element_result_model: Optional[ElementResultModel | None] = None
         self.element_list_model: Optional[list[ElementModel] | None] = None
         self.test_data = self.base_data.test_data
+        self.elements = itertools.cycle([])
+        self.elements_count = 0
+        self.failed_expression = []
+        if self.base_data.is_ai:
+            self.agent = WebAIFinder(self.base_data.log, self.base_data.api_key, self.base_data.base_url,
+                                     self.base_data.model)
 
     def open_device(self, is_open: bool = False):
         if self.drive_type == DriveTypeEnum.WEB.value:
@@ -47,6 +54,8 @@ class SyncElement(SyncWebDevice, AndroidDriver):
                      element_model: ElementModel,
                      element_list_model: list[ElementModel] | None = None) -> ElementResultModel:
         self.element_model = element_model
+        if self.element_model and self.element_model.elements:
+            self.elements = itertools.cycle(self.element_model.elements)
         self.element_list_model = element_list_model
         self.element_result_model = ElementResultModel(
             id=self.element_model.id,
@@ -195,7 +204,9 @@ class SyncElement(SyncWebDevice, AndroidDriver):
 
     def __custom(self):
         for i in self.element_model.custom:
-            self.base_data.test_data.set_cache(i.get('key'), self.base_data.test_data.replace(i.get('value')))
+            value = self.base_data.test_data.replace(i.get('value'))
+            self.base_data.log.debug(f'开始执行自定义-1：key: {i.get("key")}, value: {value}')
+            self.base_data.test_data.set_cache(i.get('key'), value)
 
     def __condition(self):
         error_list = []
@@ -222,54 +233,72 @@ class SyncElement(SyncWebDevice, AndroidDriver):
             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.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.elements[random_element].exp,
-                        'loc': self.element_model.elements[random_element].loc,
-                        'sub': self.element_model.elements[random_element].sub
-                    }
-                    if self.drive_type == DriveTypeEnum.WEB.value:
-                        loc, ele_quantity, element_text = self.web_find_ele(
-                            **find_params, is_iframe=self.element_model.elements[random_element].is_iframe)
-                    elif self.drive_type == DriveTypeEnum.ANDROID.value:
-                        loc, ele_quantity, element_text = self.a_find_ele(**find_params)
-                    else:
-                        loc, ele_quantity, element_text = None, 0, None
-                    new_element = ElementListResultModel(
-                        exp=self.element_model.elements[random_element].exp,
-                        loc=self.element_model.elements[random_element].loc,
-                        sub=self.element_model.elements[random_element].sub,
-                        ele_quantity=ele_quantity,
-                        element_text=element_text,
-                        is_iframe=self.element_model.elements[random_element].is_iframe
-                    )
-
-                    element_exists = any(
-                        existing.exp == new_element.exp and
-                        existing.loc == new_element.loc and
-                        existing.sub == new_element.sub and
-                        existing.is_iframe == new_element.is_iframe
-                        for existing in self.element_result_model.elements
-                    )
-
-                    if not element_exists:
-                        self.element_result_model.elements.append(new_element)
-                    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 = element_text
-                    else:
-                        i.v = loc
+                    self.query_element(i, is_ass)
+                else:
                     i.v = self.base_data.test_data.replace(i.v)
-
         except AttributeError as error:
             self.base_data.log.debug(
                 f'获取操作值失败-1，类型：{type(error)}，失败详情：{error}，失败明细：{traceback.format_exc()}')
             raise MangoAutomationError(*ERROR_MSG_0027)
 
+    def query_element(self, i, is_ass):
+        random_element = next(self.elements)
+        self.elements_count += 1
+        find_params = {
+            'name': self.element_model.name,
+            '_type': self.element_model.type,
+            'exp': random_element.exp,
+            'loc': random_element.loc,
+            'sub': random_element.sub
+        }
+        loc_text = random_element.loc
+        try:
+            if self.drive_type == DriveTypeEnum.WEB.value:
+                loc, ele_quantity, element_text = self.web_find_element(**find_params,
+                                                                        is_iframe=random_element.is_iframe)
+            elif self.drive_type == DriveTypeEnum.ANDROID.value:
+                loc, ele_quantity, element_text = self.a_find_ele(**find_params)
+            else:
+                loc, ele_quantity, element_text = None, 0, None
+        except MangoAutomationError as e:
+            if not self.base_data.is_ai:
+                raise e
+            if self.elements_count < len(self.element_model.elements):
+                raise e
+            self.failed_expression.append(find_params.get('loc'))
+            self.elements_count = 0
+            loc, loc_text = self.agent.ai_find_element_sync(self.base_data.page,
+                                                            self.element_model.name,
+                                                             random_element.prompt,
+                                                             failed_expression=self.failed_expression)
+            loc, ele_quantity, element_text = self.ai_element_info(loc)
+        if loc_text not in self.failed_expression:
+            self.failed_expression.append(loc_text)
+        element_exists = any(
+            existing.exp == random_element.exp and
+            existing.loc == random_element.loc and
+            existing.sub == random_element.sub and
+            existing.is_iframe == random_element.is_iframe
+            for existing in self.element_result_model.elements
+        )
+        if not element_exists:
+            new_element = ElementListResultModel(
+                exp=random_element.exp,
+                loc=random_element.loc,
+                sub=random_element.sub,
+                ele_quantity=ele_quantity,
+                element_text=element_text,
+                is_iframe=random_element.is_iframe
+            )
+            self.element_result_model.elements.append(new_element)
+        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 = element_text
+        else:
+            i.v = loc
+
     def __error(self, msg: str, is_screenshot: bool = True):
         try:
             self.element_result_model.status = StatusEnum.FAIL.value
@@ -283,7 +312,7 @@ class SyncElement(SyncWebDevice, AndroidDriver):
                 """
             )
             if is_screenshot:
-                file_name = f'失败截图-{self.element_model.name}{self.base_data.test_data.get_time_for_min()}.jpg'
+                file_name = f'失败截图-{self.element_model.name}{self.base_data.test_data.time_stamp()}.jpg'
                 self.__error_screenshot(file_name)
                 self.element_result_model.picture_path = os.path.join(self.base_data.screenshot_path, file_name)
                 self.element_result_model.picture_name = file_name

mangoautomation/uidrives/android/__init__.py

@@ -8,26 +8,13 @@ from uiautomator2 import UiObject, UiObjectNotFoundError
 from uiautomator2.exceptions import XPathElementNotFoundError
 from uiautomator2.xpath import XPathSelector
 
+from mangoautomation.mangos import AndroidApplication, AndroidAssertion, AndroidElement, AndroidCustomization, \
+    AndroidEquipment, AndroidPage
 from mangotools.assertion import MangoAssertion
-from ..android._application import AndroidApplication
-from ..android._assertion import AndroidAssertion
-from ..android._customization import AndroidCustomization
-from ..android._element import AndroidElement
-from ..android._equipment import AndroidEquipment
-from ..android._page import AndroidPage
 from ...enums import ElementExpEnum
 from ...exceptions import MangoAutomationError
 from ...exceptions.error_msg import *
 
-__all__ = [
-    'AndroidApplication',
-    'AndroidAssertion',
-    'AndroidElement',
-    'AndroidCustomization',
-    'AndroidEquipment',
-    'AndroidPage',
-    'AndroidDriver',
-]
 
 from mangotools.mangos import Mango
 
@@ -68,7 +55,6 @@ class AndroidDriver(AndroidPage,
         is_method = callable(getattr(AndroidAssertion(self.base_data), ope_key, None))
         if is_method and ope_value.get('actual') is None:
             raise MangoAutomationError(*ERROR_MSG_0031, value=(name,))
-
         try:
             if is_method:
                 self.base_data.log.debug(f'开始断言-1，方法：{ope_key}，断言值：{ope_value}')

mangoautomation/uidrives/pc/__init__.py

@@ -24,13 +24,12 @@ else:
     from uiautomation import Control
     import uiautomation
 
-from mangoautomation.uidrives._base_data import BaseData
 from mangoautomation.uidrives.pc.element import WinElement
 from mangoautomation.uidrives.pc.input_device import WinDeviceInput
 
 
 class WinDriver(WinElement, WinDeviceInput):
-    def __init__(self, base_data: BaseData):
+    def __init__(self, base_data):
         super().__init__(base_data)
 
     def find_element(