Resolved conflicts and committed changes

Module/FlaskService.py

@@ -382,8 +382,7 @@ def followAndGreetUnion():
         # 是否需要回复
         needReply = data.get("needReply", True)
 
-        # 是否需要进行翻译
-        needTranslate = data.get("needTranslate", True)
+
 
         # 获取打招呼数据
         ev.prologueList = data.get("prologueList", [])
@@ -396,7 +395,7 @@ def followAndGreetUnion():
             event = threading.Event()
             # 启动脚本
             thread = threading.Thread(target=manager.safe_followAndGreetUnion,
-                                      args=(udid, needReply, needTranslate, event))
+                                      args=(udid, needReply, event))
             # 添加到线程管理
             ThreadManager.add(udid, thread, event)
         return ResultData(data="").toJson()
@@ -750,6 +749,18 @@ def getAiConfig():
     data = IOSAIStorage.load("aiConfig.json")
     return ResultData(data=data).toJson()
 
+# 重新开启tiktok
+@app.route("/restartTikTok", methods=['POST'])
+def restartTikTok():
+    json = request.get_json()
+    udid = json.get("udid")
+    client = wda.USBClient(udid, wdaFunctionPort)
+    session = client.session()
+    ControlUtils.closeTikTok(session, udid)
+    time.sleep(1)
+    ControlUtils.openTikTok(session, udid)
+    return ResultData(data="").toJson()
+
 if __name__ == '__main__':
     # 注意：这里建议 debug=False，避免未来有人改成 use_reloader=True 导致多进程
     app.run("0.0.0.0", port=5000, debug=False, use_reloader=False, threaded=True)