20250916-正式上线测试

2025-09-16 16:16:50 +08:00
parent e6768b14a5
commit c65eb95699
4 changed files with 33 additions and 17 deletions
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -5,8 +5,9 @@
  </component>
  <component name="ChangeListManager">
    <list default="true" id="eceeff5e-51c1-459c-a911-d21ec090a423" name="Changes" comment="20250916-正式上线测试">
+      <change afterPath="$PROJECT_DIR$/123.py" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/resources/fc18bc21951daf7be012a8a687b00a4de8b24c18/bgv.png" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Utils/AiUtils.py" beforeDir="false" afterPath="$PROJECT_DIR$/Utils/AiUtils.py" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/Utils/ControlUtils.py" beforeDir="false" afterPath="$PROJECT_DIR$/Utils/ControlUtils.py" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/Utils/Requester.py" beforeDir="false" afterPath="$PROJECT_DIR$/Utils/Requester.py" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/script/ScriptManager.py" beforeDir="false" afterPath="$PROJECT_DIR$/script/ScriptManager.py" afterDir="false" />
@@ -254,7 +255,7 @@
      <workItem from="1757498954175" duration="6736000" />
      <workItem from="1757506636968" duration="5910000" />
      <workItem from="1757567423145" duration="16668000" />
-      <workItem from="1757998910052" duration="9312000" />
+      <workItem from="1757998910052" duration="11560000" />
    </task>
    <task id="LOCAL-00001" summary="ai 开始测试">
      <option name="closed" value="true" />
@@ -304,7 +305,15 @@
      <option name="project" value="LOCAL" />
      <updated>1758002623317</updated>
    </task>
-    <option name="localTasksCounter" value="7" />
+    <task id="LOCAL-00007" summary="20250916-正式上线测试">
+      <option name="closed" value="true" />
+      <created>1758008256678</created>
+      <option name="number" value="00007" />
+      <option name="presentableId" value="LOCAL-00007" />
+      <option name="project" value="LOCAL" />
+      <updated>1758008256678</updated>
+    </task>
+    <option name="localTasksCounter" value="8" />
    <servers />
  </component>
  <component name="TypeScriptGeneratedFilesManager">
@@ -344,7 +353,7 @@
    <SUITE FILE_PATH="coverage/iOSAI$123__1_.coverage" NAME="123 (1) 覆盖结果" MODIFIED="1756897091135" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
    <SUITE FILE_PATH="coverage/iOSAI$tidevice_entry.coverage" NAME="tidevice_entry 覆盖结果" MODIFIED="1757061969626" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
    <SUITE FILE_PATH="coverage/iOSAI$ScriptManager.coverage" NAME="ScriptManager 覆盖结果" MODIFIED="1756896057801" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/script" />
-    <SUITE FILE_PATH="coverage/iOSAI$Main.coverage" NAME="Main 覆盖结果" MODIFIED="1758007535626" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="" />
-    <SUITE FILE_PATH="coverage/iOSAI$123.coverage" NAME="123 覆盖结果" MODIFIED="1758008149717" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
+    <SUITE FILE_PATH="coverage/iOSAI$Main.coverage" NAME="Main 覆盖结果" MODIFIED="1758010311269" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="" />
+    <SUITE FILE_PATH="coverage/iOSAI$123.coverage" NAME="123 覆盖结果" MODIFIED="1758010415979" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
  </component>
 </project>
--- a/Utils/ControlUtils.py
+++ b/Utils/ControlUtils.py
@@ -178,9 +178,6 @@ class ControlUtils(object):
            center_y = rect.y + rect.height // 2
            session.tap(left_x, center_y)

-
-
-
    # 点击一个随机范围
    @classmethod
    def tap_mini_cluster(cls, center_x: int, center_y: int, session, points=5, duration_ms=60):
--- a/Utils/Requester.py
+++ b/Utils/Requester.py
@@ -17,7 +17,7 @@ class Requester():
                "vvtoken": token,
            }
            url = BaseUrl + cls.prologue
-            result = requests.get(headers=headers, url=url)
+            result = requests.get(headers=headers, url=url, verify=False)
            json = result.json()
            data = json.get("data")
            for i in data:
@@ -29,15 +29,18 @@ class Requester():
    @classmethod
    def translation(cls, msg, country="英国"):
        try:
+            if country == "":
+                country = "英国"
+
            param = {
                "msg": msg,
                "country": country,
            }
            url = "https://ai.yolozs.com/translation"
-            result = requests.post(url=url, json=param)
+            result = requests.post(url=url, json=param, verify=False)

-            LogManager.info(f"翻译 请求的参数:{param}")
-            LogManager.info(f"翻译,状态码:{result.status_code},服务器返回的内容:{result.text}")
+            LogManager.info(f"翻译 请求的参数:{param}", "翻译")
+            LogManager.info(f"翻译,状态码:{result.status_code},服务器返回的内容:{result.text}", "翻译")

            if result.status_code != 200:
                LogManager.error(f"翻译失败,状态码:{result.status_code},服务器返回的内容:{result.text}")
@@ -69,7 +72,7 @@ class Requester():

        try:
            url = "https://ai.yolozs.com/chat"
-            result = requests.post(url=url, json=param)
+            result = requests.post(url=url, json=param, verify=False)
            json = result.json()
            data = json.get("answer", {})
            session_id = json.get("conversation_id", {})
--- a/script/ScriptManager.py
+++ b/script/ScriptManager.py
@@ -380,7 +380,6 @@ class ScriptManager():
                session.appium_settings({"snapshotMaxDepth": 15})
                continue

-
            time.sleep(2)

            # 找到并点击第一个视频
@@ -481,7 +480,8 @@ class ScriptManager():

                    if isContainChniese:
                        # 翻译成主播国家的语言
-                        LogManager.method_info(f"需要翻译：{text}，参数为：国家为{anchorCountry}, 即将进行翻译", "关注打招呼", udid)
+                        LogManager.method_info(f"需要翻译：{text}，参数为：国家为{anchorCountry}, 即将进行翻译",
+                                               "关注打招呼", udid)

                        msg = Requester.translation(text, anchorCountry)

@@ -514,8 +514,14 @@ class ScriptManager():
                if followButton is not None:
                    # LogManager.method_info("找到关注按钮了", "关注打招呼", udid)
                    # followButton.click()
+                    x, y, w, h = followButton.bounds
+                    cx = int(x + w / 2)
+                    cy = int(y + h / 2)
+                    # 随机偏移 ±5 px（可自己改范围）
+                    cx += random.randint(-5, 5)
+                    cy += random.randint(-5, 5)

-                    ControlUtils.micro_swipe_click(session, element=followButton, dist_min=1, dist_max=10, repeat=1)
+                    ControlUtils.tap_mini_cluster(cx, cy, session)


                else:
@@ -738,7 +744,8 @@ class ScriptManager():

                            last_msg_text = last_msg
                        else:
-                            LogManager.method_info(f"对方发送的消息不是语言，随机挑选作为最后一条进行回复：{last_msg}", "检测消息", udid)
+                            LogManager.method_info(f"对方发送的消息不是语言，随机挑选作为最后一条进行回复：{last_msg}",
+                                                   "检测消息", udid)
                            last_msg_text = random.choice(text_list)

                        if AiUtils.contains_chinese(last_msg_text):