@ray-js/t-agent-ui-ray 0.2.0-beta-10 → 0.2.0-beta-12

package/dist/MessageInput/MessageInputAIStream/AsrInput.d.ts

@@ -6,7 +6,7 @@ interface Props {
     disabled?: boolean;
     onConfirm: () => void;
     onRecord: () => void;
-    onCancel: () => void;
+    onCancel: () => Promise<boolean>;
     onBack: () => void;
     onAbort: () => void;
 }

package/dist/MessageInput/MessageInputAIStream/AsrInput.js

@@ -12,7 +12,7 @@ const AsrInput = props => {
   const t = useTranslate();
   const [active, setActive] = useState(false);
   const [cancel, setCancel] = useState(false);
-  const onVoiceTouchEnd = event => {
+  const onVoiceTouchEnd = async event => {
     const touchY = event.changedTouches[0].pageY;
     setCancel(false);
     setActive(false);
@@ -30,11 +30,13 @@ const AsrInput = props => {
         startAt: 0,
         y: 0
       };
-      props.onCancel();
-      ty.showToast({
-        icon: 'none',
-        title: t('t-agent.input.asr.error.too-short')
-      });
+      const result = await props.onCancel();
+      if (result) {
+        ty.showToast({
+          icon: 'none',
+          title: t('t-agent.input.asr.error.too-short')
+        });
+      }
       return;
     }
     props.onConfirm();
@@ -50,10 +52,14 @@ const AsrInput = props => {
   }, /*#__PURE__*/React.createElement(View, {
     className: cx('t-agent-message-input-ptt', {
       't-agent-message-input-ptt-active': active,
-      't-agent-message-input-ptt-cancel': cancel
+      't-agent-message-input-ptt-cancel': cancel,
+      't-agent-message-input-ptt-disabled': props.disabled
     }),
     onTouchStart: async event => {
       var _event$touches$;
+      if (props.disabled) {
+        return;
+      }
       touchRef.current = {
         startAt: Date.now(),
         y: (_event$touches$ = event.touches[0]) === null || _event$touches$ === void 0 ? void 0 : _event$touches$.pageY

package/dist/MessageInput/MessageInputAIStream/index.js

@@ -5,39 +5,111 @@ import "core-js/modules/esnext.iterator.map.js";
 import "core-js/modules/web.dom-collections.iterator.js";
 import '../index.less';
 import { Button, View } from '@ray-js/components';
-import React, { useRef, useState } from 'react';
+import React, { useRef, useState, useMemo } from 'react';
 import { Image, Input, ScrollView } from '@ray-js/ray';
 import { AbortController, authorize } from '@ray-js/t-agent-plugin-aistream';
-import { Emitter, EmitterEvent } from '@ray-js/t-agent';
+import { Emitter, EmitterEvent, isAbortError } from '@ray-js/t-agent';
 import cx from 'clsx';
 import imageSvg from '../icons/image.svg';
 import videoSvg from '../icons/video.svg';
+import cameraSvg from '../icons/camera.svg';
 import { useAttachmentInput, useChatAgent, useEmitEvent, useIsUnmounted, useOnEvent, useTranslate } from '../../hooks';
 import AsrInput from './AsrInput';
-import { useSleep } from '../../hooks/useSleep';
+import logger from '../../logger';
 const AMPLITUDE_COUNT = 60;
+var InputState = /*#__PURE__*/function (InputState) {
+  InputState["PENDING"] = "pending";
+  InputState["RECORDING"] = "recording";
+  InputState["ASR"] = "asr";
+  InputState["RESPONDING"] = "responding";
+  InputState["ABORTING"] = "aborting";
+  return InputState;
+}(InputState || {});
+var InputAction = /*#__PURE__*/function (InputAction) {
+  InputAction["SEND"] = "send";
+  InputAction["RECORD"] = "record";
+  InputAction["RECORD_TIMEOUT"] = "record_timeout";
+  InputAction["RECORD_CANCEL"] = "record_cancel";
+  InputAction["RECORD_CONFIRM"] = "record_confirm";
+  InputAction["ASR_END"] = "asr_end";
+  InputAction["ASR_ERROR"] = "asr_error";
+  InputAction["ABORT"] = "abort";
+  InputAction["TEXT_END"] = "text_end";
+  InputAction["ABORT_DONE"] = "abort_done";
+  InputAction["NETWORK_CHANGE"] = "network_change";
+  return InputAction;
+}(InputAction || {});
+const transitions = {
+  [InputState.PENDING]: {
+    [InputAction.SEND]: InputState.RESPONDING,
+    [InputAction.RECORD]: InputState.RECORDING,
+    [InputAction.NETWORK_CHANGE]: InputState.PENDING,
+    // 这个变更是为了兼容 pushInputBlocks 结束的场景，没有实际意义
+    [InputAction.TEXT_END]: InputState.PENDING
+  },
+  [InputState.RECORDING]: {
+    [InputAction.RECORD_TIMEOUT]: InputState.ASR,
+    [InputAction.NETWORK_CHANGE]: InputState.PENDING,
+    [InputAction.RECORD_CANCEL]: InputState.PENDING,
+    [InputAction.RECORD_CONFIRM]: InputState.ASR,
+    [InputAction.ABORT]: InputState.ABORTING,
+    [InputAction.ASR_ERROR]: InputState.PENDING
+  },
+  [InputState.ASR]: {
+    [InputAction.ASR_END]: InputState.RESPONDING,
+    [InputAction.ASR_ERROR]: InputState.PENDING,
+    [InputAction.ABORT]: InputState.ABORTING,
+    [InputAction.NETWORK_CHANGE]: InputState.PENDING
+  },
+  [InputState.RESPONDING]: {
+    [InputAction.ABORT]: InputState.ABORTING,
+    [InputAction.TEXT_END]: InputState.PENDING,
+    [InputAction.NETWORK_CHANGE]: InputState.PENDING
+  },
+  [InputState.ABORTING]: {
+    [InputAction.ABORT_DONE]: InputState.PENDING,
+    [InputAction.NETWORK_CHANGE]: InputState.PENDING
+  }
+};
 export default function MessageInputAIStream(props) {
   const [moreOpen, setMoreOpen] = useState(false);
   const t = useTranslate();
   const [text, setText] = useState('');
-  const [record, setRecord] = useState({
-    startAt: 0,
-    recording: false,
-    confirm: null,
-    cancel: null
+  const [state, setState] = useState({
+    current: InputState.PENDING,
+    payload: {}
   });
-  const attachmentOptions = {
-    image: true,
-    video: true,
-    imageCount: 1,
-    videoCount: 1
+  const dispatchRef = useRef(null);
+  dispatchRef.current = (event, payload) => {
+    var _transitions$state$cu;
+    const next = (_transitions$state$cu = transitions[state.current]) === null || _transitions$state$cu === void 0 ? void 0 : _transitions$state$cu[event];
+    if (next) {
+      logger.debug('MessageInputAIStream', "".concat(state.current, " ==").concat(event, "==> ").concat(next));
+      setState({
+        current: next,
+        payload
+      });
+      return true;
+    }
+    logger.error('MessageInputAIStream', "".concat(state.current, " ==").concat(event, "==> X not allowed"));
+    return false;
   };
-  if (props.attachment === false) {
-    attachmentOptions.image = false;
-    attachmentOptions.video = false;
-  } else if (typeof props.attachment === 'object') {
-    Object.assign(attachmentOptions, props.attachment);
-  }
+  const dispatch = (event, payload) => dispatchRef.current(event, payload);
+  const attachmentOptions = useMemo(() => {
+    const options = {
+      image: true,
+      video: true,
+      imageCount: 1,
+      videoCount: 1
+    };
+    if (props.attachment === false) {
+      options.image = false;
+      options.video = false;
+    } else if (typeof props.attachment === 'object') {
+      Object.assign(options, props.attachment);
+    }
+    return options;
+  }, [props.attachment]);
   const attachmentInput = useAttachmentInput({
     local: true
   });
@@ -47,8 +119,6 @@ export default function MessageInputAIStream(props) {
     setUploaded,
     upload
   } = attachmentInput;
-  const abortRef = useRef(null);
-  const [responding, setResponding] = useState(false);
   const [mode, setMode] = useState('text');
   const agent = useChatAgent();
   const emitEvent = useEmitEvent();
@@ -57,8 +127,8 @@ export default function MessageInputAIStream(props) {
     let {
       online
     } = _ref;
-    if (!online && responding) {
-      setResponding(false);
+    if (!online) {
+      dispatch(InputAction.NETWORK_CHANGE, {});
     }
   });
   const hasMore = attachmentOptions.image || attachmentOptions.video;
@@ -67,32 +137,31 @@ export default function MessageInputAIStream(props) {
     if (!(inputBlocks !== null && inputBlocks !== void 0 && inputBlocks.length)) {
       return;
     }
-    setUploaded([]);
-    setText('');
-    setResponding(true);
     const controller = new AbortController();
     let abortResolve;
-    abortRef.current = {
-      controller,
-      promise: new Promise(resolve => {
-        abortResolve = resolve;
-      })
-    };
-    controller.signal.addEventListener('abort', () => {
-      var _abortRef$current;
-      if (((_abortRef$current = abortRef.current) === null || _abortRef$current === void 0 ? void 0 : _abortRef$current.controller) === controller) {
-        abortRef.current = null;
-        setResponding(false);
-      }
+    const abortPromise = new Promise(resolve => {
+      abortResolve = resolve;
     });
+    if (!dispatch(InputAction.SEND, {
+      abort: async () => {
+        if (dispatch(InputAction.ABORT, {})) {
+          controller.abort('User abort');
+          await abortPromise;
+          dispatch(InputAction.ABORT_DONE, {});
+        }
+      }
+    })) {
+      return;
+    }
+    setUploaded([]);
+    setMoreOpen(false);
+    setText('');
     try {
       await agent.pushInputBlocks(inputBlocks, controller.signal);
-      if (controller.signal.aborted) {
-        abortResolve();
-      }
     } finally {
-      if (!isUnmounted()) {
-        setResponding(false);
+      abortResolve();
+      if (!isUnmounted() && !controller.signal.aborted) {
+        dispatch(InputAction.TEXT_END, {});
       }
     }
   };
@@ -100,43 +169,16 @@ export default function MessageInputAIStream(props) {
     let {
       blocks
     } = _ref2;
-    if (uploading || responding) {
+    if (uploading) {
       return;
     }
-    setText('');
-    setMoreOpen(false);
-    setUploaded([]);
-    setResponding(true);
-    const controller = new AbortController();
-    let abortResolve;
-    abortRef.current = {
-      controller,
-      promise: new Promise(resolve => {
-        abortResolve = resolve;
-      })
-    };
-    controller.signal.addEventListener('abort', () => {
-      if (abortRef.current.controller === controller) {
-        abortRef.current = null;
-      }
-      setResponding(false);
-    });
-    try {
-      await agent.pushInputBlocks(blocks, controller.signal);
-      if (controller.signal.aborted) {
-        abortResolve();
-      }
-    } finally {
-      if (!isUnmounted()) {
-        setResponding(false);
-      }
-    }
+    send(blocks);
   });
   useOnEvent('setInputBlocks', async _ref3 => {
     let {
       blocks
     } = _ref3;
-    if (uploading || responding) {
+    if (uploading || state.current !== InputState.PENDING) {
       return;
     }
     if (mode !== 'text') {
@@ -162,9 +204,10 @@ export default function MessageInputAIStream(props) {
       });
     }
   };
-  useSleep();
   let container;
-  const canSend = text.trim().length && !responding && !attachmentInput.uploading;
+  const canSend = text.trim().length && state.current === InputState.PENDING && !attachmentInput.uploading;
+  const canAbort = state.current === InputState.RESPONDING || state.current === InputState.ASR;
+  const recordingFlagRef = useRef(false);
   if (mode === 'text') {
     container = /*#__PURE__*/React.createElement(View, {
       className: "t-agent-message-input-text-bar"
@@ -216,15 +259,14 @@ export default function MessageInputAIStream(props) {
       className: cx('t-agent-message-input-button', {
         't-agent-message-input-button-more': isMore,
         't-agent-message-input-button-more-open': moreOpen && isMore,
-        't-agent-message-input-button-send': !isMore && !responding,
-        't-agent-message-input-button-stop': responding
+        't-agent-message-input-button-send': !isMore && !canAbort,
+        't-agent-message-input-button-stop': canAbort
       }),
       "data-testid": "t-agent-message-input-button-main",
       onClick: async () => {
-        if (responding) {
-          if (abortRef.current) {
-            abortRef.current.controller.abort('User abort');
-          }
+        if (canAbort) {
+          var _state$payload$abort, _state$payload;
+          await ((_state$payload$abort = (_state$payload = state.payload).abort) === null || _state$payload$abort === void 0 ? void 0 : _state$payload$abort.call(_state$payload));
         } else if (isMore) {
           openMoreClick();
         } else if (canSend) {
@@ -237,92 +279,144 @@ export default function MessageInputAIStream(props) {
     }));
   } else {
     container = /*#__PURE__*/React.createElement(AsrInput, {
-      responding: responding,
-      disabled: responding,
+      responding: canAbort,
+      disabled: state.current === InputState.ABORTING,
       amplitudeCount: AMPLITUDE_COUNT,
-      recording: record.recording,
+      recording: state.current === InputState.RECORDING,
       onRecord: async () => {
+        logger.debug('MessageInputAIStream', 'AsrInput onRecord');
         if (attachmentInput.uploading) {
           return;
         }
-        const abort = abortRef.current;
-        if (responding && abort) {
-          abort.controller.abort('User abort');
-          // 中断后等待上次结束再开始
-          await abort.promise;
+        recordingFlagRef.current = true;
+        if (canAbort) {
+          logger.debug('MessageInputAIStream', 'AsrInput onRecord canAbort');
+          await state.payload.abort();
+          logger.debug('MessageInputAIStream', 'AsrInput onRecord canAbort done');
         }
+        if (!recordingFlagRef.current) {
+          return;
+        }
+        recordingFlagRef.current = false;
+        // 有可能在中断完成前就触发了录音，所以需要检查一下状态
+        // 中断完成后，再检查一次状态，如果取消了，那么不再继续录音
+
         const emitter = new Emitter();
-        const id = setTimeout(() => {
-          if (r.recording) {
+        emitter.addEventListener('error', async error => {
+          logger.error('MessageInputAIStream', 'AsrInput error', error);
+          if (dispatch(InputAction.ASR_ERROR, {})) {
+            var _error$detail;
+            if (((_error$detail = error.detail) === null || _error$detail === void 0 ? void 0 : _error$detail.name) === 'AsrEmptyError') {
+              ty.showToast({
+                icon: 'error',
+                title: t('t-agent.input.asr.error.empty')
+              });
+            } else {
+              ty.showToast({
+                icon: 'error',
+                title: t('t-agent.input.asr.error.unknown')
+              });
+            }
+          }
+        });
+        emitter.addEventListener('finish', () => {
+          dispatch(InputAction.ASR_END, {
+            abort
+          });
+        });
+        const controller = new AbortController();
+        let abortResolve;
+        const abortPromise = new Promise(resolve => {
+          abortResolve = resolve;
+        });
+        const abort = async () => {
+          if (dispatch(InputAction.ABORT, {})) {
+            controller.abort('User abort');
+            await abortPromise;
+            dispatch(InputAction.ABORT_DONE, {});
+          }
+        };
+        const recordTimeOutId = setTimeout(async () => {
+          if (dispatch(InputAction.RECORD_TIMEOUT, {
+            abort
+          })) {
+            clearTimeout(recordTimeOutId);
+            emitter.dispatchEvent(new EmitterEvent('confirm'));
             ty.showToast({
               icon: 'none',
               title: t('t-agent.input.asr.error.timeout')
             });
-            r.confirm();
           }
         }, props.maxAudioMs || 30000);
-        const r = {
-          startAt: Date.now(),
-          recording: true,
-          confirm: () => {
-            r.recording = false;
-            clearTimeout(id);
-            emitter.dispatchEvent(new EmitterEvent('confirm'));
-            setRecord({
-              startAt: 0,
-              recording: false,
-              confirm: null,
-              cancel: null
-            });
-          },
-          cancel: () => {
-            r.recording = false;
-            clearTimeout(id);
-            emitter.dispatchEvent(new EmitterEvent('cancel'));
-            setRecord({
-              startAt: 0,
-              recording: false,
-              confirm: null,
-              cancel: null
-            });
-          }
-        };
-        setRecord(r);
-        emitter.addEventListener('error', () => {
-          ty.showToast({
-            icon: 'error',
-            title: t('t-agent.input.asr.error.empty')
-          });
-          setRecord({
-            startAt: 0,
-            recording: false,
-            confirm: null,
-            cancel: null
-          });
-        });
-        await send([...attachmentInput.blocks, {
+        if (!dispatch(InputAction.RECORD, {
+          emitter,
+          recordTimeOutId,
+          recordStartAt: Date.now(),
+          abort
+        })) {
+          return;
+        }
+        setUploaded([]);
+        setMoreOpen(false);
+        setText('');
+        const inputBlocks = [...attachmentInput.blocks, {
           type: 'audio',
           audio_emitter: emitter,
           amplitude_count: AMPLITUDE_COUNT
-        }]);
+        }];
+        try {
+          logger.debug('MessageInputAIStream', 'pushInputBlocks start');
+          await agent.pushInputBlocks(inputBlocks, controller.signal);
+          logger.debug('MessageInputAIStream', 'pushInputBlocks end');
+        } catch (error) {
+          if (!isAbortError(error)) {
+            throw error;
+          }
+        } finally {
+          abortResolve();
+          if (!isUnmounted() && !controller.signal.aborted) {
+            dispatch(InputAction.TEXT_END, {});
+          }
+        }
       },
-      onConfirm: () => {
-        var _record$confirm;
-        (_record$confirm = record.confirm) === null || _record$confirm === void 0 || _record$confirm.call(record);
+      onConfirm: async () => {
+        logger.debug('MessageInputAIStream', 'AsrInput onConfirm');
+        recordingFlagRef.current = false;
+        if (state.current === InputState.ABORTING) {
+          return;
+        }
+        const payload = state.payload;
+        if (dispatch(InputAction.RECORD_CONFIRM, {
+          abort: payload.abort
+        })) {
+          clearTimeout(payload.recordTimeOutId);
+          payload.emitter.dispatchEvent(new EmitterEvent('confirm'));
+        }
       },
-      onCancel: () => {
-        var _record$cancel;
-        (_record$cancel = record.cancel) === null || _record$cancel === void 0 || _record$cancel.call(record);
+      onCancel: async () => {
+        logger.debug('MessageInputAIStream', 'AsrInput onCancel');
+        recordingFlagRef.current = false;
+        if (state.current === InputState.ABORTING) {
+          return false;
+        }
+        const payload = state.payload;
+        if (dispatch(InputAction.RECORD_CANCEL, {})) {
+          clearTimeout(payload.recordTimeOutId);
+          logger.debug('MessageInputAIStream', 'AsrInput onCancel send cancel');
+          payload.emitter.dispatchEvent(new EmitterEvent('cancel'));
+          await payload.abort();
+          return true;
+        }
+        return false;
       },
       onBack: () => {
         setText('');
         setMode('text');
         setMoreOpen(false);
       },
-      onAbort: () => {
-        if (responding && abortRef.current) {
-          abortRef.current.controller.abort('User abort');
-        }
+      onAbort: async () => {
+        var _state$payload$abort2, _state$payload2;
+        await ((_state$payload$abort2 = (_state$payload2 = state.payload).abort) === null || _state$payload$abort2 === void 0 ? void 0 : _state$payload$abort2.call(_state$payload2));
       }
     });
   }
@@ -378,7 +472,7 @@ export default function MessageInputAIStream(props) {
     className: "t-agent-message-input-panel ".concat(moreOpen ? '' : 't-agent-message-input-panel-close')
   }, /*#__PURE__*/React.createElement(View, {
     className: "t-agent-message-input-panel-content"
-  }, attachmentOptions.image && /*#__PURE__*/React.createElement(Button, {
+  }, (attachmentOptions === null || attachmentOptions === void 0 ? void 0 : attachmentOptions.image) && /*#__PURE__*/React.createElement(Button, {
     className: "t-agent-message-input-panel-button",
     onClick: async () => {
       try {
@@ -389,7 +483,7 @@ export default function MessageInputAIStream(props) {
           });
           return;
         }
-        await upload('image', 1);
+        await upload('album', 1);
       } catch (e) {
         ty.showToast({
           icon: 'error',
@@ -401,7 +495,30 @@ export default function MessageInputAIStream(props) {
     className: "t-agent-message-input-panel-button-icon"
   }, /*#__PURE__*/React.createElement(Image, {
     src: imageSvg
-  }))), attachmentOptions.video && /*#__PURE__*/React.createElement(Button, {
+  }))), (attachmentOptions === null || attachmentOptions === void 0 ? void 0 : attachmentOptions.image) && /*#__PURE__*/React.createElement(Button, {
+    className: "t-agent-message-input-panel-button",
+    onClick: async () => {
+      try {
+        if (uploaded.filter(f => f.type === 'image').length >= (attachmentOptions.imageCount || 1)) {
+          ty.showToast({
+            icon: 'none',
+            title: t('t-agent.input.upload.image.max-reached')
+          });
+          return;
+        }
+        await upload('camera', 1);
+      } catch (e) {
+        ty.showToast({
+          icon: 'error',
+          title: t('t-agent.input.upload.failed')
+        });
+      }
+    }
+  }, /*#__PURE__*/React.createElement(View, {
+    className: "t-agent-message-input-panel-button-icon"
+  }, /*#__PURE__*/React.createElement(Image, {
+    src: cameraSvg
+  }))), (attachmentOptions === null || attachmentOptions === void 0 ? void 0 : attachmentOptions.video) && /*#__PURE__*/React.createElement(Button, {
     className: "t-agent-message-input-panel-button",
     onClick: async () => {
       try {

package/dist/MessageInput/icons/camera.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="none" version="1.1" width="20" height="18" viewBox="0 0 20 18"><g><path d="M7.82843,2L5.82843,4L2,4L2,16L18,16L18,4L14.1716,4L12.1716,2L7.82843,2ZM7,0L13,0L15,2L19,2C19.5523,2,20,2.44772,20,3L20,17C20,17.5523,19.5523,18,19,18L1,18C0.44772,18,0,17.5523,0,17L0,3C0,2.44772,0.44772,2,1,2L5,2L7,0ZM10,15C6.96243,15,4.5,12.5376,4.5,9.5C4.5,6.46243,6.96243,4,10,4C13.0376,4,15.5,6.46243,15.5,9.5C15.5,12.5376,13.0376,15,10,15ZM10,13C11.933,13,13.5,11.433,13.5,9.5C13.5,7.567,11.933,6,10,6C8.067,6,6.5,7.567,6.5,9.5C6.5,11.433,8.067,13,10,13Z" fill="#3D3D3D" fill-opacity="1"/></g></svg>

package/dist/MessageInput/index.less

@@ -349,6 +349,13 @@
   text-align: center;
 }
 
+.t-agent-message-input-ptt-disabled {
+  .t-agent-message-input-ptt-text {
+    color: var(--app-B1-N3);
+  }
+}
+
+
 .t-agent-message-input-ptt-overlay-cancel {
 
 }

package/dist/MessageList/index.js

@@ -8,7 +8,6 @@ import { View } from '@ray-js/components';
 import React, { useMemo, useRef, useState } from 'react';
 import { ScrollView } from '@ray-js/ray';
 import { generateId } from '@ray-js/t-agent';
-import { isVersionMatch } from '@ray-js/t-agent-plugin-aistream';
 import MessageRender from '../MessageRender';
 import { useAgentMessage, useAgentSessionValue, useOnEvent } from '../hooks';
 import { useDebouncedFn } from '../hooks/useDebouncedFn';
@@ -40,7 +39,7 @@ export default function MessageList(props) {
     } = systemInfo;
     return {
       // 在 2.27.2 版本之前，pageScrollTo 在某些场景不生效
-      scroll: containerVersion && isVersionMatch('>=2.27.2', containerVersion)
+      scroll: false
     };
   }, []);
   const scroll = useDebouncedFn(animation => {

package/dist/hooks/useAttachmentInput.d.ts

@@ -18,5 +18,5 @@ export declare function useAttachmentInput({ local }?: {
     setUploaded: import("react").Dispatch<import("react").SetStateAction<UploadFile[]>>;
     uploading: boolean;
     loadBlocks: (blocks: InputBlock[], append?: boolean) => void;
-    upload: (type: 'image' | 'video', count?: any) => Promise<void>;
+    upload: (type: 'image' | 'video' | 'camera' | 'album', count?: any) => Promise<void>;
 };

package/dist/hooks/useAttachmentInput.js

@@ -109,47 +109,80 @@ export function useAttachmentInput() {
   } = useRenderOptions();
   const upload = useCallback(async function (type) {
     let count = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 1;
-    if (type === 'image') {
+    if (type === 'image' || type === 'camera' || type === 'album') {
       let file = [];
-      try {
-        const sourceType = await new Promise(resolve => {
-          ty.showActionSheet({
-            itemList: [t('t-agent.input.upload.source-type.camera'), t('t-agent.input.upload.source-type.album')],
-            success: _ref => {
-              let {
-                tapIndex
-              } = _ref;
-              if (tapIndex === 0) {
-                ty.authorize({
-                  scope: 'scope.camera',
-                  success() {
-                    resolve('camera');
-                  },
-                  fail() {
-                    ty.showToast({
-                      title: t('t-agent.input.upload.source-type.camera.require-permission'),
-                      icon: 'none'
-                    });
-                    resolve('');
-                  }
-                });
-              } else if (tapIndex === 1) {
-                resolve('album');
-              } else {
+      if (type === 'image') {
+        try {
+          const sourceType = await new Promise(resolve => {
+            ty.showActionSheet({
+              itemList: [t('t-agent.input.upload.source-type.camera'), t('t-agent.input.upload.source-type.album')],
+              success: _ref => {
+                let {
+                  tapIndex
+                } = _ref;
+                if (tapIndex === 0) {
+                  ty.authorize({
+                    scope: 'scope.camera',
+                    success() {
+                      resolve('camera');
+                    },
+                    fail() {
+                      ty.showToast({
+                        title: t('t-agent.input.upload.source-type.camera.require-permission'),
+                        icon: 'none'
+                      });
+                      resolve('');
+                    }
+                  });
+                } else if (tapIndex === 1) {
+                  resolve('album');
+                } else {
+                  resolve('');
+                }
+              },
+              fail() {
                 resolve('');
               }
-            },
-            fail() {
-              resolve('');
-            }
+            });
           });
-        });
-        if (!sourceType) {
+          if (!sourceType) {
+            return;
+          }
+          file = await chooseImage(count, sourceType);
+        } catch (err) {
+          return;
+        }
+      }
+      if (type === 'camera') {
+        try {
+          const allowUseCamera = await new Promise(resolve => {
+            ty.authorize({
+              scope: 'scope.camera',
+              success() {
+                resolve(true);
+              },
+              fail() {
+                ty.showToast({
+                  title: t('t-agent.input.upload.source-type.camera.require-permission'),
+                  icon: 'none'
+                });
+                resolve(false);
+              }
+            });
+          });
+          if (allowUseCamera) {
+            file = await chooseImage(count, 'camera');
+          }
+        } catch (err) {
+          return;
+        }
+      }
+      if (type === 'album') {
+        try {
+          file = await chooseImage(count, 'album');
+        } catch (err) {
           return;
         }
-        file = await chooseImage(count, sourceType);
-      } catch (err) {
-        return;
       }
       await Promise.all(file.map(async _ref2 => {
         let {

package/dist/i18n/strings.d.ts

@@ -22,6 +22,7 @@ declare const _default: {
         't-agent.input.asr.ptt': string;
         't-agent.input.asr.error.too-short': string;
         't-agent.input.asr.error.empty': string;
+        't-agent.input.asr.error.unknown': string;
         't-agent.input.asr.error.timeout': string;
         't-agent.message.feedback.success': string;
         't-agent.message.bubble.aborted': string;
@@ -165,6 +166,7 @@ declare const _default: {
         't-agent.input.asr.ptt': string;
         't-agent.input.asr.error.too-short': string;
         't-agent.input.asr.error.empty': string;
+        't-agent.input.asr.error.unknown': string;
         't-agent.input.asr.error.timeout': string;
         't-agent.message.feedback.success': string;
         't-agent.message.bubble.aborted': string;

package/dist/i18n/strings.js

@@ -22,6 +22,7 @@ export default {
     't-agent.input.asr.ptt': '按住说话',
     't-agent.input.asr.error.too-short': '说话时间太短',
     't-agent.input.asr.error.empty': '未能从语音中识别到文字',
+    't-agent.input.asr.error.unknown': '语音识别失败',
     't-agent.input.asr.error.timeout': '语音识别已达时长限制，将直接发送',
     't-agent.message.feedback.success': '反馈成功',
     't-agent.message.bubble.aborted': '用户中断',
@@ -165,6 +166,7 @@ export default {
     't-agent.input.asr.ptt': 'Press & hold to talk',
     't-agent.input.asr.error.too-short': 'Speaking time too short',
     't-agent.input.asr.error.empty': 'No text recognized from voice',
+    't-agent.input.asr.error.unknown': 'Text recognized failed',
     't-agent.input.asr.error.timeout': 'Voice recognition has reached time limit, sending directly',
     't-agent.message.feedback.success': 'Feedback Successful',
     't-agent.message.bubble.aborted': 'User Aborted',

package/dist/tiles/FileTile/index.less

@@ -49,6 +49,7 @@
   display: -webkit-box;
   -webkit-line-clamp: 2; /* 控制显示行数 */
   -webkit-box-orient: vertical;
+  line-height: 33rpx;
   height: 66rpx;
 
 

package/dist/tiles/ImageTile/index.js

@@ -8,7 +8,6 @@ export default function ImageTile(props) {
   const {
     src
   } = props.tile.data;
-  console.log('props.tile.data', props.tile.data);
   const {
     getStaticResourceBizType
   } = useRenderOptions();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ray-js/t-agent-ui-ray",
-  "version": "0.2.0-beta-10",
+  "version": "0.2.0-beta-12",
   "author": "Tuya.inc",
   "license": "MIT",
   "private": false,
@@ -40,5 +40,5 @@
     "@types/echarts": "^4.9.22",
     "@types/markdown-it": "^14.1.1"
   },
-  "gitHead": "a17ba630a9ec71afe6a0fc46c427f664d46acf82"
+  "gitHead": "a4e65a8f099f9ffa6e215ae005589c63f40587fe"
 }