forked from 77media/video-flow
Merge branch 'prod' into dev
This commit is contained in:
commit
ae1e185113
@ -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
|
||||
|
||||
|
||||
@ -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;
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@ -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<SetStateAction<CharacterAnalysis[]>>;
|
||||
@ -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) {
|
||||
|
||||
@ -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<string | undefined>;
|
||||
/** 设置选中的模板 */
|
||||
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 {
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -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) {
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -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) {
|
||||
|
||||
@ -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: '',
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user