From b0525ce81796c623da5067bed727cabe802bfa3a Mon Sep 17 00:00:00 2001
From: milk <53408947@qq.com>
Date: Mon, 22 Sep 2025 19:52:45 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B6=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           |   5 +-
 Module/FlaskService.py                        |  33 +++
 .../__pycache__/FlaskService.cpython-312.pyc  | Bin 26940 -> 28443 bytes
 Utils/LogManager.py                           |   2 +-
 Utils/__pycache__/LogManager.cpython-312.pyc  | Bin 14663 -> 14685 bytes
 script/ScriptManager.py                       | 259 ++++++++++++++++++
 .../__pycache__/ScriptManager.cpython-312.pyc | Bin 41418 -> 50060 bytes
 7 files changed, 295 insertions(+), 4 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 95075d2..3941477 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -5,11 +5,10 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="eceeff5e-51c1-459c-a911-d21ec090a423" name="Changes" comment="20250904-初步功能已完成">
-      <change afterPath="$PROJECT_DIR$/resources/2335890f77fb51322361bd46b85f7fd1311aed53/bgv.png" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/resources/3157d8bd35c230012cb3640d2f26ffd0b61a10d1/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$/Module/FlaskService.py" beforeDir="false" afterPath="$PROJECT_DIR$/Module/FlaskService.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Utils/ThreadManager.py" beforeDir="false" afterPath="$PROJECT_DIR$/Utils/ThreadManager.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Utils/LogManager.py" beforeDir="false" afterPath="$PROJECT_DIR$/Utils/LogManager.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/script/ScriptManager.py" beforeDir="false" afterPath="$PROJECT_DIR$/script/ScriptManager.py" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/Module/FlaskService.py b/Module/FlaskService.py
index 8c607d9..166a8c6 100644
--- a/Module/FlaskService.py
+++ b/Module/FlaskService.py
@@ -305,6 +305,39 @@ def passAnchorData():
         LogManager.error(e)
         return ResultData(data="", code=1001).toJson()
 
+@app.route('/followAndGreetUnion', methods=['POST'])
+def followAndGreetUnion():
+    try:
+        LogManager.method_info("关注打招呼", "关注打招呼(联盟号)")
+        data: Dict[str, Any] = request.get_json()
+        # 设备列表
+        idList = data.get("deviceList", [])
+        # 主播列表
+        acList = data.get("anchorList", [])
+        LogManager.info(f"[INFO] 获取数据: {idList} {acList}")
+
+        AiUtils.save_aclist_flat_append(acList)
+
+        # 是否需要回复
+        needReply = data.get("needReply", True)
+        # 获取打招呼数据
+        ev.prologueList = data.get("prologueList", [])
+
+        # 添加主播数据
+        addModelToAnchorList(acList)
+        # 启动线程，执行脚本
+        for udid in idList:
+            manager = ScriptManager()
+            event = threading.Event()
+            # 启动脚本
+            thread = threading.Thread(target=manager.safe_followAndGreetUnion, args=(udid, needReply, event))
+            # 添加到线程管理
+            ThreadManager.add(udid, thread, event)
+        return ResultData(data="").toJson()
+    except Exception as e:
+        LogManager.error(e)
+        return ResultData(data="", code=1001).toJson()
+
 
 # 获取私信数据
 @app.route("/getPrologueList", methods=['GET'])
diff --git a/Module/__pycache__/FlaskService.cpython-312.pyc b/Module/__pycache__/FlaskService.cpython-312.pyc
index 18b093ab171cede223314af1956b074f0fb3d994..bc044a43aea0e8a6dbff4558722ed07d8ca5174b 100644
GIT binary patch
delta 1230
zcmZvbe@t6d6vy9r?JH0y!rBgs!vbaloH$LpwrnUvmlDh<g>A@+SUO&dIBerBWZ5(Z
zoIhfwGk9iV!b~$Avk2nq+hFPz*&k}mW>(x1lSSurf%%Vr7_umfVV+Z>|G1aFPrm1z
zd(OM}+|x7P!{}AWKW{P_C3^mH&prKR>qvevbfhX(J=pOLy#wynX7vdmquW3R9yT1n
zguHrvvuf{!$u$!)XG)Ulds&)Tky4;Fe81YVr%IB<>Tu07V;C};ZGN>?EmjLB+a~lY
z%Rt%(`=ENe=FjqNfSZ_bl@iao8ekl6yN(i%x{F{8M;<J~w7VLnv|H{bfJNL|d#}~9
zArkBFkL_)Us*NHX9@rV}i$!t7Q4ccCIhybhXCAI|7K0w^o$Ird7hqIU4fve1RhOk^
z<5$jd$iW-V88BjEW22HgnKuF0<*GoFt4YaKO_TZ9>1yb_%O~Ea%?_3j=3mhkwB*9;
zxNvZEe&kHmZ^MUgj3(yanyD5+3X4^Y4;aT7V}u>T%<@e}9iyFbobe%MxvPvK$$FfC
z+uZiD;&><$4&LElqJY=Ejj1hW_X8}s)A1Za*}spdCF_d$PRXBA#EHx9QoZkTb_?1)
zQ|9Kmn&$M*UFl9W9oduK(SO<cEMD{UDB=@Zi;>z{IE9s)%9Lp`pU}2#+AKp7QvnMe
zsWU5IkTa;AtW)*M*Cb<FX~S(<`Ih7%t$gcKGMvL9Z(YH8a)=9z?--xs1#gA%BFQ5_
zn|}%YYb{z{V}(w+O1_UY$K#J03O^&cKWA_tQsb$K_w|ZP_^SUtIF2d56;9(f{?lB$
z^<DS@ZEb7U{mON(6RsGe;l085KxkkvE`DT(PL1^l563@7wauseN%E{V)3&68TbOFE
zRF=tcQ~RlX5eg;Rj{t_u&;kC^;d}UhUJCtANpS;VrRys_&kprH7K=t`w+f{%(;GjK
zIo!~$02s2#Hp|+zz%;CyrOa_z82Kx##dS<R*+EBwu9n=4cQ<=yv9rr<ETUB<^yiAd
zlPPwhYYFNyYjXcf&tqjGc&l|HpN#@WA%ik$CRv?hWd<DfT5u^?0ajeoU1cnxPz{$q
z#O3is*Jka#?uP&-@nWb-DWzyV{vCP|wrkJtc7gq5rd*~H!@{sKPBF$Y-E*vQiX{)5
z;IR=rCV~e<@Ms9WdBImL_$~zZKhrS59TI$6!Fv*=IIY@^9+LEv;`_Cq)qrf@0+Ot}
gW*fGpbIX(7q-V%>37mh(_kep*C&?Q%M{kb&55@ynIsgCw

delta 826
zcmZXST}TvB6vyYx?u<FQ>Z)5x;+9srl_f~7VWsUuA*^c!sf78pyXso@ac7sZB*^qZ
zst3DSnL&jXYAV_VQIJY1f`r15h_!kMTzZMfAlky{oQPf;hX4HU@1ApK=A6^>9;RMF
z%#6vTNqF^bm~D9D?2Ji*HDehbBdp{Xj5%NxkBm0~7u6~*_+|B+X``q3P^KiY<=(8u
zUVdClNOpNjJV_q&(4KonI!Tg1YKCU8?G<eiuFcj!ETV;W5fc5O4jww+v(P!ks*tgG
zlmP#dyAy0Y$9_B67Ribc1y!HN>C^o|wZ=_P*2_QH3t>=f$}0lU`N^&6Jf+|v4D+`I
ztCSJU$Q4kSFT)+a-I1XP1UrP!;W26t(7Hg9^bdS>RU(f|PZ1HjpUc`b@+RUfe|d~p
zDzeKk$+tMS#XZJd_Jrgq$$fs-nWjBMdzw;ODMd^>(+tXMWF6vTi9<Dyp*<BD@YiMK
zW$C_pHpBBv*RSY98i+;-U2hFty%p*j4P6{zqr9bbg5Fhj4PNpWWoy?3F@(*d1hpgH
z6IHsu#vjnx907ypsGH@{{s2!dcPXFI-Vle&!v<L7brl)PHw1IyQpHy=f2Xi8$q$mB
z62DUEviwJJYk`L=Q<Wu*dM8q<bWpKp(jthi>T!slKs+Eb84)AT=J~<ea{S=&+LEY0
zw3g@uk8|7ASd0pTD0Z7=>;PiJzceE`1!b4bz*Jf+BZ(xD=>(13B)KTw?X`o6&w4YJ
zc%;$dm$x0DpSRU#Di#E(e60Qq>=W4yxnLcl6dE3uK$1veAsHsQ%iDc@jzO|C8;s_G
y(Il{G5^5x)&M_(_qw+B-1fvo#`W;4Jz%2Y&qgBgBi?^ij7u}5qWRcWlkbeVG!0HJA

diff --git a/Utils/LogManager.py b/Utils/LogManager.py
index 0c8bb94..3981133 100644
--- a/Utils/LogManager.py
+++ b/Utils/LogManager.py
@@ -26,7 +26,7 @@ def _force_utf8_everywhere():
     except Exception:
         pass
 
-# _force_utf8_everywhere()
+_force_utf8_everywhere()
 
 class LogManager:
     """
diff --git a/Utils/__pycache__/LogManager.cpython-312.pyc b/Utils/__pycache__/LogManager.cpython-312.pyc
index 1a1e4120a9f536922dac4e8e46e0d1affff0bd29..ebd77cb3cf2a5153fc9efbfd95dac99747044411 100644
GIT binary patch
delta 75
zcmX?Jbhn82G%qg~0}zy%U(C>%$ScX%Fi|~`CzX3ONDv4Z88)`HSTNd5=C;(9{3yr3
XD1L=O;yX(zGo$1u1`t^!0aOJ5@%Iu5

delta 54
zcmcaxbi9c7G%qg~0}wp?c_Bk@BCjN4(M0vcjnkSe7)>TiT51b^S1M&@l>Ed1B8wz|
F3IYBR5EuXe

diff --git a/script/ScriptManager.py b/script/ScriptManager.py
index 123ca5d..ea40c30 100644
--- a/script/ScriptManager.py
+++ b/script/ScriptManager.py
@@ -621,6 +621,265 @@ class ScriptManager():
 
         print("greetNewFollowers方法执行完毕")
 
+    def safe_followAndGreetUnion(self, udid, needReply, event):
+
+        retries = 0
+        while not event.is_set():
+            try:
+                self.followAndGreetUnion(udid, needReply, event)
+
+            except Exception as e:
+                retries += 1
+                LogManager.method_error(f"greetNewFollowers 出现异常: {e}，准备第 {retries} 次重试", "关注打招呼", udid)
+                event.wait(timeout=3)
+
+            if event.is_set():
+                LogManager.method_info("外层 while 检测到停止，即将 break", "关注打招呼", udid)
+                break
+        LogManager.method_error("greetNewFollowers 重试次数耗尽，任务终止", "关注打招呼", udid)
+
+    # 关注打招呼以及回复主播消息(联盟号)
+    def followAndGreetUnion(self, udid, needReply, event):
+
+        client = wda.USBClient(udid)
+        session = client.session()
+
+        print(f"是否要自动回复消息：{needReply}")
+
+        LogManager.method_info(f"是否要自动回复消息：{needReply}", "关注打招呼(联盟号)", udid)
+
+        # 先关闭Tik Tok
+        ControlUtils.closeTikTok(session, udid)
+        event.wait(timeout=1)
+
+        # 重新打开Tik Tok
+        ControlUtils.openTikTok(session, udid)
+        event.wait(timeout=3)
+        LogManager.method_info(f"重启tiktok", "关注打招呼(联盟号)", udid)
+        # 设置查找深度
+        session.appium_settings({"snapshotMaxDepth": 15})
+
+        # 创建udid名称的目录
+        AiUtils.makeUdidDir(udid)
+
+        # 返回上一步
+        def goBack(count):
+            for i in range(count):
+                LogManager.method_info(f"返回上一步", "关注打招呼(联盟号)", udid)
+
+                session.appium_settings({"snapshotMaxDepth": 15})
+                ControlUtils.clickBack(session)
+                event.wait(timeout=2)
+
+        LogManager.method_info(f"循环条件1:{not event.is_set()}", "关注打招呼(联盟号)", udid)
+        LogManager.method_info(f"循环条件2:{len(anchorList) > 0}", "关注打招呼(联盟号)", udid)
+        LogManager.method_info(f"循环条件3:{not event.is_set() and len(anchorList) > 0}", "关注打招呼(联盟号)", udid)
+
+        # 循环条件。1、 循环关闭  2、 数据处理完毕
+        while not event.is_set():
+
+            LogManager.method_info("=== 外层 while 新一轮 ===", "关注打招呼(联盟号)", udid)
+            if event.is_set():
+                break
+
+            # 获取一个主播，
+            LogManager.method_info(f"开始获取数据", "关注打招呼(联盟号)", udid)
+            # 获取一个主播，
+            result = AiUtils.peek_aclist_first()
+            LogManager.method_info(f"数据是：{result}", "关注打招呼(联盟号)", udid)
+
+            state = result.get("state", 0)
+            if not state:
+                LogManager.method_info(f"当前主播的状态是：{state} 不通行，取出数据移到列表尾部 继续下一个",
+                                       "关注打招呼(联盟号)",
+                                       udid)
+                AiUtils.pop_aclist_first(mode="move")
+                continue
+
+            # 并删除
+            anchor = AiUtils.pop_aclist_first()
+            LogManager.method_info(f"当前主播的状态是：{state} 通行，取出数据删除", "关注打招呼(联盟号)", udid)
+
+            if not anchor:
+                LogManager.method_info(f"数据库中的数据不足", "关注打招呼(联盟号)", udid)
+                if not self.interruptible_sleep(event, 30):
+                    continue
+
+            aid = anchor.get("anchorId", "")
+            anchorCountry = anchor.get("country", "")
+
+            LogManager.method_info(f"主播的数据,用户名:{aid}，国家:{anchorCountry}", "关注打招呼(联盟号)", udid)
+
+            # 点击搜索按钮
+            ControlUtils.clickSearch(session)
+
+            LogManager.method_info(f"点击搜索按钮", "关注打招呼(联盟号)", udid)
+
+            # 强制刷新session
+            session.appium_settings({"snapshotMaxDepth": 15})
+
+            # 查找输入框
+            input = session.xpath('//XCUIElementTypeSearchField')
+
+            # 如果找到了输入框，就点击并且输入内容
+            if input.exists:
+                input.click()
+                # 稍作停顿
+                event.wait(timeout=0.5)
+            else:
+                print(f"找不到输入框")
+
+            input = session.xpath('//XCUIElementTypeSearchField')
+            if input.exists:
+                input.clear_text()
+                event.wait(timeout=1)
+                # 输入主播id
+                input.set_text(f"{aid or '暂无数据'}\n")
+
+            # 定位 "关注" 按钮 通过关注按钮的位置点击主播首页
+
+            session.appium_settings({"snapshotMaxDepth": 25})
+
+            try:
+                # 点击进入首页
+                ControlUtils.clickFollow(session, aid)
+                LogManager.method_info("点击进入主播首页", "关注打招呼(联盟号)", udid)
+            except wda.WDAElementNotFoundError:
+                LogManager.method_info("未找到进入主播首页的按钮，使用第二个方案。", "关注打招呼(联盟号)", udid)
+                enter_room = ControlUtils.userClickProfile(session, aid)
+                if not enter_room:
+                    goBack(2)
+                    session.appium_settings({"snapshotMaxDepth": 15})
+                    continue
+
+            event.wait(timeout=2)
+
+            session.appium_settings({"snapshotMaxDepth": 25})
+            event.wait(timeout=0.5)
+            # 向上滑动
+            session.swipe_down()
+
+            event.wait(timeout=2)
+            msgButton = AiUtils.getSendMesageButton(session)
+            event.wait(timeout=2)
+
+            if msgButton.exists:
+                # 进入聊天页面
+                msgButton.click()
+                LogManager.method_info("找到发消息按钮了", "关注打招呼(联盟号)", udid)
+                print("找到发消息按钮了")
+            else:
+                LogManager.method_info("没有识别出发消息按钮", "关注打招呼(联盟号)", udid)
+                print("没有识别出发消息按钮")
+                goBack(3)
+                session.appium_settings({"snapshotMaxDepth": 15})
+                continue
+
+            event.wait(timeout=3)
+            # 查找聊天界面中的输入框节点
+            chatInput = session.xpath("//TextView")
+            if chatInput.exists:
+
+                print("找到输入框了, 准备发送一条打招呼消息")
+                LogManager.method_info("找到输入框了, 准备发送一条打招呼消息", "关注打招呼(联盟号)", udid)
+
+                print("打招呼的数据", ev.prologueList)
+                LogManager.method_info(f"传递的打招呼的数据：{ev.prologueList}", "关注打招呼(联盟号)", udid)
+
+                # 准备打招呼的文案
+                text = random.choice(ev.prologueList)
+                # text = 'hello'
+
+                LogManager.method_info(f"取出打招呼的数据，{text}, 判断是否需要翻译", "关注打招呼(联盟号)", udid)
+
+                isContainChniese = AiUtils.contains_chinese(text)
+
+                if isContainChniese:
+                    # 翻译成主播国家的语言
+                    LogManager.method_info(f"需要翻译：{text}，参数为：国家为{anchorCountry}, 即将进行翻译",
+                                           "关注打招呼(联盟号)", udid)
+
+                    msg = Requester.translation(text, anchorCountry)
+
+                    LogManager.method_info(f"翻译成功：{msg}, ", "关注打招呼(联盟号)", udid)
+
+                else:
+                    msg = text
+                LogManager.method_info(f"即将发送的私信内容：{msg}", "关注打招呼(联盟号)", udid)
+
+                # 准备发送一条信息
+                chatInput = session.xpath("//TextView")
+                if chatInput.exists:
+                    chatInput.click()
+                    chatInput.set_text(f"{msg or '暂无数据'}\n")
+                    event.wait(timeout=2)
+                    # 发送消息
+                # input.set_text(f"{aid or '暂无数据'}\n")
+                event.wait(timeout=1)
+            else:
+                print("无法发送信息")
+                LogManager.method_info(f"给主播{aid} 发送消息失败", "关注打招呼(联盟号)", udid)
+
+            # 接着下一个主播
+            goBack(1)
+
+            # 点击关注按钮
+            # followButton = AiUtils.getFollowButton(session).get(timeout=5)
+            # 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.tap_mini_cluster(cx, cy, session)
+            #
+            # else:
+            #     LogManager.method_info("没找到关注按钮", "关注打招呼", udid)
+            #     time.sleep(1)
+            #     goBack(4)
+            #     session.appium_settings({"snapshotMaxDepth": 15})
+            #     continue
+
+            session.appium_settings({"snapshotMaxDepth": 15})
+            goBack(3)
+
+            # 设置查找深度
+            session.appium_settings({"snapshotMaxDepth": 15})
+            event.wait(timeout=2)
+            print("即将要回复消息")
+            LogManager.method_info("即将要回复消息", "关注打招呼(联盟号)", udid)
+
+            if needReply:
+                print("如果需要回复主播消息。走此逻辑")
+
+                print("----------------------------------------------------------")
+                print("监控回复消息")
+                # 执行回复消息逻辑
+                self.monitorMessages(session, udid, event)
+
+                homeButton = AiUtils.findHomeButton(udid)
+                if homeButton.exists:
+                    homeButton.click()
+                else:
+                    ControlUtils.closeTikTok(session, udid)
+                    event.wait(timeout=2)
+                    ControlUtils.openTikTok(session, udid)
+                    event.wait(timeout=3)
+
+                print("重新创建wda会话 防止wda会话失效")
+                client = wda.USBClient(udid)
+                session = client.session()
+                # 执行完成之后。继续点击搜索
+                session.appium_settings({"snapshotMaxDepth": 15})
+            else:
+                session.appium_settings({"snapshotMaxDepth": 15})
+
+        print("greetNewFollowers方法执行完毕")
+
     # 检测消息
     def replyMessages(self, udid, event):
         client = wda.USBClient(udid)
diff --git a/script/__pycache__/ScriptManager.cpython-312.pyc b/script/__pycache__/ScriptManager.cpython-312.pyc
index 0a0d4763fb02176f38e8b8e3d6f78a5b316cb2b3..1618b9c497907fa27a4ba68796e3047c92d8b43d 100644
GIT binary patch
delta 4265
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

delta 1018
zcmZXTT})GF7{~jbN*gHsQ2YS36KX=NQ=GuE(G1<<mgriI3m3G=MsTf_tt;-7cVS#?
zFj*)c1@S=*6dh_Ei=(ypMj+#}5R*ACrqL_53r%`X@oL$YT`uf-AlZ%2#qT`t|M`5+
z$?56P{<0*Q9vY1~8nnOnJwE%*<hUuq*jF&jN|*^AvLe0No8!y<WIGh;^9l?;lQ-9A
zI-~O%+p}uSVNEluu~cd77V)a|_G`>80;L9qkLI%X84HP}^07R|;oQ;Po6q9_*-ChY
zP>A3#dUUmfo6%jFA5fy#(o<dOsa7?9OJ2(^qC^{EFM;ap@buVTW{1^d4-Rt^3d-E=
zOz$1_>h<*W#6ibPQmI3hFzY3~%)vqLwB_?n)MKVq8SP%_omBcRtCx~$B*Ebw=Qdp2
z<J^V(()pgr&XzZP*68)|omfx^ZO$!vB|P$CFvelUS#f}GM>#z;tzL|0hT7Mg?8^-N
zpoS-v3lRsW_xs08j}o0#5)(N4q-!f{0l&+d<Hrcvv%?&ET?cU5oNFiJ;y2fvj-3}n
zRsU#FyHJf9#H&k?zgJhRudQ~1+8tH;Xa1kaVZYmkDJR{u_BnSc@}~PZ@=v#|c<rw0
zl@V23Qu_K|w6>+^ud8i$cs7pDOb@Pa&!NIojs-za0W$14D782s<tc}xUAI0q6YW=f
zNAYVZv4}bmrVe1N!OcZw&Ce|VTkIxR6S@)0I@uTEfhM^JthMjzu8=+i{#rk47r)l-
z$QGR)S}hY0=?Y4pOXA<Issc6uAH?>vl=wQfN3WZwidl&NcuLCBLeAJvmSIw^60Q-x
zgQsI*HVYrdPqQd2!~=$lBm;u)fIin2a3$W%e}u<n^T&<BFMM*SzNw)xSl8f{A8W*L
z;yz>d;dHXnFhX^Q2shw%veufU8bd><E>Iuz^LoEe9;aX~;V$eRKVkWv+)+Xnp-Z%l
z*D*E-&+op0cPbDzsY4Q#!fY&FrMQM+!wmu7nI?G`o<llB;hM=?DINoPp;)@7g`tIJ
zwh{7Dhb$eWw-Xi#0zOSySqwT;W$YuEO}#F)WCL4#OZSALdN{K9#E>ADehv8n6fNbm
U&EQx%Vs0=o+g}=@ybWXj0UY6R2mk;8