From efe0f82b6a9c82ef0444b31b66e6001d607f0778 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8C=97=E6=9E=B3?= <7854742+wang_rumeng@user.noreply.gitee.com> Date: Mon, 22 Sep 2025 14:54:34 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E9=83=A8=E7=BD=B2=E7=94=9F=E4=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.production | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.env.production b/.env.production index cf5acab..b7c3cee 100644 --- a/.env.production +++ b/.env.production @@ -1,12 +1,12 @@ # 临时使用旧域名配置，等待后端更新 -NEXT_PUBLIC_JAVA_URL = https://auth.test.movieflow.ai -NEXT_PUBLIC_BASE_URL = https://77.smartvideo.py.qikongjian.com -NEXT_PUBLIC_CUT_URL = https://77.smartcut.py.qikongjian.com -# NEXT_PUBLIC_JAVA_URL = https://auth.movieflow.ai -# NEXT_PUBLIC_BASE_URL = https://api.video.movieflow.ai -# NEXT_PUBLIC_CUT_URL = https://smartcut.movieflow.ai -#NEXT_PUBLIC_GOOGLE_REDIRECT_URI=https://www.movieflow.ai/api/auth/google/callback +# NEXT_PUBLIC_JAVA_URL = https://auth.test.movieflow.ai +# NEXT_PUBLIC_BASE_URL = https://77.smartvideo.py.qikongjian.com +# NEXT_PUBLIC_CUT_URL = https://77.smartcut.py.qikongjian.com +NEXT_PUBLIC_JAVA_URL = https://auth.movieflow.ai +NEXT_PUBLIC_BASE_URL = https://api.video.movieflow.ai +NEXT_PUBLIC_CUT_URL = https://smartcut.movieflow.ai +NEXT_PUBLIC_GOOGLE_REDIRECT_URI=https://www.movieflow.ai/api/auth/google/callback # 当前域名配置 NEXT_PUBLIC_FRONTEND_URL = https://www.movieflow.ai @@ -15,5 +15,5 @@ NEXT_PUBLIC_ERROR_CONFIG = 0.2 # Google OAuth配置 NEXT_PUBLIC_GOOGLE_CLIENT_ID=847079918888-o1nne8d3ij80dn20qurivo987pv07225.apps.googleusercontent.com -NEXT_PUBLIC_GOOGLE_REDIRECT_URI=https://www.movieflow.net/api/auth/google/callback +# NEXT_PUBLIC_GOOGLE_REDIRECT_URI=https://www.movieflow.net/api/auth/google/callback From e1036e434d590421284ed385cf735e3479717715 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8C=97=E6=9E=B3?= <7854742+wang_rumeng@user.noreply.gitee.com> Date: Mon, 22 Sep 2025 15:34:26 +0800 Subject: [PATCH 2/5] VIDEO_ASPECT_RATIO_PORTRAIT --- components/ChatInputBox/ChatInputBox.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/ChatInputBox/ChatInputBox.tsx b/components/ChatInputBox/ChatInputBox.tsx index 3a896f1..4bd444e 100644 --- a/components/ChatInputBox/ChatInputBox.tsx +++ b/components/ChatInputBox/ChatInputBox.tsx @@ -140,7 +140,7 @@ export function ChatInputBox({ noData }: { noData: boolean }) { language: "english", videoDuration: "unlimited", expansion_mode: true, - aspect_ratio: "VIDEO_ASPECT_RATIO_LANDSCAPE", + aspect_ratio: "VIDEO_ASPECT_RATIO_PORTRAIT", }); // 从 localStorage 初始化配置 @@ -155,7 +155,7 @@ export function ChatInputBox({ noData }: { noData: boolean }) { language: parsed.language || "english", videoDuration: parsed.videoDuration || "unlimited", expansion_mode: typeof parsed.expansion_mode === 'boolean' ? parsed.expansion_mode : true, - aspect_ratio: parsed.aspect_ratio || "VIDEO_ASPECT_RATIO_LANDSCAPE", + aspect_ratio: parsed.aspect_ratio || "VIDEO_ASPECT_RATIO_PORTRAIT", }); } catch (error) { console.warn('解析保存的配置失败，使用默认配置:', error); From 444335436be258d46d1b3642236ba3b81d126bba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8C=97=E6=9E=B3?= <7854742+wang_rumeng@user.noreply.gitee.com> Date: Mon, 22 Sep 2025 15:37:35 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E6=A8=AA=E5=B1=8F=EF=BC=9AVIDEO=5FASPECT?= =?UTF-8?q?=5FRATIO=5FLANDSCAPE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/ChatInputBox/ChatInputBox.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/ChatInputBox/ChatInputBox.tsx b/components/ChatInputBox/ChatInputBox.tsx index 4bd444e..3a896f1 100644 --- a/components/ChatInputBox/ChatInputBox.tsx +++ b/components/ChatInputBox/ChatInputBox.tsx @@ -140,7 +140,7 @@ export function ChatInputBox({ noData }: { noData: boolean }) { language: "english", videoDuration: "unlimited", expansion_mode: true, - aspect_ratio: "VIDEO_ASPECT_RATIO_PORTRAIT", + aspect_ratio: "VIDEO_ASPECT_RATIO_LANDSCAPE", }); // 从 localStorage 初始化配置 @@ -155,7 +155,7 @@ export function ChatInputBox({ noData }: { noData: boolean }) { language: parsed.language || "english", videoDuration: parsed.videoDuration || "unlimited", expansion_mode: typeof parsed.expansion_mode === 'boolean' ? parsed.expansion_mode : true, - aspect_ratio: parsed.aspect_ratio || "VIDEO_ASPECT_RATIO_PORTRAIT", + aspect_ratio: parsed.aspect_ratio || "VIDEO_ASPECT_RATIO_LANDSCAPE", }); } catch (error) { console.warn('解析保存的配置失败，使用默认配置:', error); From b41ff70ccd36e75aa3d15b2899c8a8763d244792 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8C=97=E6=9E=B3?= <7854742+wang_rumeng@user.noreply.gitee.com> Date: Mon, 22 Sep 2025 16:13:21 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E8=A7=86=E9=A2=91=E6=AF=94=E4=BE=8B=20?= =?UTF-8?q?=E4=BC=A0=E5=8F=82=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/DTO/movie_start_dto.ts | 6 ++++-- app/service/Interaction/ImageStoryService.ts | 5 +++-- app/service/Interaction/templateStoryService.ts | 5 +++-- components/ChatInputBox/H5PhotoStoryDrawer.tsx | 2 +- components/ChatInputBox/H5TemplateDrawer.tsx | 2 +- components/ChatInputBox/PcPhotoStoryModal.tsx | 2 +- components/ChatInputBox/PcTemplateModal.tsx | 2 +- 7 files changed, 14 insertions(+), 10 deletions(-) diff --git a/api/DTO/movie_start_dto.ts b/api/DTO/movie_start_dto.ts index 5676d18..869452e 100644 --- a/api/DTO/movie_start_dto.ts +++ b/api/DTO/movie_start_dto.ts @@ -1,3 +1,5 @@ +import { AspectRatioValue } from '@/components/ChatInputBox/AspectRatioSelector' + /** * 图片故事AI分析返回DTO */ @@ -107,7 +109,7 @@ export interface CreateMovieProjectV2Request { /** 图片URL */ image_url: string; /** 画面比例（横/竖屏） */ - aspect_ratio?: "16:9" | "9:16"; + aspect_ratio?: AspectRatioValue; } /** @@ -252,7 +254,7 @@ export interface CreateMovieProjectV3Request { photo_url: string; }[]; /** 画面比例（横/竖屏） */ - aspect_ratio?: "16:9" | "9:16"; + aspect_ratio?: AspectRatioValue; } /** diff --git a/app/service/Interaction/ImageStoryService.ts b/app/service/Interaction/ImageStoryService.ts index ee7b6f8..3a3a300 100644 --- a/app/service/Interaction/ImageStoryService.ts +++ b/app/service/Interaction/ImageStoryService.ts @@ -14,6 +14,7 @@ import { CreateMovieProjectResponse, } from "@/api/DTO/movie_start_dto"; import { MovieProjectService, MovieProjectMode } from "./MovieProjectService"; +import { AspectRatioValue } from '@/components/ChatInputBox/AspectRatioSelector' interface UseImageStoryService { /** 当前图片故事数据 */ @@ -58,7 +59,7 @@ interface UseImageStoryService { mode?: "auto" | "manual", resolution?: "720p" | "1080p" | "4k", language?: string, - aspectRatio?: "16:9" | "9:16" + aspectRatio?: AspectRatioValue ) => Promise<{ project_id: string } | undefined>; /** 设置角色分析 */ setCharactersAnalysis: Dispatch>; @@ -459,7 +460,7 @@ export const useImageStoryServiceHook = (): UseImageStoryService => { mode: "auto" | "manual" = "auto", resolution: "720p" | "1080p" | "4k" = "720p", language: string = "English", - aspectRatio?: "16:9" | "9:16" + aspectRatio?: AspectRatioValue ) => { try { if (hasAnalyzed) { diff --git a/app/service/Interaction/templateStoryService.ts b/app/service/Interaction/templateStoryService.ts index d45f2a2..7a35770 100644 --- a/app/service/Interaction/templateStoryService.ts +++ b/app/service/Interaction/templateStoryService.ts @@ -6,6 +6,7 @@ import { useState, useCallback, useMemo } from "react"; import { generateTextToImage } from "@/api/movie_start"; import { MovieProjectService, MovieProjectMode } from "./MovieProjectService"; import { CreateMovieProjectV3Request } from "@/api/DTO/movie_start_dto"; +import { AspectRatioValue } from '@/components/ChatInputBox/AspectRatioSelector' interface UseTemplateStoryService { /** 模板列表 */ @@ -29,7 +30,7 @@ interface UseTemplateStoryService { mode: "auto" | "manual", resolution: "720p" | "1080p" | "4k", language: string, - aspectRatio?: "16:9" | "9:16" + aspectRatio?: AspectRatioValue ) => Promise; /** 设置选中的模板 */ setSelectedTemplate: (template: StoryTemplateEntity | null) => void; @@ -252,7 +253,7 @@ export const useTemplateStoryServiceHook = (): UseTemplateStoryService => { mode: "auto" | "manual" = "auto", resolution: "720p" | "1080p" | "4k" = "720p", language: string = "English", - aspectRatio?: "16:9" | "9:16" + aspectRatio?: AspectRatioValue ) => { console.log('selectedTemplate', selectedTemplate) try { diff --git a/components/ChatInputBox/H5PhotoStoryDrawer.tsx b/components/ChatInputBox/H5PhotoStoryDrawer.tsx index fd7b134..481f1f3 100644 --- a/components/ChatInputBox/H5PhotoStoryDrawer.tsx +++ b/components/ChatInputBox/H5PhotoStoryDrawer.tsx @@ -120,7 +120,7 @@ export const H5PhotoStoryDrawer = ({ configOptions.mode as "auto" | "manual", configOptions.resolution as "720p" | "1080p" | "4k", configOptions.language, - aspectUI === 'VIDEO_ASPECT_RATIO_LANDSCAPE' ? '16:9' : '9:16' + aspectUI as AspectRatioValue ); if (!episodeResponse) return; const episodeId = episodeResponse.project_id; diff --git a/components/ChatInputBox/H5TemplateDrawer.tsx b/components/ChatInputBox/H5TemplateDrawer.tsx index a8963cf..394951e 100644 --- a/components/ChatInputBox/H5TemplateDrawer.tsx +++ b/components/ChatInputBox/H5TemplateDrawer.tsx @@ -123,7 +123,7 @@ export const H5TemplateDrawer = ({ configOptions.mode, configOptions.resolution, configOptions.language, - aspectUI === 'VIDEO_ASPECT_RATIO_LANDSCAPE' ? '16:9' : '9:16' + aspectUI as AspectRatioValue ); if (projectId) { diff --git a/components/ChatInputBox/PcPhotoStoryModal.tsx b/components/ChatInputBox/PcPhotoStoryModal.tsx index 37c9f81..0f139a1 100644 --- a/components/ChatInputBox/PcPhotoStoryModal.tsx +++ b/components/ChatInputBox/PcPhotoStoryModal.tsx @@ -106,7 +106,7 @@ export const PcPhotoStoryModal = ({ configOptions.mode as "auto" | "manual", configOptions.resolution as "720p" | "1080p" | "4k", configOptions.language, - aspectUI === 'VIDEO_ASPECT_RATIO_LANDSCAPE' ? '16:9' : '9:16' + aspectUI as AspectRatioValue ); if (!episodeResponse) return; const episodeId = episodeResponse.project_id; diff --git a/components/ChatInputBox/PcTemplateModal.tsx b/components/ChatInputBox/PcTemplateModal.tsx index 5c8dcc3..f71e31b 100644 --- a/components/ChatInputBox/PcTemplateModal.tsx +++ b/components/ChatInputBox/PcTemplateModal.tsx @@ -183,7 +183,7 @@ export const PcTemplateModal = ({ configOptions.mode, configOptions.resolution, configOptions.language, - aspectUI === 'VIDEO_ASPECT_RATIO_LANDSCAPE' ? '16:9' : '9:16' + aspectUI as AspectRatioValue ); if (projectId) { From 2ac96d78d7db5c704595ab97b1747d7f1743bcb8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8C=97=E6=9E=B3?= <7854742+wang_rumeng@user.noreply.gitee.com> Date: Mon, 22 Sep 2025 16:32:26 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E5=85=BC=E5=AE=B9=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E4=B8=8D=E7=A8=B3=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/pages/work-flow/use-workflow-data.tsx | 2 ++ 1 file changed, 2 insertions(+) diff --git a/components/pages/work-flow/use-workflow-data.tsx b/components/pages/work-flow/use-workflow-data.tsx index e9c3fbb..1b12bf6 100644 --- a/components/pages/work-flow/use-workflow-data.tsx +++ b/components/pages/work-flow/use-workflow-data.tsx @@ -696,6 +696,8 @@ export function useWorkflowData({ onEditPlanGenerated, editingStatus, onExportFa } catch (error) { console.error('初始化失败:', error); setDataLoadError('加载失败，请重试'); + // 设置是否需要获取流式数据 + setNeedStreamData(true); setState({ mode: 'automatic' as 'automatic' | 'manual' | 'auto', originalText: '',