合并代码。临时上传

Utils/ControlUtils.py

@@ -58,13 +58,6 @@ class ControlUtils(object):
     @classmethod
     def clickBack(cls, session: Client):
         try:
-            # back = session.xpath(
-            #     "//*[@label='返回']"
-            #     " | "
-            #     "//*[@label='返回上一屏幕']"
-            #     " | "
-            #     "//XCUIElementTypeButton[@visible='true' and @name='TTKProfileNavBarBaseItemComponent' and @label='IconChevronLeftOffsetLTR']"
-            # )
 
             back = session.xpath(
                 # ① 常见中文文案
@@ -80,7 +73,6 @@ class ControlUtils(object):
                 ")]"
             )
 
-
             if back.exists:
                 back.click()
                 return True
@@ -96,6 +88,13 @@ class ControlUtils(object):
                 if back.exists:
                     back.click()
                 return True
+            elif session.xpath(
+                    "(//XCUIElementTypeOther[@y='20' and @height='44']//XCUIElementTypeButton[@visible='true'])[1]").exists:
+                back = session.xpath(
+                    "(//XCUIElementTypeOther[@y='20' and @height='44']//XCUIElementTypeButton[@visible='true'])[1]")
+                if back.exists:
+                    back.click()
+                return True
             else:
                 return False
         except Exception as e:
@@ -148,10 +147,9 @@ class ControlUtils(object):
         videoCell = session.xpath(
             '(//XCUIElementTypeCollectionView//XCUIElementTypeCell[.//XCUIElementTypeImage[@name="profile_video"]])[1]')
 
-
         tab = session.xpath(
             '//XCUIElementTypeButton[@name="TTKProfileTabVideoButton_0" or contains(@label,"作品") or contains(@name,"作品")]'
-        ).get(timeout=5)        # 某些版本 tab.value 可能就是数量；或者 tab.label 类似 “作品 7”
+        ).get(timeout=5)  # 某些版本 tab.value 可能就是数量；或者 tab.label 类似 “作品 7”
         m = re.search(r"\d+", tab.label)
 
         num = 0
@@ -170,8 +168,6 @@ class ControlUtils(object):
             print("没有找到主页的第一个视频")
             return False, num
 
-
-
     @classmethod
     def clickFollow(cls, session, aid):
         # 1) 含“关注/已关注/Follow/Following”的首个 cell
@@ -199,6 +195,7 @@ class ControlUtils(object):
             left_x = max(1, rect.x - 20)
             center_y = rect.y + rect.height // 2
             session.tap(left_x, center_y)
+
     @classmethod
     def userClickProfile(cls, session, aid):
         try:
@@ -283,7 +280,3 @@ class ControlUtils(object):
         print("开始微滑动")
         session.swipe(center_x, center_y, end_x, end_y, duration_ms / 1000)
         print("随机微滑动：", trajectory)
-
-
-
-