zhangyong 1 年之前
父節點
當前提交
270744062e
共有 2 個文件被更改,包括 44 次插入43 次删除
  1. 40 39
      agc_main.py
  2. 4 4
      video_agc/agc_video_method.py

+ 40 - 39
agc_main.py

@@ -21,42 +21,43 @@ def video_start(user_data):
         mark = AgcVidoe.video_stitching(user_data)
         if mark:
             returned_usernames_today.add(mark)
-
-
-# 定义定时任务
-def video_task():
-    print("开始执行生成视频脚.")
-    data = Material.feishu_list()
-    # 创建一个线程池
-    with concurrent.futures.ThreadPoolExecutor() as executor:
-        futures = [executor.submit(video_start, user_data) for user_data in data]
-        # 等待所有任务执行完成
-        for future in concurrent.futures.as_completed(futures):
-            # 获取每个任务的执行结果
-            result = future.result()
-            print("处理结果:", result)
-    print("执行生成视频脚结束")
-schedule.every(10).minutes.do(video_task)
-
-# 每天0点清空集合
-schedule.every().day.at("00:00").do(lambda: returned_usernames_today.clear())
-
-
-def job_feishu_bot():
-    name_list = Material.feishu_name()
-    count_list = sqlHelp.get_count_list(name_list)
-    Feishu.bot('recommend', 'AGC视频', f'{"".join(count_list)}', 'all')
-    print("机器人通知完成")
-
-
-# 每天下午1:30执行任务
-schedule.every().day.at("15:00").do(job_feishu_bot)
-
-while True:
-    schedule.run_pending()
-    time.sleep(1)
-
-# list = Material.feishu_list()
-# AgcVidoe.video_stitching(list)
-# print(list)
-
+data = Material.feishu_list()
+video_start(data[0])
+
+# # 定义定时任务
+# def video_task():
+#     print("开始执行生成视频脚.")
+#     data = Material.feishu_list()
+#     # 创建一个线程池
+#     with concurrent.futures.ThreadPoolExecutor() as executor:
+#         futures = [executor.submit(video_start, user_data) for user_data in data]
+#         # 等待所有任务执行完成
+#         for future in concurrent.futures.as_completed(futures):
+#             # 获取每个任务的执行结果
+#             result = future.result()
+#             print("处理结果:", result)
+#     print("执行生成视频脚结束")
+# schedule.every(10).minutes.do(video_task)
+#
+# # 每天0点清空集合
+# schedule.every().day.at("00:00").do(lambda: returned_usernames_today.clear())
+#
+#
+# def job_feishu_bot():
+#     name_list = Material.feishu_name()
+#     count_list = sqlHelp.get_count_list(name_list)
+#     Feishu.bot('recommend', 'AGC视频', f'{"".join(count_list)}', 'all')
+#     print("机器人通知完成")
+#
+#
+# # 每天下午1:30执行任务
+# schedule.every().day.at("15:00").do(job_feishu_bot)
+#
+# while True:
+#     schedule.run_pending()
+#     time.sleep(1)
+#
+# # list = Material.feishu_list()
+# # AgcVidoe.video_stitching(list)
+# # print(list)
+#

+ 4 - 4
video_agc/agc_video_method.py

@@ -242,11 +242,11 @@ class AgcVidoe():
             # subtitle_cmd = f"subtitles={s_path}:force_style='Fontsize=11,Fontname=Hiragino Sans GB,Outline=0,PrimaryColour=&H000000,SecondaryColour=&H000000'"
             subtitle_cmd = f"subtitles={s_path}:force_style='Fontsize=12,Fontname=wqy-zenhei,Bold=1,Outline=0,PrimaryColour=&H000000,SecondaryColour=&H000000'"
         else:
-            subtitle_cmd = "drawtext=text='分享、转发给群友':fontsize=40:fontcolor=black:x=(w-text_w)/2:y=h-text_h-30"
+            subtitle_cmd = "drawtext=text='分享、转发给群友':fontsize=28:fontcolor=black:x=(w-text_w)/2:y=h-text_h-15"
         # 背景色参数
-        background_cmd = "drawbox=y=ih-118:color=yellow@1.0:width=iw:height=0:t=fill"
+        background_cmd = "drawbox=y=ih-65:color=yellow@1.0:width=iw:height=0:t=fill"
         # 分辨率参数
-        resolution_cmd = "-s", "480x854"
+        resolution_cmd = "-s", "320x480"
         # 多线程数
         num_threads = 4
         # 构建 FFmpeg 命令
@@ -260,7 +260,7 @@ class AgcVidoe():
             "-c:a", "aac",
             "-threads", str(num_threads),
             *resolution_cmd,  # 添加分辨率参数
-            "-vf", f"scale=480:854,{background_cmd},{subtitle_cmd}",  # 添加背景色和字幕
+            "-vf", f"scale=320x480,{background_cmd},{subtitle_cmd}",  # 添加背景色和字幕
             "-preset", "slow",  # 添加 medium
             "-profile:v", "high",  # main指定视频编码的配置文件
             "-b:v", "5M",