ruiyun-human 1.0.13 → 1.0.14

package/dist/ruiyun-human.cjs.js

@@ -393,15 +393,89 @@ const TTS_MAX_RETRIES = 5;
 const _sfc_main = {
   __name: "index",
   props: {
-    humans: {
-      type: Array,
-      default: () => []
+    human: {
+      type: Object,
+      default: null
     }
   },
   emits: ["loaded", "changed", "paused", "resumed", "audio-ready"],
   setup(__props, { expose: __expose, emit: __emit }) {
     const TTS_URL = "http://localhost:6039";
     const ASR_URL = "http://localhost:6039";
+    const HUMAN_PRESETS = {
+      1: {
+        humanId: 1,
+        title: "西装动漫男",
+        // TODO: 替换为真实资源
+        folder: "http://192.168.3.107:8088/img/xiangyu-green-suit",
+        folder_mobile: "http://192.168.3.107:8088/img/xiangyu-green-suit-header",
+        standby: { interval: 100, standbyNum: 11 },
+        speak: { interval: 30, speakNum: 0 },
+        humanType: 1,
+        timbre: 1
+      },
+      2: {
+        humanId: 2,
+        title: "西装动漫女",
+        folder: "http://192.168.3.107:8088/img/anime-woman",
+        folder_mobile: "http://192.168.3.107:8088/img/anime-woman-header",
+        standby: { interval: 100, standbyNum: 1 },
+        speak: { interval: 30, speakNum: 75 },
+        humanType: 1,
+        timbre: 3
+      },
+      3: {
+        humanId: 3,
+        title: "真人形象男",
+        folder: "http://192.168.3.107:8088/img/real-man",
+        folder_mobile: "http://192.168.3.107:8088/img/real-man-header",
+        standby: { interval: 100, standbyNum: 1 },
+        speak: { interval: 30, speakNum: 139 },
+        humanType: 1,
+        timbre: 47
+      },
+      4: {
+        humanId: 4,
+        title: "真人形象女",
+        folder: "http://192.168.3.107:8088/img/real-woman",
+        folder_mobile: "http://192.168.3.107:8088/img/real-woman-header",
+        standby: { interval: 100, standbyNum: 2 },
+        speak: { interval: 40, speakNum: 139 },
+        humanType: 1,
+        timbre: 34
+      },
+      5: {
+        humanId: 5,
+        title: "Q版形象",
+        folder: "http://192.168.3.107:8088/img/xiangyu-q",
+        folder_mobile: "http://192.168.3.107:8088/img/xiangyu-q-header",
+        standby: { interval: 100, standbyNum: 28 },
+        speak: { interval: 30, speakNum: 118 },
+        humanType: 1,
+        timbre: 34
+      }
+    };
+    const isMobile = () => {
+      if (typeof navigator === "undefined") return false;
+      return /Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini|HarmonyOS/i.test(navigator.userAgent);
+    };
+    const resolveFolder = (human) => {
+      const finalType = human.humanType || (isMobile() ? 2 : 1);
+      if (finalType === 2 && human.folder_mobile) return human.folder_mobile;
+      return human.folder;
+    };
+    const resolveHuman = (input) => {
+      if (input == null) return null;
+      const humanId = typeof input === "number" ? input : input.humanId;
+      const preset = HUMAN_PRESETS[humanId];
+      if (!preset) {
+        console.error("[DigitalHuman] 未找到 humanId=", humanId, "的预设形象，可用 id:", Object.keys(HUMAN_PRESETS));
+        return null;
+      }
+      const merged = { ...preset, ...typeof input === "object" ? input : {} };
+      merged.folder = resolveFolder(merged);
+      return merged;
+    };
     const props = __props;
     const emit = __emit;
     const containerRef = vue.ref(null);
@@ -423,27 +497,38 @@ const _sfc_main = {
         standbyNum: currentHuman.value.standby.standbyNum,
         speakNum: currentHuman.value.speak.speakNum
       };
-      for (let i = 1; i <= standbyNum; i++) {
+      const makeImage = (url) => {
         const image = new Image();
-        image.src = encodeURI(`${folder}/standby/standby (${i}).png`);
-        frames.value.standby.push(image);
+        image.src = encodeURI(url);
+        image.onload = () => {
+          image.__broken = false;
+        };
+        image.onerror = () => {
+          image.__broken = true;
+          console.warn("[DigitalHuman] 帧加载失败:", url);
+        };
+        return image;
+      };
+      for (let i = 1; i <= standbyNum; i++) {
+        frames.value.standby.push(makeImage(`${folder}/standby/standby (${i}).png`));
+      }
+      if (speakNum <= 0) {
+        console.warn("[DigitalHuman] 当前形象 speakNum=0，说话动画暂用待机帧替代");
+        frames.value.speakStart = [...frames.value.standby];
+        frames.value.speakLoop = [...frames.value.standby];
+        frames.value.speakEnd = [...frames.value.standby];
+        return;
       }
       const startEnd = Math.floor(speakNum * 0.6);
       const loopEnd = Math.floor(speakNum * 0.9);
       for (let i = 1; i <= startEnd; i++) {
-        const image = new Image();
-        image.src = encodeURI(`${folder}/speak/speak (${i}).png`);
-        frames.value.speakStart.push(image);
+        frames.value.speakStart.push(makeImage(`${folder}/speak/speak (${i}).png`));
       }
       for (let i = startEnd; i <= loopEnd; i++) {
-        const image = new Image();
-        image.src = encodeURI(`${folder}/speak/speak (${i}).png`);
-        frames.value.speakLoop.push(image);
+        frames.value.speakLoop.push(makeImage(`${folder}/speak/speak (${i}).png`));
       }
       for (let i = loopEnd; i <= speakNum; i++) {
-        const image = new Image();
-        image.src = encodeURI(`${folder}/speak/speak (${i}).png`);
-        frames.value.speakEnd.push(image);
+        frames.value.speakEnd.push(makeImage(`${folder}/speak/speak (${i}).png`));
       }
     };
     const draw = (image) => {
@@ -604,20 +689,38 @@ const _sfc_main = {
       };
       allFrames.forEach((img) => {
         if (img.complete) {
+          if (!img.naturalWidth) img.__broken = true;
           checkLoaded();
         } else {
-          img.onload = checkLoaded;
-          img.onerror = checkLoaded;
+          img.onload = () => {
+            img.__broken = false;
+            checkLoaded();
+          };
+          img.onerror = () => {
+            img.__broken = true;
+            checkLoaded();
+          };
         }
       });
     };
     const init = () => {
       vue.nextTick(() => {
+        var _a, _b;
         if (!containerRef.value || !canvasRef.value) return;
-        if (!props.humans || props.humans.length === 0) return;
-        if (!currentHuman.value) {
-          currentHuman.value = props.humans[0];
+        const rawInput = props.human;
+        if (!rawInput) return;
+        const human = resolveHuman(rawInput);
+        if (!human) return;
+        const prevType = (_a = currentHuman.value) == null ? void 0 : _a.humanType;
+        if (((_b = currentHuman.value) == null ? void 0 : _b.humanId) === human.humanId && prevType === human.humanType) {
+          Object.assign(currentHuman.value, human);
+          return;
         }
+        abortTTS();
+        stop();
+        timestamp.value = null;
+        frameIndex.value = 1;
+        currentHuman.value = human;
         const canvas = canvasRef.value;
         const dpr = window.devicePixelRatio || 1;
         const width = containerRef.value.clientWidth;
@@ -694,6 +797,7 @@ const _sfc_main = {
       return pcmToWavBlob(buf);
     };
     const requestTTSAudio = async (text, signal) => {
+      var _a;
       let lastError = null;
       for (let attempt = 1; attempt <= TTS_MAX_RETRIES; attempt++) {
         if (signal == null ? void 0 : signal.aborted) throw new DOMException("Aborted", "AbortError");
@@ -704,7 +808,7 @@ const _sfc_main = {
             clientid: VOICE_CLIENT_ID,
             "tenant-id": VOICE_TENANT_ID
           },
-          body: JSON.stringify({ text, user: TTS_USER, timbre: 47 }),
+          body: JSON.stringify({ text, user: TTS_USER, timbre: ((_a = currentHuman.value) == null ? void 0 : _a.timbre) ?? 1 }),
           signal
         });
         if (!res.ok) {
@@ -865,6 +969,27 @@ const _sfc_main = {
         });
       }
     };
+    vue.watch(
+      () => [props.human],
+      () => {
+        init();
+      },
+      { deep: true }
+    );
+    const switchHuman = (humanId) => {
+      const next = resolveHuman(humanId);
+      if (!next) return;
+      abortTTS();
+      stop();
+      timestamp.value = null;
+      frameIndex.value = 1;
+      currentHuman.value = next;
+      loadFrames();
+      waitFramesLoaded(() => {
+        draw(frames.value.standby[0]);
+        emit("changed", currentHuman.value);
+      });
+    };
     __expose({
       standby,
       speak,
@@ -873,13 +998,9 @@ const _sfc_main = {
       resume,
       playTTS,
       startRecord,
-      stopRecord
+      stopRecord,
+      switchHuman
     });
-    vue.watch(() => props.humans, (val) => {
-      if (val && val.length > 0 && !currentHuman.value) {
-        init();
-      }
-    }, { deep: true });
     vue.onMounted(() => {
       initRecorder();
       init();
@@ -905,7 +1026,7 @@ const _sfc_main = {
     };
   }
 };
-const DigitalHuman = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-9379171c"]]);
+const DigitalHuman = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-eb00f641"]]);
 DigitalHuman.install = (app) => app.component("DigitalHuman", DigitalHuman);
 const components = [DemoButton, DemoInput, DigitalHuman];
 const install = (app) => {

package/dist/ruiyun-human.es.js

@@ -391,15 +391,89 @@ const TTS_MAX_RETRIES = 5;
 const _sfc_main = {
   __name: "index",
   props: {
-    humans: {
-      type: Array,
-      default: () => []
+    human: {
+      type: Object,
+      default: null
     }
   },
   emits: ["loaded", "changed", "paused", "resumed", "audio-ready"],
   setup(__props, { expose: __expose, emit: __emit }) {
     const TTS_URL = "http://localhost:6039";
     const ASR_URL = "http://localhost:6039";
+    const HUMAN_PRESETS = {
+      1: {
+        humanId: 1,
+        title: "西装动漫男",
+        // TODO: 替换为真实资源
+        folder: "http://192.168.3.107:8088/img/xiangyu-green-suit",
+        folder_mobile: "http://192.168.3.107:8088/img/xiangyu-green-suit-header",
+        standby: { interval: 100, standbyNum: 11 },
+        speak: { interval: 30, speakNum: 0 },
+        humanType: 1,
+        timbre: 1
+      },
+      2: {
+        humanId: 2,
+        title: "西装动漫女",
+        folder: "http://192.168.3.107:8088/img/anime-woman",
+        folder_mobile: "http://192.168.3.107:8088/img/anime-woman-header",
+        standby: { interval: 100, standbyNum: 1 },
+        speak: { interval: 30, speakNum: 75 },
+        humanType: 1,
+        timbre: 3
+      },
+      3: {
+        humanId: 3,
+        title: "真人形象男",
+        folder: "http://192.168.3.107:8088/img/real-man",
+        folder_mobile: "http://192.168.3.107:8088/img/real-man-header",
+        standby: { interval: 100, standbyNum: 1 },
+        speak: { interval: 30, speakNum: 139 },
+        humanType: 1,
+        timbre: 47
+      },
+      4: {
+        humanId: 4,
+        title: "真人形象女",
+        folder: "http://192.168.3.107:8088/img/real-woman",
+        folder_mobile: "http://192.168.3.107:8088/img/real-woman-header",
+        standby: { interval: 100, standbyNum: 2 },
+        speak: { interval: 40, speakNum: 139 },
+        humanType: 1,
+        timbre: 34
+      },
+      5: {
+        humanId: 5,
+        title: "Q版形象",
+        folder: "http://192.168.3.107:8088/img/xiangyu-q",
+        folder_mobile: "http://192.168.3.107:8088/img/xiangyu-q-header",
+        standby: { interval: 100, standbyNum: 28 },
+        speak: { interval: 30, speakNum: 118 },
+        humanType: 1,
+        timbre: 34
+      }
+    };
+    const isMobile = () => {
+      if (typeof navigator === "undefined") return false;
+      return /Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini|HarmonyOS/i.test(navigator.userAgent);
+    };
+    const resolveFolder = (human) => {
+      const finalType = human.humanType || (isMobile() ? 2 : 1);
+      if (finalType === 2 && human.folder_mobile) return human.folder_mobile;
+      return human.folder;
+    };
+    const resolveHuman = (input) => {
+      if (input == null) return null;
+      const humanId = typeof input === "number" ? input : input.humanId;
+      const preset = HUMAN_PRESETS[humanId];
+      if (!preset) {
+        console.error("[DigitalHuman] 未找到 humanId=", humanId, "的预设形象，可用 id:", Object.keys(HUMAN_PRESETS));
+        return null;
+      }
+      const merged = { ...preset, ...typeof input === "object" ? input : {} };
+      merged.folder = resolveFolder(merged);
+      return merged;
+    };
     const props = __props;
     const emit = __emit;
     const containerRef = ref(null);
@@ -421,27 +495,38 @@ const _sfc_main = {
         standbyNum: currentHuman.value.standby.standbyNum,
         speakNum: currentHuman.value.speak.speakNum
       };
-      for (let i = 1; i <= standbyNum; i++) {
+      const makeImage = (url) => {
         const image = new Image();
-        image.src = encodeURI(`${folder}/standby/standby (${i}).png`);
-        frames.value.standby.push(image);
+        image.src = encodeURI(url);
+        image.onload = () => {
+          image.__broken = false;
+        };
+        image.onerror = () => {
+          image.__broken = true;
+          console.warn("[DigitalHuman] 帧加载失败:", url);
+        };
+        return image;
+      };
+      for (let i = 1; i <= standbyNum; i++) {
+        frames.value.standby.push(makeImage(`${folder}/standby/standby (${i}).png`));
+      }
+      if (speakNum <= 0) {
+        console.warn("[DigitalHuman] 当前形象 speakNum=0，说话动画暂用待机帧替代");
+        frames.value.speakStart = [...frames.value.standby];
+        frames.value.speakLoop = [...frames.value.standby];
+        frames.value.speakEnd = [...frames.value.standby];
+        return;
       }
       const startEnd = Math.floor(speakNum * 0.6);
       const loopEnd = Math.floor(speakNum * 0.9);
       for (let i = 1; i <= startEnd; i++) {
-        const image = new Image();
-        image.src = encodeURI(`${folder}/speak/speak (${i}).png`);
-        frames.value.speakStart.push(image);
+        frames.value.speakStart.push(makeImage(`${folder}/speak/speak (${i}).png`));
       }
       for (let i = startEnd; i <= loopEnd; i++) {
-        const image = new Image();
-        image.src = encodeURI(`${folder}/speak/speak (${i}).png`);
-        frames.value.speakLoop.push(image);
+        frames.value.speakLoop.push(makeImage(`${folder}/speak/speak (${i}).png`));
       }
       for (let i = loopEnd; i <= speakNum; i++) {
-        const image = new Image();
-        image.src = encodeURI(`${folder}/speak/speak (${i}).png`);
-        frames.value.speakEnd.push(image);
+        frames.value.speakEnd.push(makeImage(`${folder}/speak/speak (${i}).png`));
       }
     };
     const draw = (image) => {
@@ -602,20 +687,38 @@ const _sfc_main = {
       };
       allFrames.forEach((img) => {
         if (img.complete) {
+          if (!img.naturalWidth) img.__broken = true;
           checkLoaded();
         } else {
-          img.onload = checkLoaded;
-          img.onerror = checkLoaded;
+          img.onload = () => {
+            img.__broken = false;
+            checkLoaded();
+          };
+          img.onerror = () => {
+            img.__broken = true;
+            checkLoaded();
+          };
         }
       });
     };
     const init = () => {
       nextTick(() => {
+        var _a, _b;
         if (!containerRef.value || !canvasRef.value) return;
-        if (!props.humans || props.humans.length === 0) return;
-        if (!currentHuman.value) {
-          currentHuman.value = props.humans[0];
+        const rawInput = props.human;
+        if (!rawInput) return;
+        const human = resolveHuman(rawInput);
+        if (!human) return;
+        const prevType = (_a = currentHuman.value) == null ? void 0 : _a.humanType;
+        if (((_b = currentHuman.value) == null ? void 0 : _b.humanId) === human.humanId && prevType === human.humanType) {
+          Object.assign(currentHuman.value, human);
+          return;
         }
+        abortTTS();
+        stop();
+        timestamp.value = null;
+        frameIndex.value = 1;
+        currentHuman.value = human;
         const canvas = canvasRef.value;
         const dpr = window.devicePixelRatio || 1;
         const width = containerRef.value.clientWidth;
@@ -692,6 +795,7 @@ const _sfc_main = {
       return pcmToWavBlob(buf);
     };
     const requestTTSAudio = async (text, signal) => {
+      var _a;
       let lastError = null;
       for (let attempt = 1; attempt <= TTS_MAX_RETRIES; attempt++) {
         if (signal == null ? void 0 : signal.aborted) throw new DOMException("Aborted", "AbortError");
@@ -702,7 +806,7 @@ const _sfc_main = {
             clientid: VOICE_CLIENT_ID,
             "tenant-id": VOICE_TENANT_ID
           },
-          body: JSON.stringify({ text, user: TTS_USER, timbre: 47 }),
+          body: JSON.stringify({ text, user: TTS_USER, timbre: ((_a = currentHuman.value) == null ? void 0 : _a.timbre) ?? 1 }),
           signal
         });
         if (!res.ok) {
@@ -863,6 +967,27 @@ const _sfc_main = {
         });
       }
     };
+    watch(
+      () => [props.human],
+      () => {
+        init();
+      },
+      { deep: true }
+    );
+    const switchHuman = (humanId) => {
+      const next = resolveHuman(humanId);
+      if (!next) return;
+      abortTTS();
+      stop();
+      timestamp.value = null;
+      frameIndex.value = 1;
+      currentHuman.value = next;
+      loadFrames();
+      waitFramesLoaded(() => {
+        draw(frames.value.standby[0]);
+        emit("changed", currentHuman.value);
+      });
+    };
     __expose({
       standby,
       speak,
@@ -871,13 +996,9 @@ const _sfc_main = {
       resume,
       playTTS,
       startRecord,
-      stopRecord
+      stopRecord,
+      switchHuman
     });
-    watch(() => props.humans, (val) => {
-      if (val && val.length > 0 && !currentHuman.value) {
-        init();
-      }
-    }, { deep: true });
     onMounted(() => {
       initRecorder();
       init();
@@ -903,7 +1024,7 @@ const _sfc_main = {
     };
   }
 };
-const DigitalHuman = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-9379171c"]]);
+const DigitalHuman = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-eb00f641"]]);
 DigitalHuman.install = (app) => app.component("DigitalHuman", DigitalHuman);
 const components = [DemoButton, DemoInput, DigitalHuman];
 const install = (app) => {

package/dist/style.css

@@ -1 +1 @@
-.demo-btn[data-v-9a48516a]{padding:6px 14px;border-radius:4px;border:none;cursor:pointer;font-size:14px}.primary[data-v-9a48516a]{background:#409eff;color:#fff}.success[data-v-9a48516a]{background:#67c23a;color:#fff}.warning[data-v-9a48516a]{background:#e6a23c;color:#fff}.demo-input-wrap[data-v-28a3493c]{display:inline-flex;align-items:center;border:1px solid #dcdcdc;border-radius:4px;padding:0 10px}.demo-input-wrap[data-v-28a3493c]:focus-within{border-color:#409eff}.demo-input[data-v-28a3493c]{border:none;outline:none;padding:8px 6px;flex:1}.prefix[data-v-28a3493c],.suffix[data-v-28a3493c]{color:#909399}.digital-human[data-v-9379171c]{width:100%;height:100%;display:flex;align-items:center;justify-content:center}.digital-human canvas[data-v-9379171c]{max-width:100%;max-height:100%}
+.demo-btn[data-v-9a48516a]{padding:6px 14px;border-radius:4px;border:none;cursor:pointer;font-size:14px}.primary[data-v-9a48516a]{background:#409eff;color:#fff}.success[data-v-9a48516a]{background:#67c23a;color:#fff}.warning[data-v-9a48516a]{background:#e6a23c;color:#fff}.demo-input-wrap[data-v-28a3493c]{display:inline-flex;align-items:center;border:1px solid #dcdcdc;border-radius:4px;padding:0 10px}.demo-input-wrap[data-v-28a3493c]:focus-within{border-color:#409eff}.demo-input[data-v-28a3493c]{border:none;outline:none;padding:8px 6px;flex:1}.prefix[data-v-28a3493c],.suffix[data-v-28a3493c]{color:#909399}.digital-human[data-v-eb00f641]{width:100%;height:100%;display:flex;align-items:center;justify-content:center}.digital-human canvas[data-v-eb00f641]{max-width:100%;max-height:100%}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ruiyun-human",
-  "version": "1.0.13",
+  "version": "1.0.14",
   "type": "module",
   "description": "数字人初步实现",
   "main": "./dist/ruiyun-human.cjs.js",