From cb1fd85620764404874a2d729808f9e1ccea3333 Mon Sep 17 00:00:00 2001 From: onweekend Date: Wed, 16 Sep 2026 20:24:32 -0700 Subject: [PATCH 01/79] refactor: remove UE4/AI-man/TCP-UDP message actions and control encodes Drop the legacy message-channel action types (SendUe4Msg, SendAIManMsg, SwitchTCState), their config panels, composables and type/schema definitions, along with the unused controlEncodes editor. --- .../hooks/eventHandling/actionStrategies.ts | 155 -------------- .../hooks/eventHandling/useActionMessage.ts | 2 - .../hooks/eventHandling/useTcpUdpWebSocket.ts | 2 - .../callbackArgument/useCallbackOption.ts | 3 - .../components/controlEncodes/index.vue | 66 ------ .../controlEncodes/useControlEncodes.ts | 148 ------------- .../ActionComponentMapping.ts | 5 - .../actions/SendAIManMsg.vue | 32 --- .../actions/SendUE4Msg.vue | 39 ---- .../interactiveConfig/customEvent.vue | 5 - .../messageActionConfigs/index.vue | 126 ----------- .../components/interactiveConfig/options.ts | 66 +----- .../attrsRender/components/useDataApi.ts | 10 +- .../attrsRender/interactiveConfig.vue | 4 - .../components/buildConfig/constants/index.ts | 58 +---- .../build/components/buildRender/type.ts | 7 - .../Config/attrsRender/customEvent/index.vue | 5 - packages/composables/src/event/index.ts | 2 - .../composables/src/event/useActionMessage.ts | 200 ------------------ .../src/event/useEncodeCommunication.ts | 47 +--- .../composables/src/event/useEventHandling.ts | 10 - .../src/event/useTcpUdpWebSocket.ts | 165 --------------- packages/composables/src/ports/eventPort.ts | 9 +- .../src/schemas/event-action-condition.ts | 43 +--- packages/types/src/schemas/index.ts | 2 - packages/types/src/templates/index.ts | 48 ----- packages/types/src/types/action.ts | 115 +--------- packages/types/src/types/index.ts | 7 +- 28 files changed, 10 insertions(+), 1371 deletions(-) delete mode 100644 apps/app/src/hooks/eventHandling/useActionMessage.ts delete mode 100644 apps/app/src/hooks/eventHandling/useTcpUdpWebSocket.ts delete mode 100644 apps/app/src/views/build/components/buildConfig/attrsRender/components/controlEncodes/index.vue delete mode 100644 apps/app/src/views/build/components/buildConfig/attrsRender/components/controlEncodes/useControlEncodes.ts delete mode 100644 apps/app/src/views/build/components/buildConfig/attrsRender/components/interactiveConfig/componentActionConfigs/actions/SendAIManMsg.vue delete mode 100644 apps/app/src/views/build/components/buildConfig/attrsRender/components/interactiveConfig/componentActionConfigs/actions/SendUE4Msg.vue delete mode 100644 apps/app/src/views/build/components/buildConfig/attrsRender/components/interactiveConfig/messageActionConfigs/index.vue delete mode 100644 packages/composables/src/event/useActionMessage.ts delete mode 100644 packages/composables/src/event/useTcpUdpWebSocket.ts diff --git a/apps/app/src/hooks/eventHandling/actionStrategies.ts b/apps/app/src/hooks/eventHandling/actionStrategies.ts index d2f02ee5..d6676666 100644 --- a/apps/app/src/hooks/eventHandling/actionStrategies.ts +++ b/apps/app/src/hooks/eventHandling/actionStrategies.ts @@ -1088,127 +1088,6 @@ export class SwitchVideoStrategy extends ActionStrategy { } } -export class sendUE4MessageStrategy extends ActionStrategy { - async execute({ - componentIds, - isConditionSatisfied, - globalComponentMap, - ue4Config, - info, - animation, - action, - eventList - }: ActionExecutionParams & { - info: Record | null; - }): Promise { - if (!isConditionSatisfied || action === undefined) { - return; - } - - const ue4Info = action === ActionTypeEnum.SendUe4Msg ? info : null; - - const targetComponentId = componentIds[0]; - - /** - * @description 获取组件类型 - * @returns "PixelStreaming" | "PeerStreaming" | "" | null - */ - const getComponentType = () => { - const targetComponent = globalComponentMap.get(String(targetComponentId)); - if (!targetComponent) { - return null; - } - - const propMap: Record = { - [extendsEnumType.UePixelStreaming]: "PixelStreaming", - [extendsEnumType.UePeerStreaming]: "PeerStreaming", - [extendsEnumType.UeVessel]: "ue-vessel", - [extendsEnumType.SwUnrealEngine]: "sw-unreal-engine" - }; - - if (!propMap[targetComponent.component.prop]) { - return ""; - } - - return propMap[targetComponent.component.prop]; - }; - - /** - * @description 处理消息数据 - */ - const processMessageData = (messageContent: any, messageType: string, info?: any) => { - if (info) { - return messageType === "string" ? JSON.stringify(info) : { ...info }; - } - - switch (messageType) { - case "string": - return messageContent; - case "json": - return typeof messageContent === "string" ? JSON.parse(messageContent) : { data: messageContent }; - default: - return messageContent; - } - }; - - /** - * @description 发送UE消息 - */ - const sendUEMessage = () => { - console.log("sendUEMessage", window, (window as any).pixelStreaming, window.ue4); - if (!window.ue4 || !ue4Config) { - return; - } - - const { messageName, messageContent, messageType } = ue4Config; - - if (!messageName) { - return; - } - - const componentType = getComponentType(); - console.log("sendUEMessage22", componentType); - if (!componentType) { - return; - } - - const data = processMessageData(messageContent, messageType, ue4Info); - - // 根据组件类型发送消息 - switch (componentType) { - case "PeerStreaming": - if (window.funPS) { - window.funPS.emitMessage({ name: messageName, data }); - } - return; - - case "PixelStreaming": - console.log("PixelStreaming", { name: messageName, data }, (window as any).pixelStreaming); - if (window.playerStream) { - (window as any).playerStream.emitUIInteraction({ name: messageName, data }); - } - return; - - case "ue-vessel": - console.log("window.ue4.v2", messageName, data); - window.ue4?.v2?.(messageName, data); - return; - case "sw-unreal-engine": - componentIds.forEach((componentId) => { - const event = eventList[`${extendsEnumType.SwUnrealEngine}-${componentId}`]; - event.sendMessageToUe(messageName, data); - }); - break; - default: - return; - } - }; - - await delay(animation?.delay || 0); - sendUEMessage(); - } -} - export class SwitchBlueprintTab extends ActionStrategy { execute({ componentIds, blueprintKey, eventList, info }: ActionExecutionParams): void { if (!blueprintKey) { @@ -1222,37 +1101,6 @@ export class SwitchBlueprintTab extends ActionStrategy { } } -export class sendAIManMsgStaticStrategy extends ActionStrategy { - async execute({ - componentIds, - isConditionSatisfied, - globalComponentMap, - eventList, - animation, - info - }: ActionExecutionParams & { - info: Record | null; - }): Promise { - console.log("receiveWSMessage 触发数字人方法", info, isConditionSatisfied); - if (!isConditionSatisfied) { - return; - } - await delay(animation?.delay || 0); - componentIds.forEach((id) => { - const component = globalComponentMap.get(`${id}`); - if (!component) { - return; - } - - const event = (eventList as Record)[`${component.component.prop}-${id}`]; - if (!event.sendMsgToHuman) { - return; - } - event.sendMsgToHuman(info); - }); - } -} - export class SetIndexStrategy extends ActionStrategy { async execute({ componentIds, @@ -1632,9 +1480,6 @@ export class ActionStrategyFactory { [ActionTypeEnum.VideoToFastin]: new VideoToFastinStrategy(), [ActionTypeEnum.VideoToRewind]: new VideoToRewindStrategy(), [ActionTypeEnum.SwitchVideoProgress]: new SwitchVideoStrategy(), - [ActionTypeEnum.SendUe4Msg]: new sendUE4MessageStrategy(), - [ActionTypeEnum.SendUe4MsgStatic]: new sendUE4MessageStrategy(), - [ActionTypeEnum.SendAIManMsgStatic]: new sendAIManMsgStaticStrategy(), [ActionTypeEnum.SwitchBlueprintTab]: new SwitchBlueprintTab(), [ActionTypeEnum.nextPage]: new nextPageStrategy(), [ActionTypeEnum.prevPage]: new prevPageStrategy(), diff --git a/apps/app/src/hooks/eventHandling/useActionMessage.ts b/apps/app/src/hooks/eventHandling/useActionMessage.ts deleted file mode 100644 index deec2a71..00000000 --- a/apps/app/src/hooks/eventHandling/useActionMessage.ts +++ /dev/null @@ -1,2 +0,0 @@ -// useActionMessage 已下沉到 @screenwright/composables,这里保留原路径作为转发壳,避免调用方大范围改 import。 -export * from "@screenwright/composables"; diff --git a/apps/app/src/hooks/eventHandling/useTcpUdpWebSocket.ts b/apps/app/src/hooks/eventHandling/useTcpUdpWebSocket.ts deleted file mode 100644 index 24217c7f..00000000 --- a/apps/app/src/hooks/eventHandling/useTcpUdpWebSocket.ts +++ /dev/null @@ -1,2 +0,0 @@ -// useTcpUdpWebSocket 已下沉到 @screenwright/composables,这里保留原路径作为转发壳,避免调用方大范围改 import。 -export * from "@screenwright/composables"; diff --git a/apps/app/src/views/build/components/buildConfig/attrsRender/components/callbackArgument/useCallbackOption.ts b/apps/app/src/views/build/components/buildConfig/attrsRender/components/callbackArgument/useCallbackOption.ts index 37a0eb51..e4933502 100644 --- a/apps/app/src/views/build/components/buildConfig/attrsRender/components/callbackArgument/useCallbackOption.ts +++ b/apps/app/src/views/build/components/buildConfig/attrsRender/components/callbackArgument/useCallbackOption.ts @@ -7,8 +7,6 @@ import { templateCallback } from "@/views/build/components/buildConfig/attrsRend import { useUpdateInstance } from "@/views/build/components/buildConfig/useUpdateInstance"; import type { Callback } from "@/views/build/components/buildRender/type"; -import { ueMessageTypeOptions } from "../../../constants"; - /** * 回调参数配置Hook * @returns {Object} 回调参数配置相关的状态和方法 @@ -358,7 +356,6 @@ export const useCallbackOption = () => { activeTab, originQueryData, callbackOptions, - ueMessageTypeOptions, // 方法 addCallback, diff --git a/apps/app/src/views/build/components/buildConfig/attrsRender/components/controlEncodes/index.vue b/apps/app/src/views/build/components/buildConfig/attrsRender/components/controlEncodes/index.vue deleted file mode 100644 index c7aa9e7f..00000000 --- a/apps/app/src/views/build/components/buildConfig/attrsRender/components/controlEncodes/index.vue +++ /dev/null @@ -1,66 +0,0 @@ - - - - - diff --git a/apps/app/src/views/build/components/buildConfig/attrsRender/components/controlEncodes/useControlEncodes.ts b/apps/app/src/views/build/components/buildConfig/attrsRender/components/controlEncodes/useControlEncodes.ts deleted file mode 100644 index 236a53c0..00000000 --- a/apps/app/src/views/build/components/buildConfig/attrsRender/components/controlEncodes/useControlEncodes.ts +++ /dev/null @@ -1,148 +0,0 @@ -import { computed, ref } from "vue"; - -import { ElMessage } from "element-plus"; - -import { updateLargeScreen } from "@/api/library"; -import { useEditStore } from "@/views/build/components/buildRender/hooks/useEditStore"; -import { useLargeScreenInfo } from "@/views/build/useLargeScreenInfo"; -import { useEncodeCommunication } from "@/views/view/useEncodeCommunication"; - -/** - * 控制编码组件业务逻辑 - */ -export const useControlEncodes = () => { - const { encodedControlValues } = useEncodeCommunication(); - const { selectTargetData } = useEditStore(); - const { navInfo } = useLargeScreenInfo(); - /** - * 当前组件的控制编码值 - * 从 encodedControlValues 中读取当前选中组件的编码,支持双向绑定 - */ - const codeValue = computed({ - get: () => { - if (!selectTargetData.value?.length) return ""; - - const currentComponentId = `${selectTargetData.value[0].id}`; - const targetEncode = encodedControlValues.value.find((item) => item.id === currentComponentId); - return targetEncode?.code || ""; - }, - set: (value: string) => { - if (!selectTargetData.value?.length) return; - - const currentComponentId = `${selectTargetData.value[0].id}`; - - /** - * id-code-value - */ - - const targetEncodeIndex = encodedControlValues.value.findIndex((item) => item.id === currentComponentId); - - if (targetEncodeIndex !== -1) { - // 更新existing编码 - 使用浅拷贝 - const newEncodedValues = [...encodedControlValues.value]; - newEncodedValues[targetEncodeIndex] = { - id: currentComponentId, - code: value, - value: selectTargetData.value[0]?.data?.[0]?.value ?? "" - }; - encodedControlValues.value = newEncodedValues; - } else { - // 添加新编码 - 先删除原有相同id的数据,再添加新数据 - const filteredValues = encodedControlValues.value.filter((item) => item.id !== currentComponentId); - encodedControlValues.value = [ - ...filteredValues, - { - id: currentComponentId, - code: value, - value: selectTargetData.value[0]?.data?.[0]?.value ?? "" - } - ]; - } - } - }); - - /** - * 处理编码变更 - * @param value 新的编码值 - */ - const handleCodeChange = () => { - const update = () => { - const updateParams = { - encodedControl: JSON.stringify(navInfo.value.encodedControl), - id: Number(navInfo.value.id) - }; - updateLargeScreen(updateParams); - }; - update(); - }; - - // 内部状态 - const isFocused = ref(false); - - /** - * 验证控制编码格式 - * @param code 编码字符串 - */ - const validateControlCode = (code: string): boolean => { - if (!code.trim()) return true; // 允许为空 - - // 验证规则:只允许字母、数字、下划线、中划线 - const regex = /^[a-zA-Z0-9_-]+$/; - if (!regex.test(code)) { - ElMessage.warning("控制编码只能包含字母、数字、下划线和中划线"); - return false; - } - - // 长度验证 - if (code.length > 50) { - ElMessage.warning("控制编码长度不能超过50个字符"); - return false; - } - - return true; - }; - - /** - * 格式化控制编码 - * @param code 原始编码 - */ - const formatControlCode = (code: string): string => { - // 去除首尾空格,转换为小写 - return code.trim().toLowerCase(); - }; - - /** - * 处理输入框失焦 - */ - const handleBlur = () => { - isFocused.value = false; - - // 失焦时进行最终验证和格式化 - if (codeValue.value) { - const formattedValue = formatControlCode(codeValue.value); - if (validateControlCode(formattedValue)) { - codeValue.value = formattedValue; - } - } - }; - - /** - * 处理输入框聚焦 - */ - const handleFocus = () => { - isFocused.value = true; - }; - - return { - // 状态 - codeValue, - isFocused, - - // 方法 - handleCodeChange, - handleBlur, - handleFocus, - validateControlCode, - formatControlCode - }; -}; diff --git a/apps/app/src/views/build/components/buildConfig/attrsRender/components/interactiveConfig/componentActionConfigs/ActionComponentMapping.ts b/apps/app/src/views/build/components/buildConfig/attrsRender/components/interactiveConfig/componentActionConfigs/ActionComponentMapping.ts index 46f8a476..f1973da9 100644 --- a/apps/app/src/views/build/components/buildConfig/attrsRender/components/interactiveConfig/componentActionConfigs/ActionComponentMapping.ts +++ b/apps/app/src/views/build/components/buildConfig/attrsRender/components/interactiveConfig/componentActionConfigs/ActionComponentMapping.ts @@ -14,8 +14,6 @@ import GlMapRegionLift from "./actions/GlMapRegionLift.vue"; import GlMapSceneRoam from "./actions/GlMapSceneRoam.vue"; import HandleSceneObjExplosion from "./actions/HandleSceneObjExplosion.vue"; import ProjectFunction from "./actions/ProjectFunction.vue"; -import SendAIManMsg from "./actions/SendAIManMsg.vue"; -import SendUE4Msg from "./actions/SendUE4Msg.vue"; import SetDelay from "./actions/SetDelay.vue"; import SetIndex from "./actions/SetIndex.vue"; import SetStateAnimation from "./actions/SetStateAnimation.vue"; @@ -40,9 +38,6 @@ export const actionComponentMap: Record = { [ActionTypeEnum.Show]: ShowHide, [ActionTypeEnum.Hide]: ShowHide, [ActionTypeEnum.ShowHide]: ShowHide, - [ActionTypeEnum.SendUe4Msg]: SendUE4Msg, - [ActionTypeEnum.SendUe4MsgStatic]: SendUE4Msg, - [ActionTypeEnum.SendAIManMsgStatic]: SendAIManMsg, [ActionTypeEnum.SwitchSceneStatus]: SwitchSceneStatus, [ActionTypeEnum.SwitchSceneRoam]: SwitchSceneRoam, [ActionTypeEnum.SwitchSceneLevel]: SwitchSceneLevel, diff --git a/apps/app/src/views/build/components/buildConfig/attrsRender/components/interactiveConfig/componentActionConfigs/actions/SendAIManMsg.vue b/apps/app/src/views/build/components/buildConfig/attrsRender/components/interactiveConfig/componentActionConfigs/actions/SendAIManMsg.vue deleted file mode 100644 index 3940b5ac..00000000 --- a/apps/app/src/views/build/components/buildConfig/attrsRender/components/interactiveConfig/componentActionConfigs/actions/SendAIManMsg.vue +++ /dev/null @@ -1,32 +0,0 @@ - - - diff --git a/apps/app/src/views/build/components/buildConfig/attrsRender/components/interactiveConfig/componentActionConfigs/actions/SendUE4Msg.vue b/apps/app/src/views/build/components/buildConfig/attrsRender/components/interactiveConfig/componentActionConfigs/actions/SendUE4Msg.vue deleted file mode 100644 index 2f85ed0b..00000000 --- a/apps/app/src/views/build/components/buildConfig/attrsRender/components/interactiveConfig/componentActionConfigs/actions/SendUE4Msg.vue +++ /dev/null @@ -1,39 +0,0 @@ - - - diff --git a/apps/app/src/views/build/components/buildConfig/attrsRender/components/interactiveConfig/customEvent.vue b/apps/app/src/views/build/components/buildConfig/attrsRender/components/interactiveConfig/customEvent.vue index 15d591ce..ce08bc06 100644 --- a/apps/app/src/views/build/components/buildConfig/attrsRender/components/interactiveConfig/customEvent.vue +++ b/apps/app/src/views/build/components/buildConfig/attrsRender/components/interactiveConfig/customEvent.vue @@ -130,10 +130,6 @@ -
- -
-
-
- -
- - - diff --git a/apps/app/src/views/build/components/buildConfig/attrsRender/components/interactiveConfig/options.ts b/apps/app/src/views/build/components/buildConfig/attrsRender/components/interactiveConfig/options.ts index 40935a06..14db4d80 100644 --- a/apps/app/src/views/build/components/buildConfig/attrsRender/components/interactiveConfig/options.ts +++ b/apps/app/src/views/build/components/buildConfig/attrsRender/components/interactiveConfig/options.ts @@ -28,18 +28,11 @@ import { customTableListOptions, EncodeEventTypeEnum, EventTypeEnum, - MessageTypeEnum, - messageTypeOptions, ParameterTypeEnum, parameterTypeOptions, SceneObjectExplosionType, sceneObjectExplosionTypeOptions, - tcpudpDataTypeEnum, - tcpudpDataTypeOptions, timingFunction, - UDPSendtypeEnum, - UDPSendtypeListOptions, - ueMessageTypeOptions, VisibleTypeEnum, visibleTypeOptions } from "../../../constants/index"; @@ -174,30 +167,15 @@ export const templateActions = (): Action => { toY: 0 }, encodeKey: null, - ue4Config: { - messageName: "", - messageJson: "", - messageContent: "", - messageType: MessageTypeEnum.String - }, customActionType: "component", // 动作-类型 panelStatusAnimationId: "", // 面板状态动画ID panelStatusId: "", // 面板状态ID - tcpudpConfig: { - dataType: tcpudpDataTypeEnum.None, - dataSourceId: "", - dataSourceObj: null, - sendData: "", - sendType: UDPSendtypeEnum.Unicast, - dataDelay: 0 - }, projectFunName: "", projectParamList: [], projectParamType: ParameterTypeEnum.Default, projectParamValue: {}, projectParamCode: "", swiperCardTabsName: "", - aiManMsgContent: "", setBroadcastId: null, videoStartTime: 0, videoEndTime: 0, @@ -400,22 +378,6 @@ export const createTemplateAction = (actionType: ActionTypeEnum): Partial { [ConfigFieldEnum.ConditionType]: conditionTypeOptions, [ConfigFieldEnum.ConditionCompare]: conditionCompareOptions, [ConfigFieldEnum.VisibleType]: visibleTypeOptions, - [ConfigFieldEnum.MessageType]: messageTypeOptions, - [ConfigFieldEnum.UeMessageType]: ueMessageTypeOptions, [ConfigFieldEnum.CustomTableList]: customTableListOptions, - [ConfigFieldEnum.TcpudpDataType]: tcpudpDataTypeOptions, - [ConfigFieldEnum.UDPSendtypeList]: UDPSendtypeListOptions, [ConfigFieldEnum.ParameterType]: parameterTypeOptions, [ConfigFieldEnum.AnimationOutType]: animationOutList, [ConfigFieldEnum.SceneObjectExplosionType]: sceneObjectExplosionTypeOptions @@ -642,7 +578,7 @@ export const moreActionSExcludes = () => { export const switchStateProp = (prop: AllComponentType) => { const getComponent2ActionMap = createComponent2ActionMapGetter(); const propActions = getComponent2ActionMap().get(prop) || ""; - return propActions.includes(ActionTypeEnum.SwitchState) || propActions.includes(ActionTypeEnum.SwitchTCState); + return propActions.includes(ActionTypeEnum.SwitchState); }; export const switchSceneStatusProp = (prop: AllComponentType) => { diff --git a/apps/app/src/views/build/components/buildConfig/attrsRender/components/useDataApi.ts b/apps/app/src/views/build/components/buildConfig/attrsRender/components/useDataApi.ts index 6008f7d1..da08880d 100644 --- a/apps/app/src/views/build/components/buildConfig/attrsRender/components/useDataApi.ts +++ b/apps/app/src/views/build/components/buildConfig/attrsRender/components/useDataApi.ts @@ -6,7 +6,6 @@ import type { dbModelReq } from "@/model/DataModel"; import { DataSourceType } from "@/views/source/type"; import type { ComponentType } from "../../../buildRender/type"; -import { tcpudpDataTypeEnum } from "../../constants"; export type ApiFunction = (params: dbModelReq) => Promise; export interface DataSource { @@ -24,13 +23,6 @@ const apiMap = new Map([ [DataSourceType.TCPUDP, getDataSocketList] ]); -const dataTypeMapDataSourceType = { - [tcpudpDataTypeEnum.None]: DataSourceType.LOCAL, - [tcpudpDataTypeEnum.TCP]: DataSourceType.TCPUDP, - [tcpudpDataTypeEnum.UDP]: DataSourceType.TCPUDP, - [tcpudpDataTypeEnum.WebSocket]: DataSourceType.WEBSOCKET -}; - const useDataApi = createGlobalState((type?: DataSourceType) => { const options = ref< Array< @@ -79,4 +71,4 @@ const useDataApi = createGlobalState((type?: DataSourceType) => { return { options, getMenuApi, getOptionData, setOptions }; }); -export { dataTypeMapDataSourceType, useDataApi }; +export { useDataApi }; diff --git a/apps/app/src/views/build/components/buildConfig/attrsRender/interactiveConfig.vue b/apps/app/src/views/build/components/buildConfig/attrsRender/interactiveConfig.vue index 9d2b506a..accb7fff 100644 --- a/apps/app/src/views/build/components/buildConfig/attrsRender/interactiveConfig.vue +++ b/apps/app/src/views/build/components/buildConfig/attrsRender/interactiveConfig.vue @@ -1,7 +1,6 @@