From 8483babd10fcab571502950d9ebc43891e608e7a Mon Sep 17 00:00:00 2001
From: xuncha <1658671838@qq.com>
Date: Wed, 4 Feb 2026 21:54:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=9B=BE=E7=89=87=E8=A7=A3?=
 =?UTF-8?q?=E5=AF=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 electron/services/imageDecryptService.ts | 22 +++++++++++-----------
 package-lock.json                        |  4 ++--
 package.json                             |  5 +++--
 src/pages/ChatPage.tsx                   | 10 +++++-----
 4 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/electron/services/imageDecryptService.ts b/electron/services/imageDecryptService.ts
index ca02312..0618f58 100644
--- a/electron/services/imageDecryptService.ts
+++ b/electron/services/imageDecryptService.ts
@@ -11,7 +11,16 @@ import { wcdbService } from './wcdbService'
 // 获取 ffmpeg-static 的路径
 function getStaticFfmpegPath(): string | null {
   try {
-    // 方法1: 直接 require ffmpeg-static
+    // 优先处理打包后的路径
+    if (app.isPackaged) {
+      const resourcesPath = process.resourcesPath
+      const packedPath = join(resourcesPath, 'app.asar.unpacked', 'node_modules', 'ffmpeg-static', 'ffmpeg.exe')
+      if (existsSync(packedPath)) {
+        return packedPath
+      }
+    }
+
+    // 方法1: 直接 require ffmpeg-static（开发环境）
     // eslint-disable-next-line @typescript-eslint/no-var-requires
     const ffmpegStatic = require('ffmpeg-static')
 
@@ -19,21 +28,12 @@ function getStaticFfmpegPath(): string | null {
       return ffmpegStatic
     }
 
-    // 方法2: 手动构建路径（开发环境）
+    // 方法2: 手动构建路径（开发环境备用）
     const devPath = join(process.cwd(), 'node_modules', 'ffmpeg-static', 'ffmpeg.exe')
     if (existsSync(devPath)) {
       return devPath
     }
 
-    // 方法3: 打包后的路径
-    if (app.isPackaged) {
-      const resourcesPath = process.resourcesPath
-      const packedPath = join(resourcesPath, 'app.asar.unpacked', 'node_modules', 'ffmpeg-static', 'ffmpeg.exe')
-      if (existsSync(packedPath)) {
-        return packedPath
-      }
-    }
-
     return null
   } catch {
     return null
diff --git a/package-lock.json b/package-lock.json
index 921d2c5..ec2c90a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "weflow",
-  "version": "1.5.0",
+  "version": "1.5.2",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "weflow",
-      "version": "1.5.0",
+      "version": "1.5.2",
       "hasInstallScript": true,
       "dependencies": {
         "better-sqlite3": "^12.5.0",
diff --git a/package.json b/package.json
index b966d69..ec17f15 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "weflow",
-  "version": "1.5.0",
+  "version": "1.5.2",
   "description": "WeFlow",
   "main": "dist-electron/main.js",
   "author": "cc",
@@ -115,7 +115,8 @@
     ],
     "asarUnpack": [
       "node_modules/silk-wasm/**/*",
-      "node_modules/sherpa-onnx-node/**/*"
+      "node_modules/sherpa-onnx-node/**/*",
+      "node_modules/ffmpeg-static/**/*"
     ],
     "extraFiles": [
       {
diff --git a/src/pages/ChatPage.tsx b/src/pages/ChatPage.tsx
index ec80405..8d2ed72 100644
--- a/src/pages/ChatPage.tsx
+++ b/src/pages/ChatPage.tsx
@@ -1604,7 +1604,7 @@ function MessageBubble({ message, session, showTime, myAvatarUrl, isGroupChat, o
   // 视频相关状态
   const [videoLoading, setVideoLoading] = useState(false)
   const [videoInfo, setVideoInfo] = useState<{ videoUrl?: string; coverUrl?: string; thumbUrl?: string; exists: boolean } | null>(null)
-  const videoContainerRef = useRef<HTMLDivElement>(null)
+  const videoContainerRef = useRef<HTMLElement>(null)
   const [isVideoVisible, setIsVideoVisible] = useState(false)
   const [videoMd5, setVideoMd5] = useState<string | null>(null)
 
@@ -2359,7 +2359,7 @@ function MessageBubble({ message, session, showTime, myAvatarUrl, isGroupChat, o
       // 未进入可视区域时显示占位符
       if (!isVideoVisible) {
         return (
-          <div className="video-placeholder" ref={videoContainerRef}>
+          <div className="video-placeholder" ref={videoContainerRef as React.RefObject<HTMLDivElement>}>
             <svg width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2">
               <polygon points="23 7 16 12 23 17 23 7"></polygon>
               <rect x="1" y="5" width="15" height="14" rx="2" ry="2"></rect>
@@ -2371,7 +2371,7 @@ function MessageBubble({ message, session, showTime, myAvatarUrl, isGroupChat, o
       // 加载中
       if (videoLoading) {
         return (
-          <div className="video-loading" ref={videoContainerRef}>
+          <div className="video-loading" ref={videoContainerRef as React.RefObject<HTMLDivElement>}>
             <Loader2 size={20} className="spin" />
           </div>
         )
@@ -2382,7 +2382,7 @@ function MessageBubble({ message, session, showTime, myAvatarUrl, isGroupChat, o
         return (
           <button
             className={`video-unavailable ${videoClicked ? 'clicked' : ''}`}
-            ref={videoContainerRef}
+            ref={videoContainerRef as React.RefObject<HTMLButtonElement>}
             onClick={() => {
               setVideoClicked(true)
               setTimeout(() => setVideoClicked(false), 800)
@@ -2404,7 +2404,7 @@ function MessageBubble({ message, session, showTime, myAvatarUrl, isGroupChat, o
       // 默认显示缩略图，点击打开独立播放窗口
       const thumbSrc = videoInfo.thumbUrl || videoInfo.coverUrl
       return (
-        <div className="video-thumb-wrapper" ref={videoContainerRef} onClick={handlePlayVideo}>
+        <div className="video-thumb-wrapper" ref={videoContainerRef as React.RefObject<HTMLDivElement>} onClick={handlePlayVideo}>
           {thumbSrc ? (
             <img src={thumbSrc} alt="视频缩略图" className="video-thumb" />
           ) : (