合并代码。解决冲突

Utils/AiUtils.py

@@ -270,7 +270,8 @@ class AiUtils(object):
     # 查找app主页上的收件箱按钮
     @classmethod
     def getMsgBoxButton(cls, session: Client):
-        box = session.xpath("//XCUIElementTypeButton[name='a11y_vo_inbox']")
+        # box = session.xpath("//XCUIElementTypeButton[name='a11y_vo_inbox']")
+        box = session(xpath='//XCUIElementTypeButton[@name="a11y_vo_inbox"]')
         if box.exists:
             return box
         else:
@@ -280,6 +281,7 @@ class AiUtils(object):
     @classmethod
     def getUnReadMsgCount(cls, session: Client):
         btn = cls.getMsgBoxButton(session)
+        print(f"btn:{btn}")
         return cls.findNumber(btn.label)
 
     # 获取聊天页面的聊天信息