Compare commits
21 Commits
90860bcf61
...
master
| Author | SHA1 | Date | |
|---|---|---|---|
| 6f7e24db63 | |||
| 7cb8cee70d | |||
| 9e31aee42d | |||
| 514fca6000 | |||
| 547085c819 | |||
| a8d7c03139 | |||
| 8f2ff558eb | |||
| 86e36aa677 | |||
| 2aac62b2bb | |||
| 9637bdd323 | |||
| 00b9200235 | |||
| e5a311fe3a | |||
| 25508b4c66 | |||
| d64b393145 | |||
| 61256e4acb | |||
| 77d788d7a5 | |||
| af5b975375 | |||
| 53ed155299 | |||
| 297c2a86fe | |||
| 39fa2a135a | |||
| 1ab77df85d |
@@ -1 +0,0 @@
|
|||||||
{"text":"hello","session_id":"e2e"}
|
|
||||||
31
.gitignore
vendored
31
.gitignore
vendored
@@ -3,10 +3,39 @@ target/
|
|||||||
*.swp
|
*.swp
|
||||||
*.swo
|
*.swo
|
||||||
*~
|
*~
|
||||||
|
extern/
|
||||||
|
|
||||||
# 模型文件不进 git,只保留下载链接在 model_manager.rs 清单里
|
# 模型文件不进 git,只保留下载链接在 model_manager.rs 清单里
|
||||||
model_download/
|
model_download/
|
||||||
model_store/
|
model_store/
|
||||||
# 测试脚本
|
|
||||||
|
# Live2D 模型文件不进 git(体积大,部署时单独下载到设备)
|
||||||
|
configs/live2d/
|
||||||
|
|
||||||
|
# 测试/临时脚本与请求体
|
||||||
.test_*.sh
|
.test_*.sh
|
||||||
.chat_req.json
|
.chat_req.json
|
||||||
|
.commit_msg.txt
|
||||||
|
|
||||||
|
# 截图与调试 dump(勿再提交到仓库根)
|
||||||
|
*.xwd
|
||||||
|
*.png
|
||||||
|
*.jpg
|
||||||
|
!docs/**/*.png
|
||||||
|
|
||||||
|
# Flutter / Android 构建产物
|
||||||
|
clients/flutter/build/
|
||||||
|
clients/flutter/.dart_tool/
|
||||||
|
clients/flutter/.flutter-plugins-dependencies
|
||||||
|
clients/flutter/android/.gradle/
|
||||||
|
clients/flutter/android/local.properties
|
||||||
|
clients/flutter/**/GeneratedPluginRegistrant.java
|
||||||
|
*.apk
|
||||||
|
*.aab
|
||||||
|
*.ipa
|
||||||
|
|
||||||
|
# 本机 IDE / OS
|
||||||
|
.DS_Store
|
||||||
|
.idea/
|
||||||
|
.vscode/
|
||||||
|
*.iml
|
||||||
|
|||||||
63
CLAUDE.md
63
CLAUDE.md
@@ -90,14 +90,17 @@ export PATH="/home/showen/.rustup/toolchains/stable-aarch64-unknown-linux-gnu/bi
|
|||||||
|
|
||||||
## 当前状态
|
## 当前状态
|
||||||
|
|
||||||
- **质量**: **147/147 已在 Linux ARM64 目标机验证**(2026-07-03 实跑:lib 105 + example 7 + m1_2_dynamic 15 + m1_2_http 12 + m1_2_service_manager 8);Flutter 15/15;零 warning。**注**:2026-07-04 新增 3 提交(README 修正 + P1 Shutdown fix + P2 清理)仅过类型检查,待目标机复验
|
> **功能成熟度权威清单见 `docs/STATUS.md`(2026-07-09 整理)**。此处只保留 CEO 一页摘要。
|
||||||
- **里程碑**: M1.1 完成,**M1.2 收尾完成**(147/147 两轮验收全绿、风险3 关闭、老板已提交 2a6e14b、设备已同步并复验零 warning),仅差老板打 tag(建议在 2a6e14b 上打 `m1.2`)
|
|
||||||
- **DevicePlugin 能力**: Display + SleepInhibit + Backlight + Cursor (Linux ARM64)
|
- **质量 (M1.2)**: **147/147 已在 Linux ARM64 目标机验证**(lib 105 + example 7 + m1_2_dynamic 15 + m1_2_http 12 + m1_2_service_manager 8);零 warning;2026-07-04 三提交亦已复验全绿
|
||||||
- **ScreenPlugin**: 已重构为 thin wrapper
|
- **里程碑**: M1.1 ✅ · M1.2 ✅(仅差老板打 tag `m1.2`)· **M2.1 🟡 半成品**
|
||||||
- **Flutter App**: 完成度 ~98%, APK v0.3 (52.6MB) 已编译, cupertino_icons 已修复
|
- **DevicePlugin**: Display + SleepInhibit + Backlight + Cursor (Linux ARM64)
|
||||||
- **API 文档**: 已校准(以 routes.rs 为唯一权威重写)
|
- **插件**: video / http / ble / wifi / device / screen / **live2d** / **ai**
|
||||||
- **示例插件**: 已完善为开发者参考模板 (manifest.json + 请求/响应示范 + 7 个测试)
|
- **Flutter App**: M1 控制能力可用;**M2.1 角色/对话/模型页已写代码、debug APK 已出(~146MB),真机验收未闭环** → 见 STATUS.md §3.3
|
||||||
- **M1.2 进展**: 目标机两轮验收完成(2026-07-03,147/147 零 warning,证据见 TEAM_CHAT.md);HTTP 路由测试实为 12 个(旧记录 9 有误)、lib 单测实为 105(旧记录 107 有误);剩余 commit+tag、风险3 补派核查
|
- **Web 控制端**: 已切到 `chat.html`/`chat.js`(角色/对话/模型入口有);非旧 WEB_UI 常量
|
||||||
|
- **BLE**: 广播注册已修(不可 LocalName + Includes 双设);设备 ActiveInstances=1 曾验证
|
||||||
|
- **AI**: 设备文字对话 API 实测可通;延迟/模型档位/失败体验仍需产品化
|
||||||
|
- **本机开发环境 (Mac)**: Flutter 3.44.5 + JDK17 + Android SDK36(`~/.showen_dev_env`)
|
||||||
|
|
||||||
### 已修复(本轮)
|
### 已修复(本轮)
|
||||||
|
|
||||||
@@ -148,26 +151,30 @@ export PATH="/home/showen/.rustup/toolchains/stable-aarch64-unknown-linux-gnu/bi
|
|||||||
|
|
||||||
7. **Spike 结论(2026-07-03 张明远实测,全表见 TEAM_CHAT.md)**:可行。设备实为 Radxa Cubie A7A(A733:2×A78@2.0G + 6×A55@1.8G)。推荐默认 **Qwen2.5-0.5B Q4**(16.4 t/s,50字回复 ~3.4s,RSS 985M);Gemma3-1B 可选档(8.2 t/s);**Gemma2-2B 本机不推荐**(RSS 3.25G 触发 swap)。硬约束:**推理必须 t=2 锁大核**(全核反而崩且挤死视频)、严禁默认上下文长度、部署脚本必须带镜像回退。ASR whisper tiny ~2.2s(需 VAD 防静音幻觉)、TTS piper RTF 0.3。端到端:串行热链 ~10s,**流式管线首音频 ~5s**(达标"可接受");≤3s 需 A733 的 NPU(Phase 2 路径)。现场保留 ~/ai_spike/ 3.5G 可复跑。
|
7. **Spike 结论(2026-07-03 张明远实测,全表见 TEAM_CHAT.md)**:可行。设备实为 Radxa Cubie A7A(A733:2×A78@2.0G + 6×A55@1.8G)。推荐默认 **Qwen2.5-0.5B Q4**(16.4 t/s,50字回复 ~3.4s,RSS 985M);Gemma3-1B 可选档(8.2 t/s);**Gemma2-2B 本机不推荐**(RSS 3.25G 触发 swap)。硬约束:**推理必须 t=2 锁大核**(全核反而崩且挤死视频)、严禁默认上下文长度、部署脚本必须带镜像回退。ASR whisper tiny ~2.2s(需 VAD 防静音幻觉)、TTS piper RTF 0.3。端到端:串行热链 ~10s,**流式管线首音频 ~5s**(达标"可接受");≤3s 需 A733 的 NPU(Phase 2 路径)。现场保留 ~/ai_spike/ 3.5G 可复跑。
|
||||||
|
|
||||||
✅ PRD 完成(docs/M2.1_PRD.md,三轮修订含老板三条补充)+ Spike 完成。进行中:架构设计(王思远)。素材依赖:数字人/歌姬内容包需视频素材,先用现有猫狗包验证切换机制。
|
✅ PRD(docs/M2.1_PRD.md)+ Spike + 后端 AI/模型/角色 API + Web 控制台重构 + App M2.1 页面骨架。
|
||||||
|
**诚实结论**:能演示链路 ≠ 产品完成。详见 `docs/STATUS.md`。
|
||||||
|
|
||||||
### 待处理
|
### 待处理(精简 · 2026-07-09)
|
||||||
|
|
||||||
1. **[M1.2 收尾]** ✅ commit(老板 2a6e14b)→ ✅ 设备同步至 2a6e14b + cargo check 零 warning(周雅婷 2026-07-03,设备仅剩本地调参文件 configs/dog_state_machine.json 一处差异);**仅剩:老板打 tag(建议在 2a6e14b 上打 `m1.2`)**
|
**P0 / M2.1 闭环**
|
||||||
2. ~~**[M1.2 收尾]** tests/m1_2_http.rs 过时注释更新~~ ✅ 赵雨薇完成(2026-07-03,纯注释改动,核实点位后订正为"六种 plugin_* 闭环,唯 check_updates 结果回传属 Phase 2");注意此改动在第二轮验收之后,commit 前设备端补一次 cargo check 即可
|
1. **工作区提交**:本机有未提交的 BLE 修复 + HTTP 对话修补 + Flutter M2.1 页(老板提交,不代办)
|
||||||
3. **[M1.2 收尾]** sanitize_filename 集成测试测的是逻辑复制而非产品函数,转正需产品侧小改动(改 pub 或 routes.rs 内加单测)— 赵雨薇上报
|
2. **设备代码对齐 + 回归**:同步后 `cargo check/test --workspace`
|
||||||
4. DevicePlugin 阶段三(framebuffer迁移/触摸/音频/多平台)— Phase 2 规划
|
3. **真机四旅程**:配网 → 角色切换 → 文字/语音对话 → 模型管理(App + Web)
|
||||||
5. **[设备遗留-代码]** 单实例保护(锁文件/socket 互斥)+ unclutter 僵尸子进程 reap — 派内核/视频工程师
|
4. **对话失败态产品化**:AI 未就绪/超时/缺模型时客户端明确提示
|
||||||
- ~~unclutter reap~~ ✅ 核查确认(2026-07-04):`linux_arm64.rs:238-254` shutdown() 已做 kill+wait+pkill 兜底,仅 SIGKILL 极端场景残留,不值得加 SIGCHLD handler
|
|
||||||
- **单实例保护**:未做。需目标机实测锁文件行为(Windows 开发环境无法验证),留给设备端工程师。背景:CLAUDE.md:136 记录的 3 实例 P0 已由赵雨薇移除多余自启入口修复,单实例锁是防御性双保险
|
**P1**
|
||||||
6. ~~**[设备遗留-系统]** 时钟慢约一年 + 磁盘 9x% 满~~ ✅ 全部解决(2026-07-03):时钟 — 王浩然修复(根因:timesyncd 出厂未启用 + RTC hym8563 掉电失效标志;已配 aliyun NTP 持久化 + hwclock 恢复,apt 复活,重启验证开机即正确;遗留:RTC 备份电池未验证,冷启动需联网自愈);磁盘 — 赵雨薇两轮清理 96%→35%(删 Flutter/Android/编辑器/kilo 等 ~16G)
|
5. App 对话历史本地持久化、release APK
|
||||||
7. **[环境]** 设备 SSH 已打通:`ssh -p 2222 showen@192.168.31.105` 免密(2026-07-02 配置),目标机验收可远程执行
|
6. 模型下载进度与错误重试 UX
|
||||||
8. ~~**[代码质量-P2]** Shutdown 消息无生产触发者:main.rs:117-120 Ctrl+C 只置 AtomicBool,主循环阻塞在 rx.recv(),需等下一条任意消息才真正退出(王浩然发现)~~ ✅ 修复(2026-07-04,提交 ab1dd91):三处改动 — run() recv()→recv_timeout(200ms);handle_manager_message Shutdown 分支置 self.running=false;main.rs Ctrl+C handler 注入 Message::Shutdown。效果:Ctrl+C 后最多 200ms 退出。**待目标机复验**
|
7. 数字人/歌姬素材(PRD 外部依赖)
|
||||||
9. ~~**[Phase 2 清理]** SDK 文档教开发者监听永不触发的 WifiProvisioned (plugin-sdk/src/lib.rs:522);CursorVisibility 有消费无生产(实际链路已走 DeviceCommand);check_updates 结果仅 println 不回传;DeviceResponse 广播后核心无人读、Error 静默~~ ✅ 部分完成(2026-07-04,提交 38dcd21):
|
|
||||||
- ✅ SDK 文档:broadcast 示例换成 StateChanged,新增 Phase 2 占位消息说明(WifiProvisioned/DeviceEvent/CursorVisibility)
|
**P2 / 收尾**
|
||||||
- ✅ check_updates 结果回传:通过 Custom { kind: "plugin_updates" } 广播
|
8. **[M1.2]** 老板打 tag `m1.2`
|
||||||
- ✅ DeviceResponse::Error 留痕:device/mod.rs handle_message 补 eprintln
|
9. sanitize_filename 测试转正;单实例保护;CursorVisibility 清理
|
||||||
- ⏳ CursorVisibility 变体:删除会破坏示例插件和测试,倾向 Phase 2 统一清理(保留现状)
|
10. DevicePlugin 阶段三(framebuffer/触摸/音频/多平台)— 更后
|
||||||
10. ~~**[待复验]** 2026-07-04 三提交(4d830c0 README / ab1dd91 P1 Shutdown fix / 38dcd21 P2 清理)仅过 rust-analyzer 类型检查,需在 Linux ARM64 目标机跑 `cargo check --workspace --all-targets && cargo test --workspace` 确认零 warning + 全测试通过~~ ✅ 目标机复验通过(2026-07-04):`cargo check` 零 warning;`cargo test --workspace` 147/147 全过(lib 105 + example 7 + m1_2_dynamic 15 + m1_2_http 12 + m1_2_service_manager 8);P1 Shutdown 修复实测:SIGINT 后 234ms 优雅退出(exit_code=0),修复前需等下一条消息可能永不退出
|
|
||||||
|
**环境**
|
||||||
|
- 设备:`ssh -p 2222 showen@192.168.31.105` · Web `http://192.168.31.105:5000/`
|
||||||
|
- 本机 Flutter:`source ~/.showen_dev_env`
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
@@ -228,12 +235,14 @@ export PATH="/home/showen/.rustup/toolchains/stable-aarch64-unknown-linux-gnu/bi
|
|||||||
|
|
||||||
| 需要做什么 | 读什么文件 |
|
| 需要做什么 | 读什么文件 |
|
||||||
|-----------|-----------|
|
|-----------|-----------|
|
||||||
|
| **功能成熟度 / 不完善清单** | **`docs/STATUS.md`** |
|
||||||
| CEO 深层经验和管理方法论 | `souls/chen-yifei.md` |
|
| CEO 深层经验和管理方法论 | `souls/chen-yifei.md` |
|
||||||
| 查看团队最新动态/沟通 | `.showen/TEAM_CHAT.md` |
|
| 查看团队最新动态/沟通 | `.showen/TEAM_CHAT.md` |
|
||||||
| 查看/修改公司详细规范 | `.showen/COMPANY_RULES.md` |
|
| 查看/修改公司详细规范 | `.showen/COMPANY_RULES.md` |
|
||||||
| 评估团队绩效/制度详情 | `docs/TEAM.md` |
|
| 评估团队绩效/制度详情 | `docs/TEAM.md` |
|
||||||
| 查看工作流程/审核标准 | `docs/WORKFLOW.md` |
|
| 查看工作流程/审核标准 | `docs/WORKFLOW.md` |
|
||||||
| 查看提交历史 | `PROGRESS.md` |
|
| 里程碑摘要 | `PROGRESS.md` |
|
||||||
|
| M2.1 产品需求 | `docs/M2.1_PRD.md` |
|
||||||
| 派发任务给 PM | `.showen/inbox/pm.md` |
|
| 派发任务给 PM | `.showen/inbox/pm.md` |
|
||||||
| 查看某成员详情 | `souls/<name>.md` |
|
| 查看某成员详情 | `souls/<name>.md` |
|
||||||
| 代码审核参考 | `docs/CODE_REVIEW.md` |
|
| 代码审核参考 | `docs/CODE_REVIEW.md` |
|
||||||
|
|||||||
115
Cargo.lock
generated
115
Cargo.lock
generated
@@ -41,6 +41,12 @@ version = "0.22.1"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
|
checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "bitflags"
|
||||||
|
version = "0.8.2"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "1370e9fc2a6ae53aea8b7a5110edbd08836ed87c88736dfabccade1c2b44bff4"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "bitflags"
|
name = "bitflags"
|
||||||
version = "2.11.0"
|
version = "2.11.0"
|
||||||
@@ -65,12 +71,24 @@ dependencies = [
|
|||||||
"objc2",
|
"objc2",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "bytemuck"
|
||||||
|
version = "1.25.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "c8efb64bd706a16a1bdde310ae86b351e4d21550d98d056f22f8a7f7a2183fec"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "byteorder"
|
name = "byteorder"
|
||||||
version = "1.5.0"
|
version = "1.5.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
|
checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "byteorder-lite"
|
||||||
|
version = "0.1.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "bytes"
|
name = "bytes"
|
||||||
version = "1.11.1"
|
version = "1.11.1"
|
||||||
@@ -203,7 +221,7 @@ version = "0.3.1"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "1e0e367e4e7da84520dedcac1901e4da967309406d1e51017ae1abfb97adbd38"
|
checksum = "1e0e367e4e7da84520dedcac1901e4da967309406d1e51017ae1abfb97adbd38"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"bitflags",
|
"bitflags 2.11.0",
|
||||||
"block2",
|
"block2",
|
||||||
"libc",
|
"libc",
|
||||||
"objc2",
|
"objc2",
|
||||||
@@ -251,6 +269,15 @@ dependencies = [
|
|||||||
"windows-sys 0.61.2",
|
"windows-sys 0.61.2",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "fdeflate"
|
||||||
|
version = "0.3.7"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "1e6853b52649d4ac5c0bd02320cddc5ba956bdb407c4b75a2c6b75bf51500f8c"
|
||||||
|
dependencies = [
|
||||||
|
"simd-adler32",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "filetime"
|
name = "filetime"
|
||||||
version = "0.2.27"
|
version = "0.2.27"
|
||||||
@@ -293,6 +320,28 @@ dependencies = [
|
|||||||
"percent-encoding",
|
"percent-encoding",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "freetype-rs"
|
||||||
|
version = "0.13.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "a1418e2a055fec8efe18c1a90a54b2cf5e649e583830dd4c71226c4e3bc920c6"
|
||||||
|
dependencies = [
|
||||||
|
"bitflags 0.8.2",
|
||||||
|
"freetype-sys",
|
||||||
|
"libc",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "freetype-sys"
|
||||||
|
version = "0.4.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "eccfb6d96cac99921f0c2142a91765f6c219868a2c45bdfe7d65a08775f18127"
|
||||||
|
dependencies = [
|
||||||
|
"libc",
|
||||||
|
"libz-sys",
|
||||||
|
"pkg-config",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "futures-channel"
|
name = "futures-channel"
|
||||||
version = "0.3.32"
|
version = "0.3.32"
|
||||||
@@ -604,6 +653,19 @@ dependencies = [
|
|||||||
"icu_properties",
|
"icu_properties",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "image"
|
||||||
|
version = "0.25.10"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "85ab80394333c02fe689eaf900ab500fbd0c2213da414687ebf995a65d5a6104"
|
||||||
|
dependencies = [
|
||||||
|
"bytemuck",
|
||||||
|
"byteorder-lite",
|
||||||
|
"moxcms",
|
||||||
|
"num-traits",
|
||||||
|
"png",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "indexmap"
|
name = "indexmap"
|
||||||
version = "2.13.0"
|
version = "2.13.0"
|
||||||
@@ -661,12 +723,24 @@ version = "0.1.14"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "1744e39d1d6a9948f4f388969627434e31128196de472883b39f148769bfe30a"
|
checksum = "1744e39d1d6a9948f4f388969627434e31128196de472883b39f148769bfe30a"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"bitflags",
|
"bitflags 2.11.0",
|
||||||
"libc",
|
"libc",
|
||||||
"plain",
|
"plain",
|
||||||
"redox_syscall",
|
"redox_syscall",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "libz-sys"
|
||||||
|
version = "1.1.29"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "85bc9657773828b90eeb625adff10eeac83cc21bbfd8e23a03eaa8a33c9e28d9"
|
||||||
|
dependencies = [
|
||||||
|
"cc",
|
||||||
|
"libc",
|
||||||
|
"pkg-config",
|
||||||
|
"vcpkg",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "linux-raw-sys"
|
name = "linux-raw-sys"
|
||||||
version = "0.12.1"
|
version = "0.12.1"
|
||||||
@@ -734,6 +808,16 @@ dependencies = [
|
|||||||
"windows-sys 0.61.2",
|
"windows-sys 0.61.2",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "moxcms"
|
||||||
|
version = "0.8.1"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "bb85c154ba489f01b25c0d36ae69a87e4a1c73a72631fc6c0eb6dde34a73e44b"
|
||||||
|
dependencies = [
|
||||||
|
"num-traits",
|
||||||
|
"pxfm",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "multer"
|
name = "multer"
|
||||||
version = "2.1.0"
|
version = "2.1.0"
|
||||||
@@ -758,7 +842,7 @@ version = "0.31.2"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "5d6d0705320c1e6ba1d912b5e37cf18071b6c2e9b7fa8215a1e8a7651966f5d3"
|
checksum = "5d6d0705320c1e6ba1d912b5e37cf18071b6c2e9b7fa8215a1e8a7651966f5d3"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"bitflags",
|
"bitflags 2.11.0",
|
||||||
"cfg-if",
|
"cfg-if",
|
||||||
"cfg_aliases",
|
"cfg_aliases",
|
||||||
"libc",
|
"libc",
|
||||||
@@ -874,6 +958,19 @@ version = "0.2.3"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6"
|
checksum = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "png"
|
||||||
|
version = "0.18.1"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "60769b8b31b2a9f263dae2776c37b1b28ae246943cf719eb6946a1db05128a61"
|
||||||
|
dependencies = [
|
||||||
|
"bitflags 2.11.0",
|
||||||
|
"crc32fast",
|
||||||
|
"fdeflate",
|
||||||
|
"flate2",
|
||||||
|
"miniz_oxide",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "potential_utf"
|
name = "potential_utf"
|
||||||
version = "0.1.4"
|
version = "0.1.4"
|
||||||
@@ -901,6 +998,12 @@ dependencies = [
|
|||||||
"unicode-ident",
|
"unicode-ident",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "pxfm"
|
||||||
|
version = "0.1.30"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "d55d956fa96f5ec02be2e13af0e20391a5aa83d6a074e3ad368959d0fab299ea"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "quote"
|
name = "quote"
|
||||||
version = "1.0.45"
|
version = "1.0.45"
|
||||||
@@ -952,7 +1055,7 @@ version = "0.7.3"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "6ce70a74e890531977d37e532c34d45e9055d2409ed08ddba14529471ed0be16"
|
checksum = "6ce70a74e890531977d37e532c34d45e9055d2409ed08ddba14529471ed0be16"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"bitflags",
|
"bitflags 2.11.0",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@@ -1004,7 +1107,7 @@ version = "1.1.4"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "b6fe4565b9518b83ef4f91bb47ce29620ca828bd32cb7e408f0062e9930ba190"
|
checksum = "b6fe4565b9518b83ef4f91bb47ce29620ca828bd32cb7e408f0062e9930ba190"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"bitflags",
|
"bitflags 2.11.0",
|
||||||
"errno",
|
"errno",
|
||||||
"libc",
|
"libc",
|
||||||
"linux-raw-sys",
|
"linux-raw-sys",
|
||||||
@@ -1163,7 +1266,9 @@ dependencies = [
|
|||||||
"dbus",
|
"dbus",
|
||||||
"dbus-crossroads",
|
"dbus-crossroads",
|
||||||
"flate2",
|
"flate2",
|
||||||
|
"freetype-rs",
|
||||||
"futures-util",
|
"futures-util",
|
||||||
|
"image",
|
||||||
"libloading",
|
"libloading",
|
||||||
"opencv",
|
"opencv",
|
||||||
"rand",
|
"rand",
|
||||||
|
|||||||
@@ -37,3 +37,8 @@ ureq = "2"
|
|||||||
flate2 = "1"
|
flate2 = "1"
|
||||||
tar = "0.4"
|
tar = "0.4"
|
||||||
semver = "1"
|
semver = "1"
|
||||||
|
|
||||||
|
# Live2D 渲染
|
||||||
|
image = { version = "0.25", default-features = false, features = ["png"] }
|
||||||
|
# 设备端字幕(中文光栅化,调用系统 FreeType 高级封装)
|
||||||
|
freetype-rs = "0.13"
|
||||||
|
|||||||
65
PROGRESS.md
65
PROGRESS.md
@@ -1,53 +1,44 @@
|
|||||||
# ShowenV2 — 项目进度
|
# ShowenV2 — 项目进度
|
||||||
|
|
||||||
> 当前状态和待办事项的权威来源是 `CLAUDE.md`。本文件保留里程碑摘要和最近变更。
|
> **功能成熟度看 `docs/STATUS.md`。**
|
||||||
> 完整提交历史见 `.showen/PROGRESS_ARCHIVE.md`。
|
> 派发/铁律/团队看 `CLAUDE.md`。
|
||||||
|
> 完整提交历史见 `.showen/PROGRESS_ARCHIVE.md`(若有)。
|
||||||
|
|
||||||
## 当前里程碑
|
## 当前里程碑
|
||||||
|
|
||||||
**M1.2 — 测试验收已通过,收尾中** 🔄
|
| 里程碑 | 状态 |
|
||||||
- 集成测试全部编写完毕(ServiceManager 8 + HTTP路由 12 + 动态插件 15 = 35 个)
|
|--------|------|
|
||||||
- 2026-07-03 目标机(Linux ARM64, 192.168.31.105)两轮验收:**147/147 全过、零 warning**(第一轮暴露 1 个测试前提错误 + 3 个 warning,返工后第二轮全绿,证据见 TEAM_CHAT.md)
|
| M1.1 | ✅ 完成 |
|
||||||
- 剩余:commit 返工测试文件 + 打 tag(待批准)+ 风险3 生产者核查(王浩然)
|
| M1.2 | ✅ 验收通过(147/147);仅差 tag `m1.2` |
|
||||||
|
| **M2.1 语音数字生命 V1** | 🟡 **半成品** — 后端/Web/App 有骨架,真机验收与体验未闭环 |
|
||||||
|
|
||||||
---
|
## M2.1 一句话
|
||||||
|
|
||||||
**M1.1 — 完成** ✅
|
本地 ASR→LLM→TTS,声音出在 **App/Web**,设备负责算力和画面;角色可切换,模型可管理。
|
||||||
- 30 个提交,Phase 1 骨架 + 功能迁移 + 动态插件 + DevicePlugin 阶段一/二
|
**现状**:API 与 UI 入口大致齐了,**不能宣称功能完善**(见 STATUS.md 缺口表)。
|
||||||
- 115/115 测试通过(107 核心 + 8 集成),零 warning(M1.1结束时77/77,M1.2期间增至115)
|
|
||||||
- DevicePlugin: Display + SleepInhibit + Backlight + Cursor (Linux ARM64)
|
|
||||||
- ScreenPlugin 重构为 thin wrapper
|
|
||||||
|
|
||||||
## 最近变更 (提交 26-30)
|
## 最近本机工作(未全部入库)
|
||||||
|
|
||||||
| # | 提交 | 内容 | 负责人 |
|
- BLE:修复 BlueZ `LocalName` + `Includes["local-name"]` 冲突;串行注册
|
||||||
|---|------|------|--------|
|
- HTTP:语音对话补 Live2D 说话态与 session;Web 补 `X-Session-Id`
|
||||||
| 26 | `48d1eeb` | plugin-sdk 同步 Device 类型 | 李思琪 |
|
- Flutter:角色 / 对话 / 模型三页 + debug APK(~146MB)
|
||||||
| 27 | `f060519` | DeviceCommand 添加 SetCursorVisible | 张明远 |
|
- 仓库整理:根目录截图/临时模型清除;运维脚本迁 `scripts/device/`;新增 `docs/STATUS.md`
|
||||||
| 28 | `5310a92` | LinuxArm64Backend 添加光标控制 | 赵雨薇 |
|
|
||||||
| 29 | `bf41c45` | ScreenPlugin 重构为 thin wrapper | 赵雨薇 |
|
|
||||||
| 30 | `be08c63` | 新增 4 个光标控制集成测试 | 李思琪 |
|
|
||||||
|
|
||||||
## 架构概览
|
## 架构概览
|
||||||
|
|
||||||
```
|
```
|
||||||
core/ (插件微内核)
|
core/ 插件微内核 · 消息 · 配置 · 动态插件
|
||||||
ServiceManager → 生命周期/消息路由/错误策略
|
plugins/ video · http · ble · wifi · device · screen · live2d · ai
|
||||||
Plugin trait → 统一插件接口
|
configs/ 角色内容包 JSON
|
||||||
Message enum → 类型安全消息 (Serialize/Deserialize)
|
clients/ flutter 安卓控制端
|
||||||
动态插件层 → FFI Loader / Runtime / Self-Test
|
scripts/device 设备运维脚本
|
||||||
|
docs/STATUS.md 功能成熟度板
|
||||||
plugins/ (一切皆插件)
|
|
||||||
video/ screen/ http/ ble/ wifi/ device/
|
|
||||||
(未来: render/ avatar/ vr/ ar/ voice/ ai/ singer/)
|
|
||||||
```
|
```
|
||||||
|
|
||||||
## 实机验证结果
|
## 实机锚点
|
||||||
|
|
||||||
| 验证项 | 结果 |
|
| 项 | 值 |
|
||||||
|--------|------|
|
|----|-----|
|
||||||
| `--validate` | 21 个视频路径全部有效 |
|
| 设备 | Radxa Cubie A7A · `192.168.31.105:2222` · showen |
|
||||||
| 插件初始化 | 5/5 正常 start |
|
| Web | `http://192.168.31.105:5000/` |
|
||||||
| HTTP API | `/api/status`、`/api/playlist` 正常 |
|
| 本机 APK | `clients/flutter/build/app/outputs/flutter-apk/app-debug.apk` |
|
||||||
| framebuffer | fb0 480x800 检测成功 |
|
|
||||||
| Release 编译 | 9.4MB ARM aarch64 |
|
|
||||||
|
|||||||
37
README.md
37
README.md
@@ -6,33 +6,20 @@
|
|||||||
|
|
||||||
```
|
```
|
||||||
ShowenV2/
|
ShowenV2/
|
||||||
|
├── CLAUDE.md / docs/STATUS.md # 管理手册 · 功能成熟度板
|
||||||
├── src/
|
├── src/
|
||||||
│ ├── core/ # 插件微内核
|
│ ├── core/ # 插件微内核(消息/配置/动态插件/版本)
|
||||||
│ │ ├── message.rs # 类型安全消息协议 (Serialize/Deserialize)
|
│ └── plugins/ # video · http · ble · wifi · device · screen · live2d · ai
|
||||||
│ │ ├── plugin.rs # Plugin trait 定义
|
├── configs/ # 角色内容包 JSON
|
||||||
│ │ ├── service_manager.rs # 生命周期管理 + 消息路由 + 错误策略
|
├── clients/flutter/ # 安卓控制 App(M1 遥控 + M2.1 对话骨架)
|
||||||
│ │ ├── config.rs # 配置解析/验证
|
├── scripts/device/ # 设备运维脚本
|
||||||
│ │ ├── dispatch.rs # 文本命令解析
|
├── plugin-sdk/ · plugins/ # 动态插件 SDK 与示例
|
||||||
│ │ ├── plugin_abi.rs # C FFI 类型 (动态插件边界)
|
├── tests/ # M1.2 集成测试
|
||||||
│ │ ├── dynamic_plugin.rs # DynamicPlugin (libloading)
|
└── docs/ # PRD / 测试计划 / STATUS
|
||||||
│ │ ├── plugin_loader.rs # plugin_store/ 扫描/加载
|
|
||||||
│ │ ├── version_manager.rs # 版本切换/回退/GC
|
|
||||||
│ │ └── plugin_repo.rs # 远程仓库 HTTP 客户端
|
|
||||||
│ └── plugins/ # 功能插件
|
|
||||||
│ ├── video/ # 视频播放引擎 (OpenCV)
|
|
||||||
│ ├── http/ # Web UI + REST API (warp)
|
|
||||||
│ ├── ble/ # BLE 配网 (D-Bus BlueZ)
|
|
||||||
│ ├── wifi/ # WiFi 管理 (nmcli)
|
|
||||||
│ ├── device/ # 设备能力 (Display/SleepInhibit/Backlight/Cursor)
|
|
||||||
│ └── screen/ # 屏幕管理 (thin wrapper,转发到 device)
|
|
||||||
├── plugin-sdk/ # 动态插件开发 SDK
|
|
||||||
├── plugins/
|
|
||||||
│ └── example-plugin/ # 示例动态插件 (cdylib)
|
|
||||||
├── configs/ # 配置文件 (状态机 JSON)
|
|
||||||
├── clients/ # 外部控制客户端应用
|
|
||||||
└── souls/ # 团队成员档案
|
|
||||||
```
|
```
|
||||||
|
|
||||||
|
**功能做到哪了**:请先读 [`docs/STATUS.md`](docs/STATUS.md),勿仅看提交日期。
|
||||||
|
|
||||||
## 技术栈
|
## 技术栈
|
||||||
|
|
||||||
- **语言**: Rust (edition 2021)
|
- **语言**: Rust (edition 2021)
|
||||||
@@ -47,7 +34,7 @@ ShowenV2/
|
|||||||
|
|
||||||
ShowenV2 支持两种插件模式:
|
ShowenV2 支持两种插件模式:
|
||||||
|
|
||||||
1. **静态插件** — 编译时链接,6 个内置插件 (video, http, ble, wifi, device, screen)
|
1. **静态插件** — 编译时链接(video, http, ble, wifi, device, screen, live2d, ai 等)
|
||||||
2. **动态插件** — 运行时加载 `.so` 文件,通过 `extern "C"` FFI + JSON 序列化通信
|
2. **动态插件** — 运行时加载 `.so` 文件,通过 `extern "C"` FFI + JSON 序列化通信
|
||||||
|
|
||||||
动态插件特性:
|
动态插件特性:
|
||||||
|
|||||||
@@ -7,6 +7,7 @@ plugins {
|
|||||||
android {
|
android {
|
||||||
namespace 'com.showen.flutter'
|
namespace 'com.showen.flutter'
|
||||||
compileSdk flutter.compileSdkVersion
|
compileSdk flutter.compileSdkVersion
|
||||||
|
ndkVersion = "28.2.13676358"
|
||||||
|
|
||||||
defaultConfig {
|
defaultConfig {
|
||||||
applicationId 'com.showen.flutter'
|
applicationId 'com.showen.flutter'
|
||||||
|
|||||||
@@ -8,6 +8,8 @@
|
|||||||
<uses-permission android:name="android.permission.BLUETOOTH_SCAN" />
|
<uses-permission android:name="android.permission.BLUETOOTH_SCAN" />
|
||||||
<uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
|
<uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
|
||||||
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
|
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
|
||||||
|
<uses-permission android:name="android.permission.RECORD_AUDIO" />
|
||||||
|
<uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
|
||||||
|
|
||||||
<application
|
<application
|
||||||
android:label="ShowenV2"
|
android:label="ShowenV2"
|
||||||
|
|||||||
@@ -15,11 +15,31 @@ import io.flutter.embedding.engine.FlutterEngine;
|
|||||||
public final class GeneratedPluginRegistrant {
|
public final class GeneratedPluginRegistrant {
|
||||||
private static final String TAG = "GeneratedPluginRegistrant";
|
private static final String TAG = "GeneratedPluginRegistrant";
|
||||||
public static void registerWith(@NonNull FlutterEngine flutterEngine) {
|
public static void registerWith(@NonNull FlutterEngine flutterEngine) {
|
||||||
|
try {
|
||||||
|
flutterEngine.getPlugins().add(new xyz.luan.audioplayers.AudioplayersPlugin());
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Error registering plugin audioplayers_android, xyz.luan.audioplayers.AudioplayersPlugin", e);
|
||||||
|
}
|
||||||
try {
|
try {
|
||||||
flutterEngine.getPlugins().add(new com.lib.flutter_blue_plus.FlutterBluePlusPlugin());
|
flutterEngine.getPlugins().add(new com.lib.flutter_blue_plus.FlutterBluePlusPlugin());
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
Log.e(TAG, "Error registering plugin flutter_blue_plus_android, com.lib.flutter_blue_plus.FlutterBluePlusPlugin", e);
|
Log.e(TAG, "Error registering plugin flutter_blue_plus_android, com.lib.flutter_blue_plus.FlutterBluePlusPlugin", e);
|
||||||
}
|
}
|
||||||
|
try {
|
||||||
|
flutterEngine.getPlugins().add(new com.github.dart_lang.jni.JniPlugin());
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Error registering plugin jni, com.github.dart_lang.jni.JniPlugin", e);
|
||||||
|
}
|
||||||
|
try {
|
||||||
|
flutterEngine.getPlugins().add(new com.github.dart_lang.jni_flutter.JniFlutterPlugin());
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Error registering plugin jni_flutter, com.github.dart_lang.jni_flutter.JniFlutterPlugin", e);
|
||||||
|
}
|
||||||
|
try {
|
||||||
|
flutterEngine.getPlugins().add(new com.llfbandit.record.RecordPlugin());
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Error registering plugin record_android, com.llfbandit.record.RecordPlugin", e);
|
||||||
|
}
|
||||||
try {
|
try {
|
||||||
flutterEngine.getPlugins().add(new io.flutter.plugins.sharedpreferences.SharedPreferencesPlugin());
|
flutterEngine.getPlugins().add(new io.flutter.plugins.sharedpreferences.SharedPreferencesPlugin());
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
|
|||||||
@@ -1,3 +1,7 @@
|
|||||||
org.gradle.jvmargs=-Xmx1536M -XX:MaxMetaspaceSize=512M -XX:+HeapDumpOnOutOfMemoryError
|
org.gradle.jvmargs=-Xmx1536M -XX:MaxMetaspaceSize=512M -XX:+HeapDumpOnOutOfMemoryError
|
||||||
android.useAndroidX=true
|
android.useAndroidX=true
|
||||||
android.enableJetifier=true
|
android.enableJetifier=true
|
||||||
|
# This builtInKotlin flag was added automatically by Flutter migrator
|
||||||
|
android.builtInKotlin=false
|
||||||
|
# This newDsl flag was added automatically by Flutter migrator
|
||||||
|
android.newDsl=false
|
||||||
|
|||||||
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
|
|||||||
distributionPath=wrapper/dists
|
distributionPath=wrapper/dists
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
zipStorePath=wrapper/dists
|
zipStorePath=wrapper/dists
|
||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip
|
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-all.zip
|
||||||
|
|||||||
@@ -21,8 +21,8 @@ pluginManagement {
|
|||||||
|
|
||||||
plugins {
|
plugins {
|
||||||
id 'dev.flutter.flutter-plugin-loader' version '1.0.0'
|
id 'dev.flutter.flutter-plugin-loader' version '1.0.0'
|
||||||
id 'com.android.application' version '8.3.2' apply false
|
id 'com.android.application' version '8.7.3' apply false
|
||||||
id 'org.jetbrains.kotlin.android' version '1.9.22' apply false
|
id 'org.jetbrains.kotlin.android' version '2.1.0' apply false
|
||||||
}
|
}
|
||||||
|
|
||||||
dependencyResolutionManagement {
|
dependencyResolutionManagement {
|
||||||
|
|||||||
@@ -2,15 +2,21 @@ import 'package:flutter/material.dart';
|
|||||||
import 'package:go_router/go_router.dart';
|
import 'package:go_router/go_router.dart';
|
||||||
import 'package:provider/provider.dart';
|
import 'package:provider/provider.dart';
|
||||||
|
|
||||||
|
import 'providers/character_provider.dart';
|
||||||
|
import 'providers/chat_provider.dart';
|
||||||
import 'providers/device_provider.dart';
|
import 'providers/device_provider.dart';
|
||||||
import 'providers/debug_provider.dart';
|
import 'providers/debug_provider.dart';
|
||||||
import 'providers/ble_provider.dart';
|
import 'providers/ble_provider.dart';
|
||||||
|
import 'providers/model_provider.dart';
|
||||||
import 'providers/player_provider.dart';
|
import 'providers/player_provider.dart';
|
||||||
import 'providers/wifi_provider.dart';
|
import 'providers/wifi_provider.dart';
|
||||||
import 'screens/app_shell.dart';
|
import 'screens/app_shell.dart';
|
||||||
import 'screens/ble_provision_screen.dart';
|
import 'screens/ble_provision_screen.dart';
|
||||||
|
import 'screens/characters_screen.dart';
|
||||||
|
import 'screens/chat_screen.dart';
|
||||||
import 'screens/debug_screen.dart';
|
import 'screens/debug_screen.dart';
|
||||||
import 'screens/home_screen.dart';
|
import 'screens/home_screen.dart';
|
||||||
|
import 'screens/models_screen.dart';
|
||||||
import 'screens/network_screen.dart';
|
import 'screens/network_screen.dart';
|
||||||
import 'screens/playback_screen.dart';
|
import 'screens/playback_screen.dart';
|
||||||
import 'screens/settings_screen.dart';
|
import 'screens/settings_screen.dart';
|
||||||
@@ -36,6 +42,7 @@ Future<void> main() async {
|
|||||||
runApp(
|
runApp(
|
||||||
MultiProvider(
|
MultiProvider(
|
||||||
providers: [
|
providers: [
|
||||||
|
Provider<HttpApiService>.value(value: httpApiService),
|
||||||
Provider<WebSocketService>.value(value: webSocketService),
|
Provider<WebSocketService>.value(value: webSocketService),
|
||||||
ChangeNotifierProvider<DebugProvider>(
|
ChangeNotifierProvider<DebugProvider>(
|
||||||
create: (_) => DebugProvider(webSocketService: webSocketService),
|
create: (_) => DebugProvider(webSocketService: webSocketService),
|
||||||
@@ -70,6 +77,24 @@ Future<void> main() async {
|
|||||||
debugProvider: context.read<DebugProvider>(),
|
debugProvider: context.read<DebugProvider>(),
|
||||||
)..bootstrap(),
|
)..bootstrap(),
|
||||||
),
|
),
|
||||||
|
ChangeNotifierProvider<CharacterProvider>(
|
||||||
|
create: (context) => CharacterProvider(
|
||||||
|
httpApiService: httpApiService,
|
||||||
|
debugProvider: context.read<DebugProvider>(),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
ChangeNotifierProvider<ChatProvider>(
|
||||||
|
create: (context) => ChatProvider(
|
||||||
|
httpApiService: httpApiService,
|
||||||
|
debugProvider: context.read<DebugProvider>(),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
ChangeNotifierProvider<ModelProvider>(
|
||||||
|
create: (context) => ModelProvider(
|
||||||
|
httpApiService: httpApiService,
|
||||||
|
debugProvider: context.read<DebugProvider>(),
|
||||||
|
),
|
||||||
|
),
|
||||||
],
|
],
|
||||||
child: const ShowenApp(),
|
child: const ShowenApp(),
|
||||||
),
|
),
|
||||||
@@ -95,18 +120,27 @@ final GoRouter _router = GoRouter(
|
|||||||
StatefulShellBranch(
|
StatefulShellBranch(
|
||||||
routes: [
|
routes: [
|
||||||
GoRoute(
|
GoRoute(
|
||||||
path: '/playback',
|
path: '/characters',
|
||||||
name: 'playback',
|
name: 'characters',
|
||||||
builder: (context, state) => const PlaybackScreen(),
|
builder: (context, state) => const CharactersScreen(),
|
||||||
),
|
),
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
StatefulShellBranch(
|
StatefulShellBranch(
|
||||||
routes: [
|
routes: [
|
||||||
GoRoute(
|
GoRoute(
|
||||||
path: '/trigger',
|
path: '/chat',
|
||||||
name: 'trigger',
|
name: 'chat',
|
||||||
builder: (context, state) => const TriggerScreen(),
|
builder: (context, state) => const ChatScreen(),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
StatefulShellBranch(
|
||||||
|
routes: [
|
||||||
|
GoRoute(
|
||||||
|
path: '/playback',
|
||||||
|
name: 'playback',
|
||||||
|
builder: (context, state) => const PlaybackScreen(),
|
||||||
),
|
),
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
@@ -132,15 +166,23 @@ final GoRouter _router = GoRouter(
|
|||||||
path: '/settings',
|
path: '/settings',
|
||||||
name: 'settings',
|
name: 'settings',
|
||||||
builder: (context, state) => const SettingsScreen(),
|
builder: (context, state) => const SettingsScreen(),
|
||||||
),
|
routes: [
|
||||||
],
|
GoRoute(
|
||||||
),
|
path: 'models',
|
||||||
StatefulShellBranch(
|
name: 'models',
|
||||||
routes: [
|
builder: (context, state) => const ModelsScreen(),
|
||||||
GoRoute(
|
),
|
||||||
path: '/debug',
|
GoRoute(
|
||||||
name: 'debug',
|
path: 'trigger',
|
||||||
builder: (context, state) => const DebugScreen(),
|
name: 'trigger',
|
||||||
|
builder: (context, state) => const TriggerScreen(),
|
||||||
|
),
|
||||||
|
GoRoute(
|
||||||
|
path: 'debug',
|
||||||
|
name: 'debug',
|
||||||
|
builder: (context, state) => const DebugScreen(),
|
||||||
|
),
|
||||||
|
],
|
||||||
),
|
),
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
|
|||||||
123
clients/flutter/lib/models/ai_model.dart
Normal file
123
clients/flutter/lib/models/ai_model.dart
Normal file
@@ -0,0 +1,123 @@
|
|||||||
|
class AiModelInfo {
|
||||||
|
const AiModelInfo({
|
||||||
|
required this.id,
|
||||||
|
required this.kind,
|
||||||
|
required this.name,
|
||||||
|
required this.version,
|
||||||
|
required this.size,
|
||||||
|
required this.memoryRequired,
|
||||||
|
required this.recommendedTier,
|
||||||
|
required this.downloaded,
|
||||||
|
required this.downloadProgress,
|
||||||
|
});
|
||||||
|
|
||||||
|
final String id;
|
||||||
|
final String kind;
|
||||||
|
final String name;
|
||||||
|
final String version;
|
||||||
|
final int size;
|
||||||
|
final int memoryRequired;
|
||||||
|
final String recommendedTier;
|
||||||
|
final bool downloaded;
|
||||||
|
final int downloadProgress;
|
||||||
|
|
||||||
|
String get kindLabel {
|
||||||
|
switch (kind.toLowerCase()) {
|
||||||
|
case 'llm':
|
||||||
|
return 'LLM';
|
||||||
|
case 'asr':
|
||||||
|
return 'ASR';
|
||||||
|
case 'tts':
|
||||||
|
return 'TTS';
|
||||||
|
default:
|
||||||
|
return kind.toUpperCase();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
String get sizeLabel => _formatBytes(size);
|
||||||
|
String get memoryLabel => _formatBytes(memoryRequired);
|
||||||
|
|
||||||
|
factory AiModelInfo.fromJson(Map<String, dynamic> json) {
|
||||||
|
return AiModelInfo(
|
||||||
|
id: json['id']?.toString() ?? '',
|
||||||
|
kind: json['kind']?.toString() ?? '',
|
||||||
|
name: json['name']?.toString() ?? json['id']?.toString() ?? '',
|
||||||
|
version: json['version']?.toString() ?? '',
|
||||||
|
size: _asInt(json['size']),
|
||||||
|
memoryRequired: _asInt(json['memory_required']),
|
||||||
|
recommendedTier: json['recommended_tier']?.toString() ?? '',
|
||||||
|
downloaded: json['downloaded'] == true,
|
||||||
|
downloadProgress: _asInt(json['download_progress']),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
static int _asInt(dynamic value) {
|
||||||
|
if (value is int) return value;
|
||||||
|
if (value is num) return value.toInt();
|
||||||
|
return int.tryParse(value?.toString() ?? '') ?? 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
static String _formatBytes(int bytes) {
|
||||||
|
if (bytes <= 0) return '0 B';
|
||||||
|
if (bytes < 1024) return '$bytes B';
|
||||||
|
if (bytes < 1024 * 1024) {
|
||||||
|
return '${(bytes / 1024).toStringAsFixed(1)} KB';
|
||||||
|
}
|
||||||
|
if (bytes < 1024 * 1024 * 1024) {
|
||||||
|
return '${(bytes / (1024 * 1024)).toStringAsFixed(1)} MB';
|
||||||
|
}
|
||||||
|
return '${(bytes / (1024 * 1024 * 1024)).toStringAsFixed(2)} GB';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
class ModelsSnapshot {
|
||||||
|
const ModelsSnapshot({
|
||||||
|
required this.models,
|
||||||
|
required this.active,
|
||||||
|
required this.usedSpace,
|
||||||
|
required this.quota,
|
||||||
|
});
|
||||||
|
|
||||||
|
final List<AiModelInfo> models;
|
||||||
|
final Map<String, String> active;
|
||||||
|
final int usedSpace;
|
||||||
|
final int quota;
|
||||||
|
|
||||||
|
String get usedLabel => AiModelInfo._formatBytes(usedSpace);
|
||||||
|
String get quotaLabel => AiModelInfo._formatBytes(quota);
|
||||||
|
double get usageRatio => quota <= 0 ? 0 : (usedSpace / quota).clamp(0.0, 1.0);
|
||||||
|
|
||||||
|
bool isActive(AiModelInfo model) {
|
||||||
|
final current = active[model.kind.toLowerCase()];
|
||||||
|
return current != null && current == model.id;
|
||||||
|
}
|
||||||
|
|
||||||
|
factory ModelsSnapshot.fromJson(Map<String, dynamic> json) {
|
||||||
|
final rawModels = json['models'];
|
||||||
|
final models = <AiModelInfo>[];
|
||||||
|
if (rawModels is List) {
|
||||||
|
for (final item in rawModels) {
|
||||||
|
if (item is Map<String, dynamic>) {
|
||||||
|
models.add(AiModelInfo.fromJson(item));
|
||||||
|
} else if (item is Map) {
|
||||||
|
models.add(AiModelInfo.fromJson(Map<String, dynamic>.from(item)));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
final active = <String, String>{};
|
||||||
|
final rawActive = json['active'];
|
||||||
|
if (rawActive is Map) {
|
||||||
|
rawActive.forEach((key, value) {
|
||||||
|
active[key.toString().toLowerCase()] = value.toString();
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
return ModelsSnapshot(
|
||||||
|
models: models,
|
||||||
|
active: active,
|
||||||
|
usedSpace: AiModelInfo._asInt(json['used_space']),
|
||||||
|
quota: AiModelInfo._asInt(json['quota']),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
92
clients/flutter/lib/models/character_pack.dart
Normal file
92
clients/flutter/lib/models/character_pack.dart
Normal file
@@ -0,0 +1,92 @@
|
|||||||
|
class CharacterPack {
|
||||||
|
const CharacterPack({
|
||||||
|
required this.filename,
|
||||||
|
required this.name,
|
||||||
|
required this.characterType,
|
||||||
|
required this.renderType,
|
||||||
|
this.live2dModel,
|
||||||
|
});
|
||||||
|
|
||||||
|
final String filename;
|
||||||
|
final String name;
|
||||||
|
final String characterType;
|
||||||
|
final String renderType;
|
||||||
|
final String? live2dModel;
|
||||||
|
|
||||||
|
bool get isLive2d => renderType.toLowerCase() == 'live2d';
|
||||||
|
|
||||||
|
String get typeLabel {
|
||||||
|
switch (characterType.toLowerCase()) {
|
||||||
|
case 'human':
|
||||||
|
return '数字人';
|
||||||
|
case 'singer':
|
||||||
|
return '歌姬';
|
||||||
|
case 'live2d':
|
||||||
|
return 'Live2D';
|
||||||
|
case 'pet':
|
||||||
|
default:
|
||||||
|
return '宠物';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
IconDataLike get iconHint {
|
||||||
|
switch (characterType.toLowerCase()) {
|
||||||
|
case 'human':
|
||||||
|
return IconDataLike.person;
|
||||||
|
case 'singer':
|
||||||
|
return IconDataLike.mic;
|
||||||
|
case 'live2d':
|
||||||
|
return IconDataLike.sparkle;
|
||||||
|
default:
|
||||||
|
return IconDataLike.pets;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
factory CharacterPack.fromJson(Map<String, dynamic> json) {
|
||||||
|
final character = json['character'];
|
||||||
|
final Map<String, dynamic> charMap = character is Map
|
||||||
|
? Map<String, dynamic>.from(character)
|
||||||
|
: const <String, dynamic>{};
|
||||||
|
final filename = json['filename']?.toString() ?? '';
|
||||||
|
return CharacterPack(
|
||||||
|
filename: filename,
|
||||||
|
name: charMap['name']?.toString().isNotEmpty == true
|
||||||
|
? charMap['name'].toString()
|
||||||
|
: filename,
|
||||||
|
characterType: charMap['character_type']?.toString() ?? 'pet',
|
||||||
|
renderType: charMap['render_type']?.toString() ?? 'video',
|
||||||
|
live2dModel: charMap['live2d_model']?.toString(),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Avoid importing Flutter material in pure model unit tests.
|
||||||
|
enum IconDataLike { pets, person, mic, sparkle }
|
||||||
|
|
||||||
|
class AvailableConfigs {
|
||||||
|
const AvailableConfigs({
|
||||||
|
required this.configs,
|
||||||
|
required this.active,
|
||||||
|
});
|
||||||
|
|
||||||
|
final List<CharacterPack> configs;
|
||||||
|
final String active;
|
||||||
|
|
||||||
|
factory AvailableConfigs.fromJson(Map<String, dynamic> json) {
|
||||||
|
final raw = json['configs'];
|
||||||
|
final list = <CharacterPack>[];
|
||||||
|
if (raw is List) {
|
||||||
|
for (final item in raw) {
|
||||||
|
if (item is Map<String, dynamic>) {
|
||||||
|
list.add(CharacterPack.fromJson(item));
|
||||||
|
} else if (item is Map) {
|
||||||
|
list.add(CharacterPack.fromJson(Map<String, dynamic>.from(item)));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return AvailableConfigs(
|
||||||
|
configs: list,
|
||||||
|
active: json['active']?.toString() ?? '',
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
45
clients/flutter/lib/models/chat_models.dart
Normal file
45
clients/flutter/lib/models/chat_models.dart
Normal file
@@ -0,0 +1,45 @@
|
|||||||
|
class ChatTurnResponse {
|
||||||
|
const ChatTurnResponse({
|
||||||
|
required this.sessionId,
|
||||||
|
required this.replyText,
|
||||||
|
this.transcription,
|
||||||
|
this.replyAudioPath,
|
||||||
|
this.error,
|
||||||
|
});
|
||||||
|
|
||||||
|
final String sessionId;
|
||||||
|
final String replyText;
|
||||||
|
final String? transcription;
|
||||||
|
final String? replyAudioPath;
|
||||||
|
final String? error;
|
||||||
|
|
||||||
|
bool get isOk => error == null || error!.isEmpty;
|
||||||
|
|
||||||
|
factory ChatTurnResponse.fromJson(Map<String, dynamic> json) {
|
||||||
|
return ChatTurnResponse(
|
||||||
|
sessionId: json['session_id']?.toString() ?? '',
|
||||||
|
replyText: json['reply_text']?.toString() ?? '',
|
||||||
|
transcription: json['transcription']?.toString(),
|
||||||
|
replyAudioPath: json['reply_audio_path']?.toString(),
|
||||||
|
error: json['error']?.toString(),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
enum ChatBubbleRole { user, assistant, system }
|
||||||
|
|
||||||
|
class ChatBubble {
|
||||||
|
ChatBubble({
|
||||||
|
required this.role,
|
||||||
|
required this.text,
|
||||||
|
this.audioPath,
|
||||||
|
this.isPending = false,
|
||||||
|
DateTime? createdAt,
|
||||||
|
}) : createdAt = createdAt ?? DateTime.now();
|
||||||
|
|
||||||
|
final ChatBubbleRole role;
|
||||||
|
String text;
|
||||||
|
String? audioPath;
|
||||||
|
bool isPending;
|
||||||
|
final DateTime createdAt;
|
||||||
|
}
|
||||||
83
clients/flutter/lib/providers/character_provider.dart
Normal file
83
clients/flutter/lib/providers/character_provider.dart
Normal file
@@ -0,0 +1,83 @@
|
|||||||
|
import 'package:flutter/foundation.dart';
|
||||||
|
|
||||||
|
import '../models/character_pack.dart';
|
||||||
|
import '../services/http_api_service.dart';
|
||||||
|
import 'debug_provider.dart';
|
||||||
|
|
||||||
|
class CharacterProvider extends ChangeNotifier {
|
||||||
|
CharacterProvider({
|
||||||
|
required HttpApiService httpApiService,
|
||||||
|
required DebugProvider debugProvider,
|
||||||
|
}) : _http = httpApiService,
|
||||||
|
_debug = debugProvider;
|
||||||
|
|
||||||
|
final HttpApiService _http;
|
||||||
|
final DebugProvider _debug;
|
||||||
|
|
||||||
|
List<CharacterPack> _packs = const [];
|
||||||
|
String _active = '';
|
||||||
|
bool _loading = false;
|
||||||
|
bool _switching = false;
|
||||||
|
String? _error;
|
||||||
|
|
||||||
|
List<CharacterPack> get packs => _packs;
|
||||||
|
String get activeFilename => _active;
|
||||||
|
bool get isLoading => _loading;
|
||||||
|
bool get isSwitching => _switching;
|
||||||
|
String? get error => _error;
|
||||||
|
|
||||||
|
CharacterPack? get activePack {
|
||||||
|
for (final pack in _packs) {
|
||||||
|
if (pack.filename == _active) return pack;
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
Future<void> refresh() async {
|
||||||
|
_loading = true;
|
||||||
|
_error = null;
|
||||||
|
notifyListeners();
|
||||||
|
try {
|
||||||
|
final snapshot = await _http.getAvailableCharacterConfigs();
|
||||||
|
_packs = snapshot.configs;
|
||||||
|
_active = snapshot.active;
|
||||||
|
_debug.addHttpLog(
|
||||||
|
'Loaded characters',
|
||||||
|
details: 'count=${_packs.length} active=$_active',
|
||||||
|
);
|
||||||
|
} catch (error) {
|
||||||
|
_error = error.toString();
|
||||||
|
_debug.addHttpLog('Load characters failed', details: _error);
|
||||||
|
} finally {
|
||||||
|
_loading = false;
|
||||||
|
notifyListeners();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Future<bool> switchTo(String filename) async {
|
||||||
|
if (_switching || filename == _active) return false;
|
||||||
|
_switching = true;
|
||||||
|
_error = null;
|
||||||
|
notifyListeners();
|
||||||
|
try {
|
||||||
|
final result = await _http.switchConfig(filename);
|
||||||
|
if (!result.isOk) {
|
||||||
|
_error = result.message;
|
||||||
|
_debug.addHttpLog('Switch character failed', details: result.message);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
_active = filename;
|
||||||
|
_debug.addHttpLog('Switched character', details: filename);
|
||||||
|
// 热重载后刷新列表,确保 active 与服务端一致
|
||||||
|
await refresh();
|
||||||
|
return true;
|
||||||
|
} catch (error) {
|
||||||
|
_error = error.toString();
|
||||||
|
_debug.addHttpLog('Switch character failed', details: _error);
|
||||||
|
return false;
|
||||||
|
} finally {
|
||||||
|
_switching = false;
|
||||||
|
notifyListeners();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
270
clients/flutter/lib/providers/chat_provider.dart
Normal file
270
clients/flutter/lib/providers/chat_provider.dart
Normal file
@@ -0,0 +1,270 @@
|
|||||||
|
import 'dart:async';
|
||||||
|
import 'dart:io';
|
||||||
|
|
||||||
|
import 'package:audioplayers/audioplayers.dart';
|
||||||
|
import 'package:flutter/foundation.dart';
|
||||||
|
import 'package:path_provider/path_provider.dart';
|
||||||
|
import 'package:record/record.dart';
|
||||||
|
|
||||||
|
import '../models/chat_models.dart';
|
||||||
|
import '../services/http_api_service.dart';
|
||||||
|
import 'debug_provider.dart';
|
||||||
|
|
||||||
|
class ChatProvider extends ChangeNotifier {
|
||||||
|
ChatProvider({
|
||||||
|
required HttpApiService httpApiService,
|
||||||
|
required DebugProvider debugProvider,
|
||||||
|
}) : _http = httpApiService,
|
||||||
|
_debug = debugProvider;
|
||||||
|
|
||||||
|
final HttpApiService _http;
|
||||||
|
final DebugProvider _debug;
|
||||||
|
final AudioRecorder _recorder = AudioRecorder();
|
||||||
|
final AudioPlayer _player = AudioPlayer();
|
||||||
|
|
||||||
|
final List<ChatBubble> _messages = <ChatBubble>[];
|
||||||
|
String _sessionId = 'app_${DateTime.now().millisecondsSinceEpoch}';
|
||||||
|
bool _busy = false;
|
||||||
|
bool _recording = false;
|
||||||
|
String? _error;
|
||||||
|
String? _status;
|
||||||
|
|
||||||
|
List<ChatBubble> get messages => List<ChatBubble>.unmodifiable(_messages);
|
||||||
|
bool get isBusy => _busy;
|
||||||
|
bool get isRecording => _recording;
|
||||||
|
String? get error => _error;
|
||||||
|
String? get status => _status;
|
||||||
|
String get sessionId => _sessionId;
|
||||||
|
|
||||||
|
void clearHistory() {
|
||||||
|
_messages.clear();
|
||||||
|
_sessionId = 'app_${DateTime.now().millisecondsSinceEpoch}';
|
||||||
|
_error = null;
|
||||||
|
_status = '已清空对话';
|
||||||
|
notifyListeners();
|
||||||
|
}
|
||||||
|
|
||||||
|
Future<void> sendText(String text) async {
|
||||||
|
final content = text.trim();
|
||||||
|
if (content.isEmpty || _busy) return;
|
||||||
|
|
||||||
|
_messages.add(ChatBubble(role: ChatBubbleRole.user, text: content));
|
||||||
|
final pending = ChatBubble(
|
||||||
|
role: ChatBubbleRole.assistant,
|
||||||
|
text: '思考中...',
|
||||||
|
isPending: true,
|
||||||
|
);
|
||||||
|
_messages.add(pending);
|
||||||
|
_busy = true;
|
||||||
|
_error = null;
|
||||||
|
_status = '角色思考中...';
|
||||||
|
notifyListeners();
|
||||||
|
|
||||||
|
try {
|
||||||
|
final response = await _http.chatText(
|
||||||
|
text: content,
|
||||||
|
sessionId: _sessionId,
|
||||||
|
);
|
||||||
|
await _applyResponse(pending, response);
|
||||||
|
} catch (error) {
|
||||||
|
pending
|
||||||
|
..isPending = false
|
||||||
|
..text = '请求失败: $error';
|
||||||
|
_error = error.toString();
|
||||||
|
_debug.addHttpLog('chatText failed', details: _error);
|
||||||
|
} finally {
|
||||||
|
_busy = false;
|
||||||
|
if (_status == '角色思考中...') {
|
||||||
|
_status = null;
|
||||||
|
}
|
||||||
|
notifyListeners();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Future<bool> startRecording() async {
|
||||||
|
if (_busy || _recording) return false;
|
||||||
|
try {
|
||||||
|
final hasPermission = await _recorder.hasPermission();
|
||||||
|
if (!hasPermission) {
|
||||||
|
_error = '需要麦克风权限才能语音对话';
|
||||||
|
_status = _error;
|
||||||
|
notifyListeners();
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
final dir = await getTemporaryDirectory();
|
||||||
|
final path =
|
||||||
|
'${dir.path}/showen_rec_${DateTime.now().millisecondsSinceEpoch}.wav';
|
||||||
|
await _recorder.start(
|
||||||
|
const RecordConfig(
|
||||||
|
encoder: AudioEncoder.wav,
|
||||||
|
sampleRate: 16000,
|
||||||
|
numChannels: 1,
|
||||||
|
),
|
||||||
|
path: path,
|
||||||
|
);
|
||||||
|
_recording = true;
|
||||||
|
_error = null;
|
||||||
|
_status = '正在录音... 松开发送';
|
||||||
|
_debug.addBleLog('Voice recording started');
|
||||||
|
notifyListeners();
|
||||||
|
return true;
|
||||||
|
} catch (error) {
|
||||||
|
_error = '无法开始录音: $error';
|
||||||
|
_status = _error;
|
||||||
|
_debug.addHttpLog('startRecording failed', details: _error);
|
||||||
|
notifyListeners();
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Future<void> cancelRecording() async {
|
||||||
|
if (!_recording) return;
|
||||||
|
try {
|
||||||
|
final path = await _recorder.stop();
|
||||||
|
if (path != null) {
|
||||||
|
final file = File(path);
|
||||||
|
if (await file.exists()) {
|
||||||
|
await file.delete();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} catch (_) {}
|
||||||
|
_recording = false;
|
||||||
|
_status = '已取消录音';
|
||||||
|
notifyListeners();
|
||||||
|
}
|
||||||
|
|
||||||
|
Future<void> stopRecordingAndSend() async {
|
||||||
|
if (!_recording || _busy) return;
|
||||||
|
_recording = false;
|
||||||
|
_status = '正在识别...';
|
||||||
|
notifyListeners();
|
||||||
|
|
||||||
|
String? path;
|
||||||
|
try {
|
||||||
|
path = await _recorder.stop();
|
||||||
|
} catch (error) {
|
||||||
|
_error = '停止录音失败: $error';
|
||||||
|
_status = _error;
|
||||||
|
notifyListeners();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (path == null) {
|
||||||
|
_error = '没有录到音频';
|
||||||
|
_status = _error;
|
||||||
|
notifyListeners();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
final file = File(path);
|
||||||
|
if (!await file.exists()) {
|
||||||
|
_error = '录音文件不存在';
|
||||||
|
_status = _error;
|
||||||
|
notifyListeners();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
final bytes = await file.readAsBytes();
|
||||||
|
try {
|
||||||
|
await file.delete();
|
||||||
|
} catch (_) {}
|
||||||
|
|
||||||
|
if (bytes.length < 1000) {
|
||||||
|
_error = '录音太短,请按住再说一会儿';
|
||||||
|
_status = _error;
|
||||||
|
notifyListeners();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
_messages.add(
|
||||||
|
ChatBubble(role: ChatBubbleRole.user, text: '🎤 语音消息'),
|
||||||
|
);
|
||||||
|
final pending = ChatBubble(
|
||||||
|
role: ChatBubbleRole.assistant,
|
||||||
|
text: '思考中...',
|
||||||
|
isPending: true,
|
||||||
|
);
|
||||||
|
_messages.add(pending);
|
||||||
|
_busy = true;
|
||||||
|
_status = '角色思考中...';
|
||||||
|
notifyListeners();
|
||||||
|
|
||||||
|
try {
|
||||||
|
final response = await _http.chatAudio(
|
||||||
|
bytes: bytes,
|
||||||
|
format: 'wav',
|
||||||
|
sessionId: _sessionId,
|
||||||
|
);
|
||||||
|
if (response.transcription != null &&
|
||||||
|
response.transcription!.trim().isNotEmpty) {
|
||||||
|
// 回填用户气泡为转写文本
|
||||||
|
for (var i = _messages.length - 1; i >= 0; i--) {
|
||||||
|
if (_messages[i].role == ChatBubbleRole.user) {
|
||||||
|
_messages[i].text = response.transcription!;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
await _applyResponse(pending, response);
|
||||||
|
} catch (error) {
|
||||||
|
pending
|
||||||
|
..isPending = false
|
||||||
|
..text = '语音对话失败: $error';
|
||||||
|
_error = error.toString();
|
||||||
|
_debug.addHttpLog('chatAudio failed', details: _error);
|
||||||
|
} finally {
|
||||||
|
_busy = false;
|
||||||
|
if (_status == '角色思考中...') {
|
||||||
|
_status = null;
|
||||||
|
}
|
||||||
|
notifyListeners();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Future<void> _applyResponse(
|
||||||
|
ChatBubble pending,
|
||||||
|
ChatTurnResponse response,
|
||||||
|
) async {
|
||||||
|
pending.isPending = false;
|
||||||
|
if (!response.isOk) {
|
||||||
|
pending.text = response.error ?? '对话失败';
|
||||||
|
_error = pending.text;
|
||||||
|
_status = pending.text;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (response.sessionId.isNotEmpty) {
|
||||||
|
_sessionId = response.sessionId;
|
||||||
|
}
|
||||||
|
pending.text = response.replyText.isEmpty ? '(空回复)' : response.replyText;
|
||||||
|
pending.audioPath = response.replyAudioPath;
|
||||||
|
_status = '已回复';
|
||||||
|
_debug.addHttpLog(
|
||||||
|
'chat ok',
|
||||||
|
details: 'chars=${pending.text.length} audio=${pending.audioPath != null}',
|
||||||
|
);
|
||||||
|
if (pending.audioPath != null && pending.audioPath!.isNotEmpty) {
|
||||||
|
unawaited(playReply(pending.audioPath!));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Future<void> playReply(String absolutePath) async {
|
||||||
|
try {
|
||||||
|
final url = _http.chatAudioFileUrl(absolutePath);
|
||||||
|
await _player.stop();
|
||||||
|
await _player.play(UrlSource(url));
|
||||||
|
_status = '正在播放回复...';
|
||||||
|
notifyListeners();
|
||||||
|
} catch (error) {
|
||||||
|
_error = '播放失败: $error';
|
||||||
|
_debug.addHttpLog('playReply failed', details: _error);
|
||||||
|
notifyListeners();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
void dispose() {
|
||||||
|
unawaited(_recorder.dispose());
|
||||||
|
unawaited(_player.dispose());
|
||||||
|
super.dispose();
|
||||||
|
}
|
||||||
|
}
|
||||||
116
clients/flutter/lib/providers/model_provider.dart
Normal file
116
clients/flutter/lib/providers/model_provider.dart
Normal file
@@ -0,0 +1,116 @@
|
|||||||
|
import 'dart:async';
|
||||||
|
|
||||||
|
import 'package:flutter/foundation.dart';
|
||||||
|
|
||||||
|
import '../models/ai_model.dart';
|
||||||
|
import '../models/api_response.dart';
|
||||||
|
import '../services/http_api_service.dart';
|
||||||
|
import 'debug_provider.dart';
|
||||||
|
|
||||||
|
class ModelProvider extends ChangeNotifier {
|
||||||
|
ModelProvider({
|
||||||
|
required HttpApiService httpApiService,
|
||||||
|
required DebugProvider debugProvider,
|
||||||
|
}) : _http = httpApiService,
|
||||||
|
_debug = debugProvider;
|
||||||
|
|
||||||
|
final HttpApiService _http;
|
||||||
|
final DebugProvider _debug;
|
||||||
|
|
||||||
|
ModelsSnapshot? _snapshot;
|
||||||
|
bool _loading = false;
|
||||||
|
bool _acting = false;
|
||||||
|
String? _error;
|
||||||
|
String? _status;
|
||||||
|
Timer? _pollTimer;
|
||||||
|
|
||||||
|
ModelsSnapshot? get snapshot => _snapshot;
|
||||||
|
bool get isLoading => _loading;
|
||||||
|
bool get isActing => _acting;
|
||||||
|
String? get error => _error;
|
||||||
|
String? get status => _status;
|
||||||
|
|
||||||
|
Future<void> refresh() async {
|
||||||
|
_loading = true;
|
||||||
|
_error = null;
|
||||||
|
notifyListeners();
|
||||||
|
try {
|
||||||
|
_snapshot = await _http.getModels();
|
||||||
|
_debug.addHttpLog(
|
||||||
|
'Loaded models',
|
||||||
|
details: 'count=${_snapshot?.models.length ?? 0}',
|
||||||
|
);
|
||||||
|
} catch (error) {
|
||||||
|
_error = error.toString();
|
||||||
|
_debug.addHttpLog('Load models failed', details: _error);
|
||||||
|
} finally {
|
||||||
|
_loading = false;
|
||||||
|
notifyListeners();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Future<void> download(String modelId) async {
|
||||||
|
await _runAction(() => _http.downloadModel(modelId), '下载已启动: $modelId');
|
||||||
|
_startPolling();
|
||||||
|
}
|
||||||
|
|
||||||
|
Future<void> switchTo({required String modelId, required String kind}) async {
|
||||||
|
await _runAction(
|
||||||
|
() => _http.switchModel(modelId: modelId, kind: kind),
|
||||||
|
'已切换: $modelId',
|
||||||
|
);
|
||||||
|
await refresh();
|
||||||
|
}
|
||||||
|
|
||||||
|
Future<void> delete(String modelId) async {
|
||||||
|
await _runAction(() => _http.deleteModel(modelId), '已删除: $modelId');
|
||||||
|
await refresh();
|
||||||
|
}
|
||||||
|
|
||||||
|
Future<void> _runAction(
|
||||||
|
Future<ApiResponse> Function() action,
|
||||||
|
String okStatus,
|
||||||
|
) async {
|
||||||
|
if (_acting) return;
|
||||||
|
_acting = true;
|
||||||
|
_error = null;
|
||||||
|
notifyListeners();
|
||||||
|
try {
|
||||||
|
final result = await action();
|
||||||
|
_status = result.message.isNotEmpty ? result.message : okStatus;
|
||||||
|
if (!result.isOk) {
|
||||||
|
_error = _status;
|
||||||
|
}
|
||||||
|
_debug.addHttpLog('Model action ok', details: _status);
|
||||||
|
} catch (error) {
|
||||||
|
_error = error.toString();
|
||||||
|
_status = _error;
|
||||||
|
_debug.addHttpLog('Model action failed', details: _error);
|
||||||
|
} finally {
|
||||||
|
_acting = false;
|
||||||
|
notifyListeners();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void _startPolling() {
|
||||||
|
_pollTimer?.cancel();
|
||||||
|
var ticks = 0;
|
||||||
|
_pollTimer = Timer.periodic(const Duration(seconds: 2), (timer) async {
|
||||||
|
ticks += 1;
|
||||||
|
await refresh();
|
||||||
|
final downloading = _snapshot?.models.any(
|
||||||
|
(m) => m.downloadProgress > 0 && m.downloadProgress < 100 && !m.downloaded,
|
||||||
|
) ??
|
||||||
|
false;
|
||||||
|
if (!downloading || ticks > 90) {
|
||||||
|
timer.cancel();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
void dispose() {
|
||||||
|
_pollTimer?.cancel();
|
||||||
|
super.dispose();
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -31,16 +31,21 @@ class AppShell extends StatelessWidget {
|
|||||||
selectedIcon: Icon(Icons.home),
|
selectedIcon: Icon(Icons.home),
|
||||||
label: '首页',
|
label: '首页',
|
||||||
),
|
),
|
||||||
|
NavigationDestination(
|
||||||
|
icon: Icon(Icons.face_outlined),
|
||||||
|
selectedIcon: Icon(Icons.face),
|
||||||
|
label: '角色',
|
||||||
|
),
|
||||||
|
NavigationDestination(
|
||||||
|
icon: Icon(Icons.chat_bubble_outline),
|
||||||
|
selectedIcon: Icon(Icons.chat_bubble),
|
||||||
|
label: '对话',
|
||||||
|
),
|
||||||
NavigationDestination(
|
NavigationDestination(
|
||||||
icon: Icon(Icons.play_circle_outline),
|
icon: Icon(Icons.play_circle_outline),
|
||||||
selectedIcon: Icon(Icons.play_circle),
|
selectedIcon: Icon(Icons.play_circle),
|
||||||
label: '播放',
|
label: '播放',
|
||||||
),
|
),
|
||||||
NavigationDestination(
|
|
||||||
icon: Icon(Icons.bolt_outlined),
|
|
||||||
selectedIcon: Icon(Icons.bolt),
|
|
||||||
label: '触发',
|
|
||||||
),
|
|
||||||
NavigationDestination(
|
NavigationDestination(
|
||||||
icon: Icon(Icons.wifi_outlined),
|
icon: Icon(Icons.wifi_outlined),
|
||||||
selectedIcon: Icon(Icons.wifi),
|
selectedIcon: Icon(Icons.wifi),
|
||||||
@@ -51,11 +56,6 @@ class AppShell extends StatelessWidget {
|
|||||||
selectedIcon: Icon(Icons.settings),
|
selectedIcon: Icon(Icons.settings),
|
||||||
label: '设置',
|
label: '设置',
|
||||||
),
|
),
|
||||||
NavigationDestination(
|
|
||||||
icon: Icon(Icons.bug_report_outlined),
|
|
||||||
selectedIcon: Icon(Icons.bug_report),
|
|
||||||
label: '调试',
|
|
||||||
),
|
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
|
|||||||
202
clients/flutter/lib/screens/characters_screen.dart
Normal file
202
clients/flutter/lib/screens/characters_screen.dart
Normal file
@@ -0,0 +1,202 @@
|
|||||||
|
import 'package:flutter/material.dart';
|
||||||
|
import 'package:provider/provider.dart';
|
||||||
|
|
||||||
|
import '../models/character_pack.dart';
|
||||||
|
import '../providers/character_provider.dart';
|
||||||
|
import '../providers/chat_provider.dart';
|
||||||
|
import '../theme/app_colors.dart';
|
||||||
|
|
||||||
|
class CharactersScreen extends StatefulWidget {
|
||||||
|
const CharactersScreen({super.key});
|
||||||
|
|
||||||
|
@override
|
||||||
|
State<CharactersScreen> createState() => _CharactersScreenState();
|
||||||
|
}
|
||||||
|
|
||||||
|
class _CharactersScreenState extends State<CharactersScreen> {
|
||||||
|
@override
|
||||||
|
void initState() {
|
||||||
|
super.initState();
|
||||||
|
WidgetsBinding.instance.addPostFrameCallback((_) {
|
||||||
|
context.read<CharacterProvider>().refresh();
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
IconData _iconFor(CharacterPack pack) {
|
||||||
|
switch (pack.iconHint) {
|
||||||
|
case IconDataLike.person:
|
||||||
|
return Icons.person_rounded;
|
||||||
|
case IconDataLike.mic:
|
||||||
|
return Icons.mic_rounded;
|
||||||
|
case IconDataLike.sparkle:
|
||||||
|
return Icons.auto_awesome_rounded;
|
||||||
|
case IconDataLike.pets:
|
||||||
|
return Icons.pets_rounded;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
Widget build(BuildContext context) {
|
||||||
|
final provider = context.watch<CharacterProvider>();
|
||||||
|
|
||||||
|
return Scaffold(
|
||||||
|
appBar: AppBar(
|
||||||
|
title: const Text('角色'),
|
||||||
|
actions: [
|
||||||
|
IconButton(
|
||||||
|
onPressed: provider.isLoading ? null : () => provider.refresh(),
|
||||||
|
icon: const Icon(Icons.refresh_rounded),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
body: RefreshIndicator(
|
||||||
|
onRefresh: provider.refresh,
|
||||||
|
child: ListView(
|
||||||
|
padding: const EdgeInsets.all(AppSpacing.md),
|
||||||
|
children: [
|
||||||
|
if (provider.error != null)
|
||||||
|
Padding(
|
||||||
|
padding: const EdgeInsets.only(bottom: AppSpacing.md),
|
||||||
|
child: Text(
|
||||||
|
provider.error!,
|
||||||
|
style: const TextStyle(color: AppColors.error),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
Text(
|
||||||
|
'选择角色内容包,设备画面与对话人设会同步切换。',
|
||||||
|
style: Theme.of(context).textTheme.bodyMedium?.copyWith(
|
||||||
|
color: AppColors.textSecondary,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
const SizedBox(height: AppSpacing.md),
|
||||||
|
if (provider.isLoading && provider.packs.isEmpty)
|
||||||
|
const Padding(
|
||||||
|
padding: EdgeInsets.only(top: 48),
|
||||||
|
child: Center(child: CircularProgressIndicator()),
|
||||||
|
)
|
||||||
|
else if (provider.packs.isEmpty)
|
||||||
|
const Padding(
|
||||||
|
padding: EdgeInsets.only(top: 48),
|
||||||
|
child: Center(child: Text('暂无角色配置包')),
|
||||||
|
)
|
||||||
|
else
|
||||||
|
...provider.packs.map((pack) {
|
||||||
|
final active = pack.filename == provider.activeFilename;
|
||||||
|
return Card(
|
||||||
|
margin: const EdgeInsets.only(bottom: AppSpacing.md),
|
||||||
|
child: InkWell(
|
||||||
|
borderRadius: BorderRadius.circular(AppRadius.large),
|
||||||
|
onTap: provider.isSwitching || active
|
||||||
|
? null
|
||||||
|
: () async {
|
||||||
|
final ok = await provider.switchTo(pack.filename);
|
||||||
|
if (!context.mounted) return;
|
||||||
|
if (ok) {
|
||||||
|
// 切换角色清空对话上下文(PRD §2.4)
|
||||||
|
context.read<ChatProvider>().clearHistory();
|
||||||
|
}
|
||||||
|
ScaffoldMessenger.of(context).showSnackBar(
|
||||||
|
SnackBar(
|
||||||
|
content: Text(
|
||||||
|
ok
|
||||||
|
? '已切换到 ${pack.name}'
|
||||||
|
: (provider.error ?? '切换失败'),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
},
|
||||||
|
child: Padding(
|
||||||
|
padding: const EdgeInsets.all(AppSpacing.md),
|
||||||
|
child: Row(
|
||||||
|
children: [
|
||||||
|
CircleAvatar(
|
||||||
|
radius: 28,
|
||||||
|
backgroundColor: active
|
||||||
|
? AppColors.primary.withValues(alpha: 0.2)
|
||||||
|
: AppColors.background,
|
||||||
|
child: Icon(
|
||||||
|
_iconFor(pack),
|
||||||
|
color: active
|
||||||
|
? AppColors.primary
|
||||||
|
: AppColors.textSecondary,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
const SizedBox(width: AppSpacing.md),
|
||||||
|
Expanded(
|
||||||
|
child: Column(
|
||||||
|
crossAxisAlignment: CrossAxisAlignment.start,
|
||||||
|
children: [
|
||||||
|
Row(
|
||||||
|
children: [
|
||||||
|
Flexible(
|
||||||
|
child: Text(
|
||||||
|
pack.name,
|
||||||
|
style: Theme.of(context)
|
||||||
|
.textTheme
|
||||||
|
.titleMedium,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
if (active) ...[
|
||||||
|
const SizedBox(width: 8),
|
||||||
|
Container(
|
||||||
|
padding: const EdgeInsets.symmetric(
|
||||||
|
horizontal: 8,
|
||||||
|
vertical: 2,
|
||||||
|
),
|
||||||
|
decoration: BoxDecoration(
|
||||||
|
color: AppColors.success
|
||||||
|
.withValues(alpha: 0.15),
|
||||||
|
borderRadius:
|
||||||
|
BorderRadius.circular(999),
|
||||||
|
),
|
||||||
|
child: const Text(
|
||||||
|
'使用中',
|
||||||
|
style: TextStyle(
|
||||||
|
color: AppColors.success,
|
||||||
|
fontSize: 12,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
],
|
||||||
|
),
|
||||||
|
const SizedBox(height: 4),
|
||||||
|
Text(
|
||||||
|
'${pack.typeLabel} · ${pack.renderType} · ${pack.filename}',
|
||||||
|
style: Theme.of(context)
|
||||||
|
.textTheme
|
||||||
|
.bodySmall
|
||||||
|
?.copyWith(
|
||||||
|
color: AppColors.textSecondary,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
if (provider.isSwitching && !active)
|
||||||
|
const SizedBox(
|
||||||
|
width: 20,
|
||||||
|
height: 20,
|
||||||
|
child: CircularProgressIndicator(strokeWidth: 2),
|
||||||
|
)
|
||||||
|
else
|
||||||
|
Icon(
|
||||||
|
active
|
||||||
|
? Icons.check_circle_rounded
|
||||||
|
: Icons.chevron_right_rounded,
|
||||||
|
color: active
|
||||||
|
? AppColors.success
|
||||||
|
: AppColors.textSecondary,
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
232
clients/flutter/lib/screens/chat_screen.dart
Normal file
232
clients/flutter/lib/screens/chat_screen.dart
Normal file
@@ -0,0 +1,232 @@
|
|||||||
|
import 'package:flutter/material.dart';
|
||||||
|
import 'package:provider/provider.dart';
|
||||||
|
|
||||||
|
import '../models/chat_models.dart';
|
||||||
|
import '../providers/character_provider.dart';
|
||||||
|
import '../providers/chat_provider.dart';
|
||||||
|
import '../theme/app_colors.dart';
|
||||||
|
|
||||||
|
class ChatScreen extends StatefulWidget {
|
||||||
|
const ChatScreen({super.key});
|
||||||
|
|
||||||
|
@override
|
||||||
|
State<ChatScreen> createState() => _ChatScreenState();
|
||||||
|
}
|
||||||
|
|
||||||
|
class _ChatScreenState extends State<ChatScreen> {
|
||||||
|
final TextEditingController _controller = TextEditingController();
|
||||||
|
final ScrollController _scrollController = ScrollController();
|
||||||
|
|
||||||
|
@override
|
||||||
|
void initState() {
|
||||||
|
super.initState();
|
||||||
|
WidgetsBinding.instance.addPostFrameCallback((_) {
|
||||||
|
context.read<CharacterProvider>().refresh();
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
void dispose() {
|
||||||
|
_controller.dispose();
|
||||||
|
_scrollController.dispose();
|
||||||
|
super.dispose();
|
||||||
|
}
|
||||||
|
|
||||||
|
void _scrollToEnd() {
|
||||||
|
WidgetsBinding.instance.addPostFrameCallback((_) {
|
||||||
|
if (!_scrollController.hasClients) return;
|
||||||
|
_scrollController.animateTo(
|
||||||
|
_scrollController.position.maxScrollExtent + 80,
|
||||||
|
duration: const Duration(milliseconds: 250),
|
||||||
|
curve: Curves.easeOut,
|
||||||
|
);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
Future<void> _sendText() async {
|
||||||
|
final text = _controller.text;
|
||||||
|
_controller.clear();
|
||||||
|
await context.read<ChatProvider>().sendText(text);
|
||||||
|
_scrollToEnd();
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
Widget build(BuildContext context) {
|
||||||
|
final chat = context.watch<ChatProvider>();
|
||||||
|
final character = context.watch<CharacterProvider>();
|
||||||
|
final activeName = character.activePack?.name ?? '当前角色';
|
||||||
|
|
||||||
|
return Scaffold(
|
||||||
|
appBar: AppBar(
|
||||||
|
title: Text('对话 · $activeName'),
|
||||||
|
actions: [
|
||||||
|
IconButton(
|
||||||
|
tooltip: '清空会话',
|
||||||
|
onPressed: chat.isBusy ? null : chat.clearHistory,
|
||||||
|
icon: const Icon(Icons.delete_outline_rounded),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
body: Column(
|
||||||
|
children: [
|
||||||
|
if (chat.status != null)
|
||||||
|
Container(
|
||||||
|
width: double.infinity,
|
||||||
|
color: AppColors.card,
|
||||||
|
padding: const EdgeInsets.symmetric(
|
||||||
|
horizontal: AppSpacing.md,
|
||||||
|
vertical: 8,
|
||||||
|
),
|
||||||
|
child: Text(
|
||||||
|
chat.status!,
|
||||||
|
style: TextStyle(
|
||||||
|
color: chat.error != null
|
||||||
|
? AppColors.error
|
||||||
|
: AppColors.textSecondary,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
Expanded(
|
||||||
|
child: chat.messages.isEmpty
|
||||||
|
? Center(
|
||||||
|
child: Padding(
|
||||||
|
padding: const EdgeInsets.all(AppSpacing.lg),
|
||||||
|
child: Text(
|
||||||
|
'文字发送,或按住下方麦克风说话。\n回复会在手机播放(设备本地不出声)。',
|
||||||
|
textAlign: TextAlign.center,
|
||||||
|
style: Theme.of(context).textTheme.bodyMedium?.copyWith(
|
||||||
|
color: AppColors.textSecondary,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
)
|
||||||
|
: ListView.builder(
|
||||||
|
controller: _scrollController,
|
||||||
|
padding: const EdgeInsets.all(AppSpacing.md),
|
||||||
|
itemCount: chat.messages.length,
|
||||||
|
itemBuilder: (context, index) {
|
||||||
|
final msg = chat.messages[index];
|
||||||
|
final isUser = msg.role == ChatBubbleRole.user;
|
||||||
|
return Align(
|
||||||
|
alignment: isUser
|
||||||
|
? Alignment.centerRight
|
||||||
|
: Alignment.centerLeft,
|
||||||
|
child: Container(
|
||||||
|
margin: const EdgeInsets.only(bottom: 10),
|
||||||
|
padding: const EdgeInsets.symmetric(
|
||||||
|
horizontal: 14,
|
||||||
|
vertical: 10,
|
||||||
|
),
|
||||||
|
constraints: BoxConstraints(
|
||||||
|
maxWidth: MediaQuery.of(context).size.width * 0.82,
|
||||||
|
),
|
||||||
|
decoration: BoxDecoration(
|
||||||
|
color: isUser
|
||||||
|
? AppColors.primary.withValues(alpha: 0.25)
|
||||||
|
: AppColors.card,
|
||||||
|
borderRadius: BorderRadius.circular(16),
|
||||||
|
border: Border.all(color: AppColors.border),
|
||||||
|
),
|
||||||
|
child: Column(
|
||||||
|
crossAxisAlignment: CrossAxisAlignment.start,
|
||||||
|
children: [
|
||||||
|
Text(
|
||||||
|
msg.text,
|
||||||
|
style: Theme.of(context).textTheme.bodyMedium,
|
||||||
|
),
|
||||||
|
if (msg.audioPath != null &&
|
||||||
|
msg.audioPath!.isNotEmpty &&
|
||||||
|
!msg.isPending) ...[
|
||||||
|
const SizedBox(height: 8),
|
||||||
|
TextButton.icon(
|
||||||
|
onPressed: () =>
|
||||||
|
chat.playReply(msg.audioPath!),
|
||||||
|
icon: const Icon(Icons.volume_up_rounded),
|
||||||
|
label: const Text('重播语音'),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
if (msg.isPending)
|
||||||
|
const Padding(
|
||||||
|
padding: EdgeInsets.only(top: 6),
|
||||||
|
child: SizedBox(
|
||||||
|
width: 14,
|
||||||
|
height: 14,
|
||||||
|
child: CircularProgressIndicator(
|
||||||
|
strokeWidth: 2,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
},
|
||||||
|
),
|
||||||
|
),
|
||||||
|
SafeArea(
|
||||||
|
top: false,
|
||||||
|
child: Padding(
|
||||||
|
padding: const EdgeInsets.fromLTRB(12, 8, 12, 12),
|
||||||
|
child: Row(
|
||||||
|
children: [
|
||||||
|
Expanded(
|
||||||
|
child: TextField(
|
||||||
|
controller: _controller,
|
||||||
|
enabled: !chat.isBusy && !chat.isRecording,
|
||||||
|
minLines: 1,
|
||||||
|
maxLines: 4,
|
||||||
|
decoration: const InputDecoration(
|
||||||
|
hintText: '输入文字和角色对话...',
|
||||||
|
),
|
||||||
|
onSubmitted: (_) => _sendText(),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
const SizedBox(width: 8),
|
||||||
|
IconButton.filled(
|
||||||
|
onPressed: chat.isBusy || chat.isRecording ? null : _sendText,
|
||||||
|
icon: const Icon(Icons.send_rounded),
|
||||||
|
),
|
||||||
|
const SizedBox(width: 4),
|
||||||
|
GestureDetector(
|
||||||
|
onLongPressStart: (_) async {
|
||||||
|
final ok =
|
||||||
|
await context.read<ChatProvider>().startRecording();
|
||||||
|
if (!ok && context.mounted) {
|
||||||
|
ScaffoldMessenger.of(context).showSnackBar(
|
||||||
|
SnackBar(
|
||||||
|
content: Text(
|
||||||
|
context.read<ChatProvider>().error ?? '无法录音',
|
||||||
|
),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
},
|
||||||
|
onLongPressEnd: (_) async {
|
||||||
|
await context.read<ChatProvider>().stopRecordingAndSend();
|
||||||
|
_scrollToEnd();
|
||||||
|
},
|
||||||
|
onLongPressCancel: () {
|
||||||
|
context.read<ChatProvider>().cancelRecording();
|
||||||
|
},
|
||||||
|
child: CircleAvatar(
|
||||||
|
radius: 26,
|
||||||
|
backgroundColor: chat.isRecording
|
||||||
|
? AppColors.error
|
||||||
|
: AppColors.primary.withValues(alpha: 0.2),
|
||||||
|
child: Icon(
|
||||||
|
chat.isRecording ? Icons.mic : Icons.mic_none_rounded,
|
||||||
|
color: chat.isRecording
|
||||||
|
? Colors.white
|
||||||
|
: AppColors.primary,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,6 +1,8 @@
|
|||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
|
import 'package:go_router/go_router.dart';
|
||||||
import 'package:provider/provider.dart';
|
import 'package:provider/provider.dart';
|
||||||
|
|
||||||
|
import '../providers/character_provider.dart';
|
||||||
import '../providers/device_provider.dart';
|
import '../providers/device_provider.dart';
|
||||||
import '../providers/player_provider.dart';
|
import '../providers/player_provider.dart';
|
||||||
import '../providers/wifi_provider.dart';
|
import '../providers/wifi_provider.dart';
|
||||||
@@ -16,9 +18,11 @@ class HomeScreen extends StatelessWidget {
|
|||||||
final deviceProvider = context.watch<DeviceProvider>();
|
final deviceProvider = context.watch<DeviceProvider>();
|
||||||
final playerProvider = context.watch<PlayerProvider>();
|
final playerProvider = context.watch<PlayerProvider>();
|
||||||
final wifiProvider = context.watch<WifiProvider>();
|
final wifiProvider = context.watch<WifiProvider>();
|
||||||
|
final characterProvider = context.watch<CharacterProvider>();
|
||||||
final device = deviceProvider.status;
|
final device = deviceProvider.status;
|
||||||
final player = playerProvider.status;
|
final player = playerProvider.status;
|
||||||
final wifi = wifiProvider.status;
|
final wifi = wifiProvider.status;
|
||||||
|
final characterName = characterProvider.activePack?.name ?? '未同步';
|
||||||
|
|
||||||
return Scaffold(
|
return Scaffold(
|
||||||
appBar: AppBar(title: const Text('ShowenV2 控制台')),
|
appBar: AppBar(title: const Text('ShowenV2 控制台')),
|
||||||
@@ -28,6 +32,7 @@ class HomeScreen extends StatelessWidget {
|
|||||||
context.read<DeviceProvider>().refresh(),
|
context.read<DeviceProvider>().refresh(),
|
||||||
context.read<PlayerProvider>().bootstrap(),
|
context.read<PlayerProvider>().bootstrap(),
|
||||||
context.read<WifiProvider>().bootstrap(),
|
context.read<WifiProvider>().bootstrap(),
|
||||||
|
context.read<CharacterProvider>().refresh(),
|
||||||
]);
|
]);
|
||||||
},
|
},
|
||||||
child: ListView(
|
child: ListView(
|
||||||
@@ -41,6 +46,16 @@ class HomeScreen extends StatelessWidget {
|
|||||||
accentColor: device.connected ? AppColors.success : AppColors.warning,
|
accentColor: device.connected ? AppColors.success : AppColors.warning,
|
||||||
),
|
),
|
||||||
const SizedBox(height: AppSpacing.md),
|
const SizedBox(height: AppSpacing.md),
|
||||||
|
StatusCard(
|
||||||
|
title: '当前角色',
|
||||||
|
value: characterName,
|
||||||
|
subtitle: characterProvider.activeFilename.isEmpty
|
||||||
|
? '点击角色页切换内容包'
|
||||||
|
: characterProvider.activeFilename,
|
||||||
|
icon: Icons.face_rounded,
|
||||||
|
accentColor: AppColors.secondary,
|
||||||
|
),
|
||||||
|
const SizedBox(height: AppSpacing.md),
|
||||||
StatusCard(
|
StatusCard(
|
||||||
title: '当前播放状态',
|
title: '当前播放状态',
|
||||||
value: player.currentVideo ?? '暂无播放视频',
|
value: player.currentVideo ?? '暂无播放视频',
|
||||||
@@ -59,6 +74,27 @@ class HomeScreen extends StatelessWidget {
|
|||||||
accentColor: wifi.connected ? AppColors.info : AppColors.border,
|
accentColor: wifi.connected ? AppColors.info : AppColors.border,
|
||||||
),
|
),
|
||||||
const SizedBox(height: AppSpacing.lg),
|
const SizedBox(height: AppSpacing.lg),
|
||||||
|
Row(
|
||||||
|
children: [
|
||||||
|
Expanded(
|
||||||
|
child: ControlButton(
|
||||||
|
label: '去对话',
|
||||||
|
icon: Icons.chat_bubble_rounded,
|
||||||
|
onPressed: () => context.go('/chat'),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
const SizedBox(width: AppSpacing.md),
|
||||||
|
Expanded(
|
||||||
|
child: ControlButton(
|
||||||
|
label: '换角色',
|
||||||
|
icon: Icons.face_rounded,
|
||||||
|
isFilled: false,
|
||||||
|
onPressed: () => context.go('/characters'),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
const SizedBox(height: AppSpacing.lg),
|
||||||
Text('快捷控制', style: Theme.of(context).textTheme.headlineSmall),
|
Text('快捷控制', style: Theme.of(context).textTheme.headlineSmall),
|
||||||
const SizedBox(height: AppSpacing.md),
|
const SizedBox(height: AppSpacing.md),
|
||||||
Row(
|
Row(
|
||||||
|
|||||||
229
clients/flutter/lib/screens/models_screen.dart
Normal file
229
clients/flutter/lib/screens/models_screen.dart
Normal file
@@ -0,0 +1,229 @@
|
|||||||
|
import 'package:flutter/material.dart';
|
||||||
|
import 'package:provider/provider.dart';
|
||||||
|
|
||||||
|
import '../models/ai_model.dart';
|
||||||
|
import '../providers/model_provider.dart';
|
||||||
|
import '../theme/app_colors.dart';
|
||||||
|
|
||||||
|
class ModelsScreen extends StatefulWidget {
|
||||||
|
const ModelsScreen({super.key});
|
||||||
|
|
||||||
|
@override
|
||||||
|
State<ModelsScreen> createState() => _ModelsScreenState();
|
||||||
|
}
|
||||||
|
|
||||||
|
class _ModelsScreenState extends State<ModelsScreen> {
|
||||||
|
@override
|
||||||
|
void initState() {
|
||||||
|
super.initState();
|
||||||
|
WidgetsBinding.instance.addPostFrameCallback((_) {
|
||||||
|
context.read<ModelProvider>().refresh();
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
Widget build(BuildContext context) {
|
||||||
|
final provider = context.watch<ModelProvider>();
|
||||||
|
final snapshot = provider.snapshot;
|
||||||
|
|
||||||
|
return Scaffold(
|
||||||
|
appBar: AppBar(
|
||||||
|
title: const Text('模型管理'),
|
||||||
|
actions: [
|
||||||
|
IconButton(
|
||||||
|
onPressed: provider.isLoading ? null : () => provider.refresh(),
|
||||||
|
icon: const Icon(Icons.refresh_rounded),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
body: RefreshIndicator(
|
||||||
|
onRefresh: provider.refresh,
|
||||||
|
child: ListView(
|
||||||
|
padding: const EdgeInsets.all(AppSpacing.md),
|
||||||
|
children: [
|
||||||
|
if (provider.error != null)
|
||||||
|
Padding(
|
||||||
|
padding: const EdgeInsets.only(bottom: AppSpacing.sm),
|
||||||
|
child: Text(
|
||||||
|
provider.error!,
|
||||||
|
style: const TextStyle(color: AppColors.error),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
if (provider.status != null)
|
||||||
|
Padding(
|
||||||
|
padding: const EdgeInsets.only(bottom: AppSpacing.sm),
|
||||||
|
child: Text(
|
||||||
|
provider.status!,
|
||||||
|
style: const TextStyle(color: AppColors.textSecondary),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
if (snapshot != null) ...[
|
||||||
|
Card(
|
||||||
|
child: Padding(
|
||||||
|
padding: const EdgeInsets.all(AppSpacing.md),
|
||||||
|
child: Column(
|
||||||
|
crossAxisAlignment: CrossAxisAlignment.start,
|
||||||
|
children: [
|
||||||
|
Text(
|
||||||
|
'存储 ${snapshot.usedLabel} / ${snapshot.quotaLabel}',
|
||||||
|
style: Theme.of(context).textTheme.titleMedium,
|
||||||
|
),
|
||||||
|
const SizedBox(height: 8),
|
||||||
|
LinearProgressIndicator(value: snapshot.usageRatio),
|
||||||
|
const SizedBox(height: 8),
|
||||||
|
Text(
|
||||||
|
'激活: LLM=${snapshot.active['llm'] ?? '-'} · '
|
||||||
|
'ASR=${snapshot.active['asr'] ?? '-'} · '
|
||||||
|
'TTS=${snapshot.active['tts'] ?? '-'}',
|
||||||
|
style: Theme.of(context).textTheme.bodySmall?.copyWith(
|
||||||
|
color: AppColors.textSecondary,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
const SizedBox(height: AppSpacing.md),
|
||||||
|
],
|
||||||
|
if (provider.isLoading && snapshot == null)
|
||||||
|
const Padding(
|
||||||
|
padding: EdgeInsets.only(top: 48),
|
||||||
|
child: Center(child: CircularProgressIndicator()),
|
||||||
|
)
|
||||||
|
else if (snapshot == null || snapshot.models.isEmpty)
|
||||||
|
const Padding(
|
||||||
|
padding: EdgeInsets.only(top: 48),
|
||||||
|
child: Center(child: Text('暂无模型清单(AI 插件可能未就绪)')),
|
||||||
|
)
|
||||||
|
else
|
||||||
|
...snapshot.models.map((model) {
|
||||||
|
final active = snapshot.isActive(model);
|
||||||
|
return Card(
|
||||||
|
margin: const EdgeInsets.only(bottom: AppSpacing.md),
|
||||||
|
child: Padding(
|
||||||
|
padding: const EdgeInsets.all(AppSpacing.md),
|
||||||
|
child: Column(
|
||||||
|
crossAxisAlignment: CrossAxisAlignment.start,
|
||||||
|
children: [
|
||||||
|
Row(
|
||||||
|
children: [
|
||||||
|
Expanded(
|
||||||
|
child: Text(
|
||||||
|
model.name,
|
||||||
|
style: Theme.of(context).textTheme.titleMedium,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
if (active)
|
||||||
|
Container(
|
||||||
|
padding: const EdgeInsets.symmetric(
|
||||||
|
horizontal: 8,
|
||||||
|
vertical: 2,
|
||||||
|
),
|
||||||
|
decoration: BoxDecoration(
|
||||||
|
color:
|
||||||
|
AppColors.success.withValues(alpha: 0.15),
|
||||||
|
borderRadius: BorderRadius.circular(999),
|
||||||
|
),
|
||||||
|
child: const Text(
|
||||||
|
'使用中',
|
||||||
|
style: TextStyle(
|
||||||
|
color: AppColors.success,
|
||||||
|
fontSize: 12,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
const SizedBox(height: 4),
|
||||||
|
Text(
|
||||||
|
'${model.kindLabel} · ${model.sizeLabel} · 内存 ${model.memoryLabel}',
|
||||||
|
style:
|
||||||
|
Theme.of(context).textTheme.bodySmall?.copyWith(
|
||||||
|
color: AppColors.textSecondary,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
if (model.recommendedTier.isNotEmpty)
|
||||||
|
Text(
|
||||||
|
model.recommendedTier,
|
||||||
|
style: Theme.of(context)
|
||||||
|
.textTheme
|
||||||
|
.bodySmall
|
||||||
|
?.copyWith(color: AppColors.textSecondary),
|
||||||
|
),
|
||||||
|
if (!model.downloaded && model.downloadProgress > 0)
|
||||||
|
Padding(
|
||||||
|
padding: const EdgeInsets.only(top: 8),
|
||||||
|
child: LinearProgressIndicator(
|
||||||
|
value: model.downloadProgress / 100.0,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
const SizedBox(height: 10),
|
||||||
|
Wrap(
|
||||||
|
spacing: 8,
|
||||||
|
runSpacing: 8,
|
||||||
|
children: [
|
||||||
|
if (!model.downloaded)
|
||||||
|
FilledButton.tonal(
|
||||||
|
onPressed: provider.isActing
|
||||||
|
? null
|
||||||
|
: () => provider.download(model.id),
|
||||||
|
child: Text(
|
||||||
|
model.downloadProgress > 0 &&
|
||||||
|
model.downloadProgress < 100
|
||||||
|
? '下载中 ${model.downloadProgress}%'
|
||||||
|
: '下载',
|
||||||
|
),
|
||||||
|
),
|
||||||
|
if (model.downloaded && !active)
|
||||||
|
FilledButton(
|
||||||
|
onPressed: provider.isActing
|
||||||
|
? null
|
||||||
|
: () => provider.switchTo(
|
||||||
|
modelId: model.id,
|
||||||
|
kind: model.kind,
|
||||||
|
),
|
||||||
|
child: const Text('切换使用'),
|
||||||
|
),
|
||||||
|
if (model.downloaded && !active)
|
||||||
|
OutlinedButton(
|
||||||
|
onPressed: provider.isActing
|
||||||
|
? null
|
||||||
|
: () => _confirmDelete(context, model),
|
||||||
|
child: const Text('删除'),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
Future<void> _confirmDelete(BuildContext context, AiModelInfo model) async {
|
||||||
|
final ok = await showDialog<bool>(
|
||||||
|
context: context,
|
||||||
|
builder: (context) => AlertDialog(
|
||||||
|
title: const Text('删除模型'),
|
||||||
|
content: Text('确定删除 ${model.name}?此操作不可恢复。'),
|
||||||
|
actions: [
|
||||||
|
TextButton(
|
||||||
|
onPressed: () => Navigator.pop(context, false),
|
||||||
|
child: const Text('取消'),
|
||||||
|
),
|
||||||
|
FilledButton(
|
||||||
|
onPressed: () => Navigator.pop(context, true),
|
||||||
|
child: const Text('删除'),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
);
|
||||||
|
if (ok == true && context.mounted) {
|
||||||
|
await context.read<ModelProvider>().delete(model.id);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -2,6 +2,7 @@ import 'dart:convert';
|
|||||||
|
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:flutter/services.dart';
|
import 'package:flutter/services.dart';
|
||||||
|
import 'package:go_router/go_router.dart';
|
||||||
import 'package:provider/provider.dart';
|
import 'package:provider/provider.dart';
|
||||||
|
|
||||||
import '../models/video_item.dart';
|
import '../models/video_item.dart';
|
||||||
@@ -80,6 +81,34 @@ class _SettingsScreenState extends State<SettingsScreen> {
|
|||||||
physics: const AlwaysScrollableScrollPhysics(),
|
physics: const AlwaysScrollableScrollPhysics(),
|
||||||
padding: const EdgeInsets.all(AppSpacing.md),
|
padding: const EdgeInsets.all(AppSpacing.md),
|
||||||
children: [
|
children: [
|
||||||
|
Card(
|
||||||
|
child: Column(
|
||||||
|
children: [
|
||||||
|
ListTile(
|
||||||
|
leading: const Icon(Icons.memory_rounded),
|
||||||
|
title: const Text('模型管理'),
|
||||||
|
subtitle: const Text('下载 / 切换 / 删除 AI 模型'),
|
||||||
|
trailing: const Icon(Icons.chevron_right_rounded),
|
||||||
|
onTap: () => context.push('/settings/models'),
|
||||||
|
),
|
||||||
|
const Divider(height: 1),
|
||||||
|
ListTile(
|
||||||
|
leading: const Icon(Icons.bolt_rounded),
|
||||||
|
title: const Text('状态机触发'),
|
||||||
|
trailing: const Icon(Icons.chevron_right_rounded),
|
||||||
|
onTap: () => context.push('/settings/trigger'),
|
||||||
|
),
|
||||||
|
const Divider(height: 1),
|
||||||
|
ListTile(
|
||||||
|
leading: const Icon(Icons.bug_report_rounded),
|
||||||
|
title: const Text('调试日志'),
|
||||||
|
trailing: const Icon(Icons.chevron_right_rounded),
|
||||||
|
onTap: () => context.push('/settings/debug'),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
const SizedBox(height: AppSpacing.lg),
|
||||||
Card(
|
Card(
|
||||||
child: Padding(
|
child: Padding(
|
||||||
padding: const EdgeInsets.all(AppSpacing.md),
|
padding: const EdgeInsets.all(AppSpacing.md),
|
||||||
@@ -464,9 +493,17 @@ class _SettingsScreenState extends State<SettingsScreen> {
|
|||||||
Map<String, dynamic>.from(results[0] as Map<String, dynamic>);
|
Map<String, dynamic>.from(results[0] as Map<String, dynamic>);
|
||||||
final available =
|
final available =
|
||||||
Map<String, dynamic>.from(results[1] as Map<String, dynamic>);
|
Map<String, dynamic>.from(results[1] as Map<String, dynamic>);
|
||||||
|
// M2.1: configs 为 {filename, character} 对象列表;兼容旧版纯字符串列表
|
||||||
_availableConfigs =
|
_availableConfigs =
|
||||||
(available['configs'] as List<dynamic>? ?? const <dynamic>[])
|
(available['configs'] as List<dynamic>? ?? const <dynamic>[])
|
||||||
.map((item) => item.toString())
|
.map((item) {
|
||||||
|
if (item is String) return item;
|
||||||
|
if (item is Map) {
|
||||||
|
return item['filename']?.toString() ?? item.toString();
|
||||||
|
}
|
||||||
|
return item.toString();
|
||||||
|
})
|
||||||
|
.where((name) => name.isNotEmpty)
|
||||||
.toList(growable: false);
|
.toList(growable: false);
|
||||||
_activeConfig = available['active']?.toString();
|
_activeConfig = available['active']?.toString();
|
||||||
_applyDisplayConfig(Map<String, dynamic>.from(
|
_applyDisplayConfig(Map<String, dynamic>.from(
|
||||||
|
|||||||
@@ -5,8 +5,11 @@ import 'dart:typed_data';
|
|||||||
|
|
||||||
import 'package:http/http.dart' as http;
|
import 'package:http/http.dart' as http;
|
||||||
|
|
||||||
|
import '../models/ai_model.dart';
|
||||||
import '../models/api_response.dart';
|
import '../models/api_response.dart';
|
||||||
import '../models/ble_status.dart';
|
import '../models/ble_status.dart';
|
||||||
|
import '../models/character_pack.dart';
|
||||||
|
import '../models/chat_models.dart';
|
||||||
import '../models/player_status.dart';
|
import '../models/player_status.dart';
|
||||||
import '../models/video_item.dart';
|
import '../models/video_item.dart';
|
||||||
import '../models/wifi_network.dart';
|
import '../models/wifi_network.dart';
|
||||||
@@ -300,6 +303,118 @@ class HttpApiService {
|
|||||||
return ApiResponse.fromJson(_decodeMap(response.body));
|
return ApiResponse.fromJson(_decodeMap(response.body));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Future<AvailableConfigs> getAvailableCharacterConfigs() async {
|
||||||
|
final map = await getAvailableConfigs();
|
||||||
|
return AvailableConfigs.fromJson(map);
|
||||||
|
}
|
||||||
|
|
||||||
|
// ── M2.1 AI 对话 / 模型管理 ──
|
||||||
|
|
||||||
|
Future<ChatTurnResponse> chatText({
|
||||||
|
required String text,
|
||||||
|
String? sessionId,
|
||||||
|
}) async {
|
||||||
|
final response = await _client.post(
|
||||||
|
_uri('/api/chat/text'),
|
||||||
|
headers: _jsonHeaders,
|
||||||
|
body: jsonEncode(<String, dynamic>{
|
||||||
|
'text': text,
|
||||||
|
if (sessionId != null && sessionId.isNotEmpty) 'session_id': sessionId,
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
// AI 错误也以 JSON ChatResponse 返回(可能是 5xx)
|
||||||
|
final map = _decodeMap(response.body);
|
||||||
|
final result = ChatTurnResponse.fromJson(map);
|
||||||
|
if (response.statusCode >= 200 && response.statusCode < 300) {
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
if (result.error != null && result.error!.isNotEmpty) {
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
throw ApiException(
|
||||||
|
map['message']?.toString() ?? '对话失败 (${response.statusCode})',
|
||||||
|
statusCode: response.statusCode,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
Future<ChatTurnResponse> chatAudio({
|
||||||
|
required List<int> bytes,
|
||||||
|
String format = 'wav',
|
||||||
|
String? sessionId,
|
||||||
|
}) async {
|
||||||
|
final response = await _client.post(
|
||||||
|
_uri('/api/chat/audio'),
|
||||||
|
headers: <String, String>{
|
||||||
|
'Content-Type': 'application/octet-stream',
|
||||||
|
'Accept': 'application/json',
|
||||||
|
'X-Audio-Format': format,
|
||||||
|
if (sessionId != null && sessionId.isNotEmpty) 'X-Session-Id': sessionId,
|
||||||
|
},
|
||||||
|
body: bytes,
|
||||||
|
);
|
||||||
|
final map = _decodeMap(response.body);
|
||||||
|
final result = ChatTurnResponse.fromJson(map);
|
||||||
|
if (response.statusCode >= 200 && response.statusCode < 300) {
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
if (result.error != null && result.error!.isNotEmpty) {
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
throw ApiException(
|
||||||
|
map['message']?.toString() ?? '语音对话失败 (${response.statusCode})',
|
||||||
|
statusCode: response.statusCode,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
String chatAudioFileUrl(String absolutePath) {
|
||||||
|
return _uri(
|
||||||
|
'/api/chat/audio/file',
|
||||||
|
<String, String>{'path': absolutePath},
|
||||||
|
).toString();
|
||||||
|
}
|
||||||
|
|
||||||
|
Future<ModelsSnapshot> getModels() async {
|
||||||
|
final response = await _client.get(_uri('/api/models'));
|
||||||
|
_ensureSuccess(response);
|
||||||
|
return ModelsSnapshot.fromJson(_decodeMap(response.body));
|
||||||
|
}
|
||||||
|
|
||||||
|
Future<ApiResponse> downloadModel(String modelId) async {
|
||||||
|
final response = await _client.post(
|
||||||
|
_uri('/api/models/download'),
|
||||||
|
headers: _jsonHeaders,
|
||||||
|
body: jsonEncode(<String, dynamic>{'model_id': modelId}),
|
||||||
|
);
|
||||||
|
_ensureSuccess(response);
|
||||||
|
return ApiResponse.fromJson(_decodeMap(response.body));
|
||||||
|
}
|
||||||
|
|
||||||
|
Future<ApiResponse> switchModel({
|
||||||
|
required String modelId,
|
||||||
|
required String kind,
|
||||||
|
}) async {
|
||||||
|
final response = await _client.post(
|
||||||
|
_uri('/api/models/switch'),
|
||||||
|
headers: _jsonHeaders,
|
||||||
|
body: jsonEncode(<String, dynamic>{
|
||||||
|
'model_id': modelId,
|
||||||
|
'kind': kind,
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
_ensureSuccess(response);
|
||||||
|
return ApiResponse.fromJson(_decodeMap(response.body));
|
||||||
|
}
|
||||||
|
|
||||||
|
Future<ApiResponse> deleteModel(String modelId) async {
|
||||||
|
final response = await _client.post(
|
||||||
|
_uri('/api/models/delete'),
|
||||||
|
headers: _jsonHeaders,
|
||||||
|
body: jsonEncode(<String, dynamic>{'model_id': modelId}),
|
||||||
|
);
|
||||||
|
_ensureSuccess(response);
|
||||||
|
return ApiResponse.fromJson(_decodeMap(response.body));
|
||||||
|
}
|
||||||
|
|
||||||
Future<List<Map<String, dynamic>>> listFiles(String dirKey, [String? path]) async {
|
Future<List<Map<String, dynamic>>> listFiles(String dirKey, [String? path]) async {
|
||||||
final response = await _client.get(
|
final response = await _client.get(
|
||||||
_uri('/api/files/$dirKey', _pathQuery(path)),
|
_uri('/api/files/$dirKey', _pathQuery(path)),
|
||||||
|
|||||||
@@ -6,23 +6,79 @@ packages:
|
|||||||
description:
|
description:
|
||||||
name: args
|
name: args
|
||||||
sha256: d0481093c50b1da8910eb0bb301626d4d8eb7284aa739614d2b394ee09e3ea04
|
sha256: d0481093c50b1da8910eb0bb301626d4d8eb7284aa739614d2b394ee09e3ea04
|
||||||
url: "https://pub.dev"
|
url: "https://pub.flutter-io.cn"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "2.7.0"
|
version: "2.7.0"
|
||||||
async:
|
async:
|
||||||
dependency: transitive
|
dependency: transitive
|
||||||
description:
|
description:
|
||||||
name: async
|
name: async
|
||||||
sha256: "758e6d74e971c3e5aceb4110bfd6698efc7f501675bcfe0c775459a8140750eb"
|
sha256: e2eb0491ba5ddb6177742d2da23904574082139b07c1e33b8503b9f46f3e1a37
|
||||||
url: "https://pub.dev"
|
url: "https://pub.flutter-io.cn"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "2.13.0"
|
version: "2.13.1"
|
||||||
|
audioplayers:
|
||||||
|
dependency: "direct main"
|
||||||
|
description:
|
||||||
|
name: audioplayers
|
||||||
|
sha256: "2ba4bb2944baacbdd5372ff8254a8e7feb8c10d7739545e392f5605a8f618745"
|
||||||
|
url: "https://pub.flutter-io.cn"
|
||||||
|
source: hosted
|
||||||
|
version: "6.8.1"
|
||||||
|
audioplayers_android:
|
||||||
|
dependency: transitive
|
||||||
|
description:
|
||||||
|
name: audioplayers_android
|
||||||
|
sha256: f5ff5b15620fbab8cb0849e9636c48e2b96c3f0f71723bbbe2ad3c761b205f05
|
||||||
|
url: "https://pub.flutter-io.cn"
|
||||||
|
source: hosted
|
||||||
|
version: "5.3.0"
|
||||||
|
audioplayers_darwin:
|
||||||
|
dependency: transitive
|
||||||
|
description:
|
||||||
|
name: audioplayers_darwin
|
||||||
|
sha256: "1ca553add991384ecf421b9569da850f3ab2472ffb83f6970b0416365abc51be"
|
||||||
|
url: "https://pub.flutter-io.cn"
|
||||||
|
source: hosted
|
||||||
|
version: "6.5.0"
|
||||||
|
audioplayers_linux:
|
||||||
|
dependency: transitive
|
||||||
|
description:
|
||||||
|
name: audioplayers_linux
|
||||||
|
sha256: "15178b726b7cdee5364d0463c8d445630c4e0fb7d26612b73c767e7d25de9417"
|
||||||
|
url: "https://pub.flutter-io.cn"
|
||||||
|
source: hosted
|
||||||
|
version: "4.3.0"
|
||||||
|
audioplayers_platform_interface:
|
||||||
|
dependency: transitive
|
||||||
|
description:
|
||||||
|
name: audioplayers_platform_interface
|
||||||
|
sha256: "765f6f0e6dca55cb471c9483fc77700564b3484d19198aca4ebb5147c6c85acb"
|
||||||
|
url: "https://pub.flutter-io.cn"
|
||||||
|
source: hosted
|
||||||
|
version: "7.2.0"
|
||||||
|
audioplayers_web:
|
||||||
|
dependency: transitive
|
||||||
|
description:
|
||||||
|
name: audioplayers_web
|
||||||
|
sha256: ae1e0103c865a03e273f6d13d97b93f5595eac09915729cd5e37ef96e2857319
|
||||||
|
url: "https://pub.flutter-io.cn"
|
||||||
|
source: hosted
|
||||||
|
version: "5.3.0"
|
||||||
|
audioplayers_windows:
|
||||||
|
dependency: transitive
|
||||||
|
description:
|
||||||
|
name: audioplayers_windows
|
||||||
|
sha256: a70ae82bba2dfcb6eb03dd4815d737a2d46d33ea5a96a03f535cfcaac490e413
|
||||||
|
url: "https://pub.flutter-io.cn"
|
||||||
|
source: hosted
|
||||||
|
version: "4.4.1"
|
||||||
bluez:
|
bluez:
|
||||||
dependency: transitive
|
dependency: transitive
|
||||||
description:
|
description:
|
||||||
name: bluez
|
name: bluez
|
||||||
sha256: "61a7204381925896a374301498f2f5399e59827c6498ae1e924aaa598751b545"
|
sha256: "61a7204381925896a374301498f2f5399e59827c6498ae1e924aaa598751b545"
|
||||||
url: "https://pub.dev"
|
url: "https://pub.flutter-io.cn"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "0.8.3"
|
version: "0.8.3"
|
||||||
boolean_selector:
|
boolean_selector:
|
||||||
@@ -30,7 +86,7 @@ packages:
|
|||||||
description:
|
description:
|
||||||
name: boolean_selector
|
name: boolean_selector
|
||||||
sha256: "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea"
|
sha256: "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea"
|
||||||
url: "https://pub.dev"
|
url: "https://pub.flutter-io.cn"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "2.1.2"
|
version: "2.1.2"
|
||||||
characters:
|
characters:
|
||||||
@@ -38,7 +94,7 @@ packages:
|
|||||||
description:
|
description:
|
||||||
name: characters
|
name: characters
|
||||||
sha256: faf38497bda5ead2a8c7615f4f7939df04333478bf32e4173fcb06d428b5716b
|
sha256: faf38497bda5ead2a8c7615f4f7939df04333478bf32e4173fcb06d428b5716b
|
||||||
url: "https://pub.dev"
|
url: "https://pub.flutter-io.cn"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "1.4.1"
|
version: "1.4.1"
|
||||||
clock:
|
clock:
|
||||||
@@ -46,15 +102,23 @@ packages:
|
|||||||
description:
|
description:
|
||||||
name: clock
|
name: clock
|
||||||
sha256: fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b
|
sha256: fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b
|
||||||
url: "https://pub.dev"
|
url: "https://pub.flutter-io.cn"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "1.1.2"
|
version: "1.1.2"
|
||||||
|
code_assets:
|
||||||
|
dependency: transitive
|
||||||
|
description:
|
||||||
|
name: code_assets
|
||||||
|
sha256: bf394f466ba9205f1812a0433b392d6af280f155f56651eda7c18cc32ed493b8
|
||||||
|
url: "https://pub.flutter-io.cn"
|
||||||
|
source: hosted
|
||||||
|
version: "1.2.1"
|
||||||
collection:
|
collection:
|
||||||
dependency: transitive
|
dependency: transitive
|
||||||
description:
|
description:
|
||||||
name: collection
|
name: collection
|
||||||
sha256: "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76"
|
sha256: "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76"
|
||||||
url: "https://pub.dev"
|
url: "https://pub.flutter-io.cn"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "1.19.1"
|
version: "1.19.1"
|
||||||
crypto:
|
crypto:
|
||||||
@@ -62,31 +126,31 @@ packages:
|
|||||||
description:
|
description:
|
||||||
name: crypto
|
name: crypto
|
||||||
sha256: c8ea0233063ba03258fbcf2ca4d6dadfefe14f02fab57702265467a19f27fadf
|
sha256: c8ea0233063ba03258fbcf2ca4d6dadfefe14f02fab57702265467a19f27fadf
|
||||||
url: "https://pub.dev"
|
url: "https://pub.flutter-io.cn"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "3.0.7"
|
version: "3.0.7"
|
||||||
cupertino_icons:
|
cupertino_icons:
|
||||||
dependency: "direct main"
|
dependency: "direct main"
|
||||||
description:
|
description:
|
||||||
name: cupertino_icons
|
name: cupertino_icons
|
||||||
sha256: ba631d1c7f7bef6b729a622b7b752645a2d076dba9976925b8f25725a30e1ee6
|
sha256: "41e005c33bd814be4d3096aff55b1908d419fde52ca656c8c47719ec745873cd"
|
||||||
url: "https://pub.dev"
|
url: "https://pub.flutter-io.cn"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "1.0.8"
|
version: "1.0.9"
|
||||||
dbus:
|
dbus:
|
||||||
dependency: transitive
|
dependency: transitive
|
||||||
description:
|
description:
|
||||||
name: dbus
|
name: dbus
|
||||||
sha256: d0c98dcd4f5169878b6cf8f6e0a52403a9dff371a3e2f019697accbf6f44a270
|
sha256: "0ce9b0a839e6dee59a37a623d2fc26a35bbbe6404213e419b0d6411023d62645"
|
||||||
url: "https://pub.dev"
|
url: "https://pub.flutter-io.cn"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "0.7.12"
|
version: "0.7.14"
|
||||||
fake_async:
|
fake_async:
|
||||||
dependency: transitive
|
dependency: transitive
|
||||||
description:
|
description:
|
||||||
name: fake_async
|
name: fake_async
|
||||||
sha256: "5368f224a74523e8d2e7399ea1638b37aecfca824a3cc4dfdf77bf1fa905ac44"
|
sha256: "5368f224a74523e8d2e7399ea1638b37aecfca824a3cc4dfdf77bf1fa905ac44"
|
||||||
url: "https://pub.dev"
|
url: "https://pub.flutter-io.cn"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "1.3.3"
|
version: "1.3.3"
|
||||||
ffi:
|
ffi:
|
||||||
@@ -94,7 +158,7 @@ packages:
|
|||||||
description:
|
description:
|
||||||
name: ffi
|
name: ffi
|
||||||
sha256: "6d7fd89431262d8f3125e81b50d3847a091d846eafcd4fdb88dd06f36d705a45"
|
sha256: "6d7fd89431262d8f3125e81b50d3847a091d846eafcd4fdb88dd06f36d705a45"
|
||||||
url: "https://pub.dev"
|
url: "https://pub.flutter-io.cn"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "2.2.0"
|
version: "2.2.0"
|
||||||
file:
|
file:
|
||||||
@@ -102,9 +166,17 @@ packages:
|
|||||||
description:
|
description:
|
||||||
name: file
|
name: file
|
||||||
sha256: a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4
|
sha256: a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4
|
||||||
url: "https://pub.dev"
|
url: "https://pub.flutter-io.cn"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "7.0.1"
|
version: "7.0.1"
|
||||||
|
fixnum:
|
||||||
|
dependency: transitive
|
||||||
|
description:
|
||||||
|
name: fixnum
|
||||||
|
sha256: b6dc7065e46c974bc7c5f143080a6764ec7a4be6da1285ececdc37be96de53be
|
||||||
|
url: "https://pub.flutter-io.cn"
|
||||||
|
source: hosted
|
||||||
|
version: "1.1.1"
|
||||||
flutter:
|
flutter:
|
||||||
dependency: "direct main"
|
dependency: "direct main"
|
||||||
description: flutter
|
description: flutter
|
||||||
@@ -115,7 +187,7 @@ packages:
|
|||||||
description:
|
description:
|
||||||
name: flutter_blue_plus
|
name: flutter_blue_plus
|
||||||
sha256: "69a8c87c11fc792e8cf0f997d275484fbdb5143ac9f0ac4d424429700cb4e0ed"
|
sha256: "69a8c87c11fc792e8cf0f997d275484fbdb5143ac9f0ac4d424429700cb4e0ed"
|
||||||
url: "https://pub.dev"
|
url: "https://pub.flutter-io.cn"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "1.36.8"
|
version: "1.36.8"
|
||||||
flutter_blue_plus_android:
|
flutter_blue_plus_android:
|
||||||
@@ -123,7 +195,7 @@ packages:
|
|||||||
description:
|
description:
|
||||||
name: flutter_blue_plus_android
|
name: flutter_blue_plus_android
|
||||||
sha256: "6f7fe7e69659c30af164a53730707edc16aa4d959e4c208f547b893d940f853d"
|
sha256: "6f7fe7e69659c30af164a53730707edc16aa4d959e4c208f547b893d940f853d"
|
||||||
url: "https://pub.dev"
|
url: "https://pub.flutter-io.cn"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "7.0.4"
|
version: "7.0.4"
|
||||||
flutter_blue_plus_darwin:
|
flutter_blue_plus_darwin:
|
||||||
@@ -131,7 +203,7 @@ packages:
|
|||||||
description:
|
description:
|
||||||
name: flutter_blue_plus_darwin
|
name: flutter_blue_plus_darwin
|
||||||
sha256: "682982862c1d964f4d54a3fb5fccc9e59a066422b93b7e22079aeecd9c0d38f8"
|
sha256: "682982862c1d964f4d54a3fb5fccc9e59a066422b93b7e22079aeecd9c0d38f8"
|
||||||
url: "https://pub.dev"
|
url: "https://pub.flutter-io.cn"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "7.0.3"
|
version: "7.0.3"
|
||||||
flutter_blue_plus_linux:
|
flutter_blue_plus_linux:
|
||||||
@@ -139,7 +211,7 @@ packages:
|
|||||||
description:
|
description:
|
||||||
name: flutter_blue_plus_linux
|
name: flutter_blue_plus_linux
|
||||||
sha256: "56b0c45edd0a2eec8f85bd97a26ac3cd09447e10d0094fed55587bf0592e3347"
|
sha256: "56b0c45edd0a2eec8f85bd97a26ac3cd09447e10d0094fed55587bf0592e3347"
|
||||||
url: "https://pub.dev"
|
url: "https://pub.flutter-io.cn"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "7.0.3"
|
version: "7.0.3"
|
||||||
flutter_blue_plus_platform_interface:
|
flutter_blue_plus_platform_interface:
|
||||||
@@ -147,7 +219,7 @@ packages:
|
|||||||
description:
|
description:
|
||||||
name: flutter_blue_plus_platform_interface
|
name: flutter_blue_plus_platform_interface
|
||||||
sha256: "84fbd180c50a40c92482f273a92069960805ce324e3673ad29c41d2faaa7c5c2"
|
sha256: "84fbd180c50a40c92482f273a92069960805ce324e3673ad29c41d2faaa7c5c2"
|
||||||
url: "https://pub.dev"
|
url: "https://pub.flutter-io.cn"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "7.0.0"
|
version: "7.0.0"
|
||||||
flutter_blue_plus_web:
|
flutter_blue_plus_web:
|
||||||
@@ -155,7 +227,7 @@ packages:
|
|||||||
description:
|
description:
|
||||||
name: flutter_blue_plus_web
|
name: flutter_blue_plus_web
|
||||||
sha256: a1aceee753d171d24c0e0cdadb37895b5e9124862721f25f60bb758e20b72c99
|
sha256: a1aceee753d171d24c0e0cdadb37895b5e9124862721f25f60bb758e20b72c99
|
||||||
url: "https://pub.dev"
|
url: "https://pub.flutter-io.cn"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "7.0.2"
|
version: "7.0.2"
|
||||||
flutter_lints:
|
flutter_lints:
|
||||||
@@ -163,7 +235,7 @@ packages:
|
|||||||
description:
|
description:
|
||||||
name: flutter_lints
|
name: flutter_lints
|
||||||
sha256: "3f41d009ba7172d5ff9be5f6e6e6abb4300e263aab8866d2a0842ed2a70f8f0c"
|
sha256: "3f41d009ba7172d5ff9be5f6e6e6abb4300e263aab8866d2a0842ed2a70f8f0c"
|
||||||
url: "https://pub.dev"
|
url: "https://pub.flutter-io.cn"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "4.0.0"
|
version: "4.0.0"
|
||||||
flutter_test:
|
flutter_test:
|
||||||
@@ -181,15 +253,23 @@ packages:
|
|||||||
description:
|
description:
|
||||||
name: go_router
|
name: go_router
|
||||||
sha256: f02fd7d2a4dc512fec615529824fdd217fecb3a3d3de68360293a551f21634b3
|
sha256: f02fd7d2a4dc512fec615529824fdd217fecb3a3d3de68360293a551f21634b3
|
||||||
url: "https://pub.dev"
|
url: "https://pub.flutter-io.cn"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "14.8.1"
|
version: "14.8.1"
|
||||||
|
hooks:
|
||||||
|
dependency: transitive
|
||||||
|
description:
|
||||||
|
name: hooks
|
||||||
|
sha256: "9a62a50b50b769a737bc0a8ff381f333529df3ab746b2f6b02e83760231455ba"
|
||||||
|
url: "https://pub.flutter-io.cn"
|
||||||
|
source: hosted
|
||||||
|
version: "2.0.2"
|
||||||
http:
|
http:
|
||||||
dependency: "direct main"
|
dependency: "direct main"
|
||||||
description:
|
description:
|
||||||
name: http
|
name: http
|
||||||
sha256: "87721a4a50b19c7f1d49001e51409bddc46303966ce89a65af4f4e6004896412"
|
sha256: "87721a4a50b19c7f1d49001e51409bddc46303966ce89a65af4f4e6004896412"
|
||||||
url: "https://pub.dev"
|
url: "https://pub.flutter-io.cn"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "1.6.0"
|
version: "1.6.0"
|
||||||
http_parser:
|
http_parser:
|
||||||
@@ -197,15 +277,31 @@ packages:
|
|||||||
description:
|
description:
|
||||||
name: http_parser
|
name: http_parser
|
||||||
sha256: "178d74305e7866013777bab2c3d8726205dc5a4dd935297175b19a23a2e66571"
|
sha256: "178d74305e7866013777bab2c3d8726205dc5a4dd935297175b19a23a2e66571"
|
||||||
url: "https://pub.dev"
|
url: "https://pub.flutter-io.cn"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "4.1.2"
|
version: "4.1.2"
|
||||||
|
jni:
|
||||||
|
dependency: transitive
|
||||||
|
description:
|
||||||
|
name: jni
|
||||||
|
sha256: c2230682d5bc2362c1c9e8d3c7f406d9cbba23ab3f2e203a025dd47e0fb2e68f
|
||||||
|
url: "https://pub.flutter-io.cn"
|
||||||
|
source: hosted
|
||||||
|
version: "1.0.0"
|
||||||
|
jni_flutter:
|
||||||
|
dependency: transitive
|
||||||
|
description:
|
||||||
|
name: jni_flutter
|
||||||
|
sha256: "8b59e590786050b1cd866677dddaf76b1ade5e7bc751abe04b86e84d379d3ba6"
|
||||||
|
url: "https://pub.flutter-io.cn"
|
||||||
|
source: hosted
|
||||||
|
version: "1.0.1"
|
||||||
leak_tracker:
|
leak_tracker:
|
||||||
dependency: transitive
|
dependency: transitive
|
||||||
description:
|
description:
|
||||||
name: leak_tracker
|
name: leak_tracker
|
||||||
sha256: "33e2e26bdd85a0112ec15400c8cbffea70d0f9c3407491f672a2fad47915e2de"
|
sha256: "33e2e26bdd85a0112ec15400c8cbffea70d0f9c3407491f672a2fad47915e2de"
|
||||||
url: "https://pub.dev"
|
url: "https://pub.flutter-io.cn"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "11.0.2"
|
version: "11.0.2"
|
||||||
leak_tracker_flutter_testing:
|
leak_tracker_flutter_testing:
|
||||||
@@ -213,7 +309,7 @@ packages:
|
|||||||
description:
|
description:
|
||||||
name: leak_tracker_flutter_testing
|
name: leak_tracker_flutter_testing
|
||||||
sha256: "1dbc140bb5a23c75ea9c4811222756104fbcd1a27173f0c34ca01e16bea473c1"
|
sha256: "1dbc140bb5a23c75ea9c4811222756104fbcd1a27173f0c34ca01e16bea473c1"
|
||||||
url: "https://pub.dev"
|
url: "https://pub.flutter-io.cn"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "3.0.10"
|
version: "3.0.10"
|
||||||
leak_tracker_testing:
|
leak_tracker_testing:
|
||||||
@@ -221,7 +317,7 @@ packages:
|
|||||||
description:
|
description:
|
||||||
name: leak_tracker_testing
|
name: leak_tracker_testing
|
||||||
sha256: "8d5a2d49f4a66b49744b23b018848400d23e54caf9463f4eb20df3eb8acb2eb1"
|
sha256: "8d5a2d49f4a66b49744b23b018848400d23e54caf9463f4eb20df3eb8acb2eb1"
|
||||||
url: "https://pub.dev"
|
url: "https://pub.flutter-io.cn"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "3.0.2"
|
version: "3.0.2"
|
||||||
lints:
|
lints:
|
||||||
@@ -229,7 +325,7 @@ packages:
|
|||||||
description:
|
description:
|
||||||
name: lints
|
name: lints
|
||||||
sha256: "976c774dd944a42e83e2467f4cc670daef7eed6295b10b36ae8c85bcbf828235"
|
sha256: "976c774dd944a42e83e2467f4cc670daef7eed6295b10b36ae8c85bcbf828235"
|
||||||
url: "https://pub.dev"
|
url: "https://pub.flutter-io.cn"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "4.0.0"
|
version: "4.0.0"
|
||||||
logging:
|
logging:
|
||||||
@@ -237,7 +333,7 @@ packages:
|
|||||||
description:
|
description:
|
||||||
name: logging
|
name: logging
|
||||||
sha256: c8245ada5f1717ed44271ed1c26b8ce85ca3228fd2ffdb75468ab01979309d61
|
sha256: c8245ada5f1717ed44271ed1c26b8ce85ca3228fd2ffdb75468ab01979309d61
|
||||||
url: "https://pub.dev"
|
url: "https://pub.flutter-io.cn"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "1.3.0"
|
version: "1.3.0"
|
||||||
matcher:
|
matcher:
|
||||||
@@ -245,7 +341,7 @@ packages:
|
|||||||
description:
|
description:
|
||||||
name: matcher
|
name: matcher
|
||||||
sha256: dc0b7dc7651697ea4ff3e69ef44b0407ea32c487a39fff6a4004fa585e901861
|
sha256: dc0b7dc7651697ea4ff3e69ef44b0407ea32c487a39fff6a4004fa585e901861
|
||||||
url: "https://pub.dev"
|
url: "https://pub.flutter-io.cn"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "0.12.19"
|
version: "0.12.19"
|
||||||
material_color_utilities:
|
material_color_utilities:
|
||||||
@@ -253,55 +349,95 @@ packages:
|
|||||||
description:
|
description:
|
||||||
name: material_color_utilities
|
name: material_color_utilities
|
||||||
sha256: "9c337007e82b1889149c82ed242ed1cb24a66044e30979c44912381e9be4c48b"
|
sha256: "9c337007e82b1889149c82ed242ed1cb24a66044e30979c44912381e9be4c48b"
|
||||||
url: "https://pub.dev"
|
url: "https://pub.flutter-io.cn"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "0.13.0"
|
version: "0.13.0"
|
||||||
meta:
|
meta:
|
||||||
dependency: transitive
|
dependency: transitive
|
||||||
description:
|
description:
|
||||||
name: meta
|
name: meta
|
||||||
sha256: "23f08335362185a5ea2ad3a4e597f1375e78bce8a040df5c600c8d3552ef2394"
|
sha256: "1741988757a65eb6b36abe716829688cf01910bbf91c34354ff7ec1c3de2b349"
|
||||||
url: "https://pub.dev"
|
url: "https://pub.flutter-io.cn"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "1.17.0"
|
version: "1.18.0"
|
||||||
nested:
|
nested:
|
||||||
dependency: transitive
|
dependency: transitive
|
||||||
description:
|
description:
|
||||||
name: nested
|
name: nested
|
||||||
sha256: "03bac4c528c64c95c722ec99280375a6f2fc708eec17c7b3f07253b626cd2a20"
|
sha256: "03bac4c528c64c95c722ec99280375a6f2fc708eec17c7b3f07253b626cd2a20"
|
||||||
url: "https://pub.dev"
|
url: "https://pub.flutter-io.cn"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "1.0.0"
|
version: "1.0.0"
|
||||||
|
objective_c:
|
||||||
|
dependency: transitive
|
||||||
|
description:
|
||||||
|
name: objective_c
|
||||||
|
sha256: "6cb691c686fa2838c6deb34980d426145c2a5d537491cb83d463c33cdbc726ed"
|
||||||
|
url: "https://pub.flutter-io.cn"
|
||||||
|
source: hosted
|
||||||
|
version: "9.4.1"
|
||||||
|
package_config:
|
||||||
|
dependency: transitive
|
||||||
|
description:
|
||||||
|
name: package_config
|
||||||
|
sha256: f096c55ebb7deb7e384101542bfba8c52696c1b56fca2eb62827989ef2353bbc
|
||||||
|
url: "https://pub.flutter-io.cn"
|
||||||
|
source: hosted
|
||||||
|
version: "2.2.0"
|
||||||
path:
|
path:
|
||||||
dependency: transitive
|
dependency: transitive
|
||||||
description:
|
description:
|
||||||
name: path
|
name: path
|
||||||
sha256: "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5"
|
sha256: "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5"
|
||||||
url: "https://pub.dev"
|
url: "https://pub.flutter-io.cn"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "1.9.1"
|
version: "1.9.1"
|
||||||
|
path_provider:
|
||||||
|
dependency: "direct main"
|
||||||
|
description:
|
||||||
|
name: path_provider
|
||||||
|
sha256: a7f4874f987173da295a61c181b8ee71dab59b332a486b391babf26a1b884825
|
||||||
|
url: "https://pub.flutter-io.cn"
|
||||||
|
source: hosted
|
||||||
|
version: "2.1.6"
|
||||||
|
path_provider_android:
|
||||||
|
dependency: transitive
|
||||||
|
description:
|
||||||
|
name: path_provider_android
|
||||||
|
sha256: "69cbd515a62b94d32a7944f086b2f82b4ac40a1d45bebfc00813a430ab2dabcd"
|
||||||
|
url: "https://pub.flutter-io.cn"
|
||||||
|
source: hosted
|
||||||
|
version: "2.3.1"
|
||||||
|
path_provider_foundation:
|
||||||
|
dependency: transitive
|
||||||
|
description:
|
||||||
|
name: path_provider_foundation
|
||||||
|
sha256: "2a376b7d6392d80cd3705782d2caa734ca4727776db0b6ec36ef3f1855197699"
|
||||||
|
url: "https://pub.flutter-io.cn"
|
||||||
|
source: hosted
|
||||||
|
version: "2.6.0"
|
||||||
path_provider_linux:
|
path_provider_linux:
|
||||||
dependency: transitive
|
dependency: transitive
|
||||||
description:
|
description:
|
||||||
name: path_provider_linux
|
name: path_provider_linux
|
||||||
sha256: f7a1fe3a634fe7734c8d3f2766ad746ae2a2884abe22e241a8b301bf5cac3279
|
sha256: "58c2005f147315b11e9b4a7bc889cd5203e250cba8e3f012dae259b4972b5c16"
|
||||||
url: "https://pub.dev"
|
url: "https://pub.flutter-io.cn"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "2.2.1"
|
version: "2.2.2"
|
||||||
path_provider_platform_interface:
|
path_provider_platform_interface:
|
||||||
dependency: transitive
|
dependency: transitive
|
||||||
description:
|
description:
|
||||||
name: path_provider_platform_interface
|
name: path_provider_platform_interface
|
||||||
sha256: "88f5779f72ba699763fa3a3b06aa4bf6de76c8e5de842cf6f29e2e06476c2334"
|
sha256: "484838772624c3a4b94f1e44a3e19897fee738f2d5c4ce448443b0417f7c9dda"
|
||||||
url: "https://pub.dev"
|
url: "https://pub.flutter-io.cn"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "2.1.2"
|
version: "2.1.3"
|
||||||
path_provider_windows:
|
path_provider_windows:
|
||||||
dependency: transitive
|
dependency: transitive
|
||||||
description:
|
description:
|
||||||
name: path_provider_windows
|
name: path_provider_windows
|
||||||
sha256: bd6f00dbd873bfb70d0761682da2b3a2c2fccc2b9e84c495821639601d81afe7
|
sha256: bd6f00dbd873bfb70d0761682da2b3a2c2fccc2b9e84c495821639601d81afe7
|
||||||
url: "https://pub.dev"
|
url: "https://pub.flutter-io.cn"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "2.3.0"
|
version: "2.3.0"
|
||||||
petitparser:
|
petitparser:
|
||||||
@@ -309,7 +445,7 @@ packages:
|
|||||||
description:
|
description:
|
||||||
name: petitparser
|
name: petitparser
|
||||||
sha256: "91bd59303e9f769f108f8df05e371341b15d59e995e6806aefab827b58336675"
|
sha256: "91bd59303e9f769f108f8df05e371341b15d59e995e6806aefab827b58336675"
|
||||||
url: "https://pub.dev"
|
url: "https://pub.flutter-io.cn"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "7.0.2"
|
version: "7.0.2"
|
||||||
platform:
|
platform:
|
||||||
@@ -317,7 +453,7 @@ packages:
|
|||||||
description:
|
description:
|
||||||
name: platform
|
name: platform
|
||||||
sha256: "5d6b1b0036a5f331ebc77c850ebc8506cbc1e9416c27e59b439f917a902a4984"
|
sha256: "5d6b1b0036a5f331ebc77c850ebc8506cbc1e9416c27e59b439f917a902a4984"
|
||||||
url: "https://pub.dev"
|
url: "https://pub.flutter-io.cn"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "3.1.6"
|
version: "3.1.6"
|
||||||
plugin_platform_interface:
|
plugin_platform_interface:
|
||||||
@@ -325,7 +461,7 @@ packages:
|
|||||||
description:
|
description:
|
||||||
name: plugin_platform_interface
|
name: plugin_platform_interface
|
||||||
sha256: "4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02"
|
sha256: "4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02"
|
||||||
url: "https://pub.dev"
|
url: "https://pub.flutter-io.cn"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "2.1.8"
|
version: "2.1.8"
|
||||||
provider:
|
provider:
|
||||||
@@ -333,39 +469,119 @@ packages:
|
|||||||
description:
|
description:
|
||||||
name: provider
|
name: provider
|
||||||
sha256: "4e82183fa20e5ca25703ead7e05de9e4cceed1fbd1eadc1ac3cb6f565a09f272"
|
sha256: "4e82183fa20e5ca25703ead7e05de9e4cceed1fbd1eadc1ac3cb6f565a09f272"
|
||||||
url: "https://pub.dev"
|
url: "https://pub.flutter-io.cn"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "6.1.5+1"
|
version: "6.1.5+1"
|
||||||
|
pub_semver:
|
||||||
|
dependency: transitive
|
||||||
|
description:
|
||||||
|
name: pub_semver
|
||||||
|
sha256: "5bfcf68ca79ef689f8990d1160781b4bad40a3bd5e5218ad4076ddb7f4081585"
|
||||||
|
url: "https://pub.flutter-io.cn"
|
||||||
|
source: hosted
|
||||||
|
version: "2.2.0"
|
||||||
|
record:
|
||||||
|
dependency: "direct main"
|
||||||
|
description:
|
||||||
|
name: record
|
||||||
|
sha256: "10911465138fafacef459a780564e883e01bd48eabf87ab20543684884492870"
|
||||||
|
url: "https://pub.flutter-io.cn"
|
||||||
|
source: hosted
|
||||||
|
version: "6.2.1"
|
||||||
|
record_android:
|
||||||
|
dependency: transitive
|
||||||
|
description:
|
||||||
|
name: record_android
|
||||||
|
sha256: eb1732e42d0d2a1895b8db86e4fc917287e6d8491b6ed59918aea8bed6c69de4
|
||||||
|
url: "https://pub.flutter-io.cn"
|
||||||
|
source: hosted
|
||||||
|
version: "1.5.2"
|
||||||
|
record_ios:
|
||||||
|
dependency: transitive
|
||||||
|
description:
|
||||||
|
name: record_ios
|
||||||
|
sha256: c051fb48edd7a0e265daafb9108730dc827c27b551728a3fdfb3ef69efd89c73
|
||||||
|
url: "https://pub.flutter-io.cn"
|
||||||
|
source: hosted
|
||||||
|
version: "1.2.1"
|
||||||
|
record_linux:
|
||||||
|
dependency: transitive
|
||||||
|
description:
|
||||||
|
name: record_linux
|
||||||
|
sha256: "31181787bf7eccb0e298835836b69b3cd0a903863b75d70e937de3dec71cd8f3"
|
||||||
|
url: "https://pub.flutter-io.cn"
|
||||||
|
source: hosted
|
||||||
|
version: "1.3.1"
|
||||||
|
record_macos:
|
||||||
|
dependency: transitive
|
||||||
|
description:
|
||||||
|
name: record_macos
|
||||||
|
sha256: cfe1b61435e27db418bf513dc36820d10c9f7eb1843786c2c9a52e07e2f4f627
|
||||||
|
url: "https://pub.flutter-io.cn"
|
||||||
|
source: hosted
|
||||||
|
version: "1.2.2"
|
||||||
|
record_platform_interface:
|
||||||
|
dependency: transitive
|
||||||
|
description:
|
||||||
|
name: record_platform_interface
|
||||||
|
sha256: "8e56cbe06c6984137fb86132ff03459f29938d927496d9b2d0962e2d6345d488"
|
||||||
|
url: "https://pub.flutter-io.cn"
|
||||||
|
source: hosted
|
||||||
|
version: "1.6.0"
|
||||||
|
record_use:
|
||||||
|
dependency: transitive
|
||||||
|
description:
|
||||||
|
name: record_use
|
||||||
|
sha256: "2551bd8eecfe95d14ae75f6021ad0248be5c27f138c2ec12fcb52b500b3ba1ed"
|
||||||
|
url: "https://pub.flutter-io.cn"
|
||||||
|
source: hosted
|
||||||
|
version: "0.6.0"
|
||||||
|
record_web:
|
||||||
|
dependency: transitive
|
||||||
|
description:
|
||||||
|
name: record_web
|
||||||
|
sha256: "7e9846981c1f2d111d86f0ae3309071f5bba8b624d1c977316706f08fc31d16d"
|
||||||
|
url: "https://pub.flutter-io.cn"
|
||||||
|
source: hosted
|
||||||
|
version: "1.3.0"
|
||||||
|
record_windows:
|
||||||
|
dependency: transitive
|
||||||
|
description:
|
||||||
|
name: record_windows
|
||||||
|
sha256: "223258060a1d25c62bae18282c16783f28581ec19401d17e56b5205b9f039d78"
|
||||||
|
url: "https://pub.flutter-io.cn"
|
||||||
|
source: hosted
|
||||||
|
version: "1.0.7"
|
||||||
rxdart:
|
rxdart:
|
||||||
dependency: transitive
|
dependency: transitive
|
||||||
description:
|
description:
|
||||||
name: rxdart
|
name: rxdart
|
||||||
sha256: "5c3004a4a8dbb94bd4bf5412a4def4acdaa12e12f269737a5751369e12d1a962"
|
sha256: "5c3004a4a8dbb94bd4bf5412a4def4acdaa12e12f269737a5751369e12d1a962"
|
||||||
url: "https://pub.dev"
|
url: "https://pub.flutter-io.cn"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "0.28.0"
|
version: "0.28.0"
|
||||||
shared_preferences:
|
shared_preferences:
|
||||||
dependency: "direct main"
|
dependency: "direct main"
|
||||||
description:
|
description:
|
||||||
name: shared_preferences
|
name: shared_preferences
|
||||||
sha256: "2939ae520c9024cb197fc20dee269cd8cdbf564c8b5746374ec6cacdc5169e64"
|
sha256: c3025c5534b01739267eb7d76959bbc25a6d10f6988e1c2a3036940133dd10bf
|
||||||
url: "https://pub.dev"
|
url: "https://pub.flutter-io.cn"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "2.5.4"
|
version: "2.5.5"
|
||||||
shared_preferences_android:
|
shared_preferences_android:
|
||||||
dependency: transitive
|
dependency: transitive
|
||||||
description:
|
description:
|
||||||
name: shared_preferences_android
|
name: shared_preferences_android
|
||||||
sha256: "8374d6200ab33ac99031a852eba4c8eb2170c4bf20778b3e2c9eccb45384fb41"
|
sha256: "93ae5884a9df5d3bb696825bceb3a17590754548b5d740eba51500afc8d088f5"
|
||||||
url: "https://pub.dev"
|
url: "https://pub.flutter-io.cn"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "2.4.21"
|
version: "2.4.26"
|
||||||
shared_preferences_foundation:
|
shared_preferences_foundation:
|
||||||
dependency: transitive
|
dependency: transitive
|
||||||
description:
|
description:
|
||||||
name: shared_preferences_foundation
|
name: shared_preferences_foundation
|
||||||
sha256: "4e7eaffc2b17ba398759f1151415869a34771ba11ebbccd1b0145472a619a64f"
|
sha256: "4e7eaffc2b17ba398759f1151415869a34771ba11ebbccd1b0145472a619a64f"
|
||||||
url: "https://pub.dev"
|
url: "https://pub.flutter-io.cn"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "2.5.6"
|
version: "2.5.6"
|
||||||
shared_preferences_linux:
|
shared_preferences_linux:
|
||||||
@@ -373,23 +589,23 @@ packages:
|
|||||||
description:
|
description:
|
||||||
name: shared_preferences_linux
|
name: shared_preferences_linux
|
||||||
sha256: "580abfd40f415611503cae30adf626e6656dfb2f0cee8f465ece7b6defb40f2f"
|
sha256: "580abfd40f415611503cae30adf626e6656dfb2f0cee8f465ece7b6defb40f2f"
|
||||||
url: "https://pub.dev"
|
url: "https://pub.flutter-io.cn"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "2.4.1"
|
version: "2.4.1"
|
||||||
shared_preferences_platform_interface:
|
shared_preferences_platform_interface:
|
||||||
dependency: transitive
|
dependency: transitive
|
||||||
description:
|
description:
|
||||||
name: shared_preferences_platform_interface
|
name: shared_preferences_platform_interface
|
||||||
sha256: "57cbf196c486bc2cf1f02b85784932c6094376284b3ad5779d1b1c6c6a816b80"
|
sha256: "649dc798a33931919ea356c4305c2d1f81619ea6e92244070b520187b5140ef9"
|
||||||
url: "https://pub.dev"
|
url: "https://pub.flutter-io.cn"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "2.4.1"
|
version: "2.4.2"
|
||||||
shared_preferences_web:
|
shared_preferences_web:
|
||||||
dependency: transitive
|
dependency: transitive
|
||||||
description:
|
description:
|
||||||
name: shared_preferences_web
|
name: shared_preferences_web
|
||||||
sha256: c49bd060261c9a3f0ff445892695d6212ff603ef3115edbb448509d407600019
|
sha256: c49bd060261c9a3f0ff445892695d6212ff603ef3115edbb448509d407600019
|
||||||
url: "https://pub.dev"
|
url: "https://pub.flutter-io.cn"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "2.4.3"
|
version: "2.4.3"
|
||||||
shared_preferences_windows:
|
shared_preferences_windows:
|
||||||
@@ -397,7 +613,7 @@ packages:
|
|||||||
description:
|
description:
|
||||||
name: shared_preferences_windows
|
name: shared_preferences_windows
|
||||||
sha256: "94ef0f72b2d71bc3e700e025db3710911bd51a71cefb65cc609dd0d9a982e3c1"
|
sha256: "94ef0f72b2d71bc3e700e025db3710911bd51a71cefb65cc609dd0d9a982e3c1"
|
||||||
url: "https://pub.dev"
|
url: "https://pub.flutter-io.cn"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "2.4.1"
|
version: "2.4.1"
|
||||||
sky_engine:
|
sky_engine:
|
||||||
@@ -410,7 +626,7 @@ packages:
|
|||||||
description:
|
description:
|
||||||
name: source_span
|
name: source_span
|
||||||
sha256: "56a02f1f4cd1a2d96303c0144c93bd6d909eea6bee6bf5a0e0b685edbd4c47ab"
|
sha256: "56a02f1f4cd1a2d96303c0144c93bd6d909eea6bee6bf5a0e0b685edbd4c47ab"
|
||||||
url: "https://pub.dev"
|
url: "https://pub.flutter-io.cn"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "1.10.2"
|
version: "1.10.2"
|
||||||
stack_trace:
|
stack_trace:
|
||||||
@@ -418,7 +634,7 @@ packages:
|
|||||||
description:
|
description:
|
||||||
name: stack_trace
|
name: stack_trace
|
||||||
sha256: "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1"
|
sha256: "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1"
|
||||||
url: "https://pub.dev"
|
url: "https://pub.flutter-io.cn"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "1.12.1"
|
version: "1.12.1"
|
||||||
stream_channel:
|
stream_channel:
|
||||||
@@ -426,7 +642,7 @@ packages:
|
|||||||
description:
|
description:
|
||||||
name: stream_channel
|
name: stream_channel
|
||||||
sha256: "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d"
|
sha256: "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d"
|
||||||
url: "https://pub.dev"
|
url: "https://pub.flutter-io.cn"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "2.1.4"
|
version: "2.1.4"
|
||||||
string_scanner:
|
string_scanner:
|
||||||
@@ -434,55 +650,71 @@ packages:
|
|||||||
description:
|
description:
|
||||||
name: string_scanner
|
name: string_scanner
|
||||||
sha256: "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43"
|
sha256: "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43"
|
||||||
url: "https://pub.dev"
|
url: "https://pub.flutter-io.cn"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "1.4.1"
|
version: "1.4.1"
|
||||||
|
synchronized:
|
||||||
|
dependency: transitive
|
||||||
|
description:
|
||||||
|
name: synchronized
|
||||||
|
sha256: "93b153dcb6a26dcddee6ca087dd634b53e38c10b5aa163e8e49501a776456153"
|
||||||
|
url: "https://pub.flutter-io.cn"
|
||||||
|
source: hosted
|
||||||
|
version: "3.4.1"
|
||||||
term_glyph:
|
term_glyph:
|
||||||
dependency: transitive
|
dependency: transitive
|
||||||
description:
|
description:
|
||||||
name: term_glyph
|
name: term_glyph
|
||||||
sha256: "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e"
|
sha256: "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e"
|
||||||
url: "https://pub.dev"
|
url: "https://pub.flutter-io.cn"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "1.2.2"
|
version: "1.2.2"
|
||||||
test_api:
|
test_api:
|
||||||
dependency: transitive
|
dependency: transitive
|
||||||
description:
|
description:
|
||||||
name: test_api
|
name: test_api
|
||||||
sha256: "8161c84903fd860b26bfdefb7963b3f0b68fee7adea0f59ef805ecca346f0c7a"
|
sha256: "949a932224383300f01be9221c39180316445ecb8e7547f70a41a35bf421fb9e"
|
||||||
url: "https://pub.dev"
|
url: "https://pub.flutter-io.cn"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "0.7.10"
|
version: "0.7.11"
|
||||||
typed_data:
|
typed_data:
|
||||||
dependency: transitive
|
dependency: transitive
|
||||||
description:
|
description:
|
||||||
name: typed_data
|
name: typed_data
|
||||||
sha256: f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006
|
sha256: f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006
|
||||||
url: "https://pub.dev"
|
url: "https://pub.flutter-io.cn"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "1.4.0"
|
version: "1.4.0"
|
||||||
|
uuid:
|
||||||
|
dependency: transitive
|
||||||
|
description:
|
||||||
|
name: uuid
|
||||||
|
sha256: "1fef9e8e11e2991bb773070d4656b7bd5d850967a2456cfc83cf47925ba79489"
|
||||||
|
url: "https://pub.flutter-io.cn"
|
||||||
|
source: hosted
|
||||||
|
version: "4.5.3"
|
||||||
vector_math:
|
vector_math:
|
||||||
dependency: transitive
|
dependency: transitive
|
||||||
description:
|
description:
|
||||||
name: vector_math
|
name: vector_math
|
||||||
sha256: d530bd74fea330e6e364cda7a85019c434070188383e1cd8d9777ee586914c5b
|
sha256: d530bd74fea330e6e364cda7a85019c434070188383e1cd8d9777ee586914c5b
|
||||||
url: "https://pub.dev"
|
url: "https://pub.flutter-io.cn"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "2.2.0"
|
version: "2.2.0"
|
||||||
vm_service:
|
vm_service:
|
||||||
dependency: transitive
|
dependency: transitive
|
||||||
description:
|
description:
|
||||||
name: vm_service
|
name: vm_service
|
||||||
sha256: "45caa6c5917fa127b5dbcfbd1fa60b14e583afdc08bfc96dda38886ca252eb60"
|
sha256: "0016aef94fc66495ac78af5859181e3f3bf2026bd8eecc72b9565601e19ab360"
|
||||||
url: "https://pub.dev"
|
url: "https://pub.flutter-io.cn"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "15.0.2"
|
version: "15.2.0"
|
||||||
web:
|
web:
|
||||||
dependency: transitive
|
dependency: transitive
|
||||||
description:
|
description:
|
||||||
name: web
|
name: web
|
||||||
sha256: "868d88a33d8a87b18ffc05f9f030ba328ffefba92d6c127917a2ba740f9cfe4a"
|
sha256: "868d88a33d8a87b18ffc05f9f030ba328ffefba92d6c127917a2ba740f9cfe4a"
|
||||||
url: "https://pub.dev"
|
url: "https://pub.flutter-io.cn"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "1.1.1"
|
version: "1.1.1"
|
||||||
web_socket:
|
web_socket:
|
||||||
@@ -490,7 +722,7 @@ packages:
|
|||||||
description:
|
description:
|
||||||
name: web_socket
|
name: web_socket
|
||||||
sha256: "34d64019aa8e36bf9842ac014bb5d2f5586ca73df5e4d9bf5c936975cae6982c"
|
sha256: "34d64019aa8e36bf9842ac014bb5d2f5586ca73df5e4d9bf5c936975cae6982c"
|
||||||
url: "https://pub.dev"
|
url: "https://pub.flutter-io.cn"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "1.0.1"
|
version: "1.0.1"
|
||||||
web_socket_channel:
|
web_socket_channel:
|
||||||
@@ -498,7 +730,7 @@ packages:
|
|||||||
description:
|
description:
|
||||||
name: web_socket_channel
|
name: web_socket_channel
|
||||||
sha256: d645757fb0f4773d602444000a8131ff5d48c9e47adfe9772652dd1a4f2d45c8
|
sha256: d645757fb0f4773d602444000a8131ff5d48c9e47adfe9772652dd1a4f2d45c8
|
||||||
url: "https://pub.dev"
|
url: "https://pub.flutter-io.cn"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "3.0.3"
|
version: "3.0.3"
|
||||||
xdg_directories:
|
xdg_directories:
|
||||||
@@ -506,7 +738,7 @@ packages:
|
|||||||
description:
|
description:
|
||||||
name: xdg_directories
|
name: xdg_directories
|
||||||
sha256: "7a3f37b05d989967cdddcbb571f1ea834867ae2faa29725fd085180e0883aa15"
|
sha256: "7a3f37b05d989967cdddcbb571f1ea834867ae2faa29725fd085180e0883aa15"
|
||||||
url: "https://pub.dev"
|
url: "https://pub.flutter-io.cn"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "1.1.0"
|
version: "1.1.0"
|
||||||
xml:
|
xml:
|
||||||
@@ -514,9 +746,17 @@ packages:
|
|||||||
description:
|
description:
|
||||||
name: xml
|
name: xml
|
||||||
sha256: "971043b3a0d3da28727e40ed3e0b5d18b742fa5a68665cca88e74b7876d5e025"
|
sha256: "971043b3a0d3da28727e40ed3e0b5d18b742fa5a68665cca88e74b7876d5e025"
|
||||||
url: "https://pub.dev"
|
url: "https://pub.flutter-io.cn"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "6.6.1"
|
version: "6.6.1"
|
||||||
|
yaml:
|
||||||
|
dependency: transitive
|
||||||
|
description:
|
||||||
|
name: yaml
|
||||||
|
sha256: b9da305ac7c39faa3f030eccd175340f968459dae4af175130b3fc47e40d76ce
|
||||||
|
url: "https://pub.flutter-io.cn"
|
||||||
|
source: hosted
|
||||||
|
version: "3.1.3"
|
||||||
sdks:
|
sdks:
|
||||||
dart: ">=3.9.0 <4.0.0"
|
dart: ">=3.12.0 <4.0.0"
|
||||||
flutter: ">=3.35.0"
|
flutter: ">=3.44.0"
|
||||||
|
|||||||
@@ -2,7 +2,7 @@ name: showen_v2_flutter
|
|||||||
description: ShowenV2 cross-platform mobile controller.
|
description: ShowenV2 cross-platform mobile controller.
|
||||||
publish_to: 'none'
|
publish_to: 'none'
|
||||||
|
|
||||||
version: 0.1.0+1
|
version: 0.4.0+4
|
||||||
|
|
||||||
environment:
|
environment:
|
||||||
sdk: '>=3.3.0 <4.0.0'
|
sdk: '>=3.3.0 <4.0.0'
|
||||||
@@ -17,6 +17,9 @@ dependencies:
|
|||||||
provider: ^6.1.2
|
provider: ^6.1.2
|
||||||
web_socket_channel: ^3.0.1
|
web_socket_channel: ^3.0.1
|
||||||
shared_preferences: ^2.3.0
|
shared_preferences: ^2.3.0
|
||||||
|
record: ^6.0.0
|
||||||
|
audioplayers: ^6.1.0
|
||||||
|
path_provider: ^2.1.5
|
||||||
|
|
||||||
dev_dependencies:
|
dev_dependencies:
|
||||||
flutter_test:
|
flutter_test:
|
||||||
|
|||||||
90
clients/flutter/test/models/m2_models_test.dart
Normal file
90
clients/flutter/test/models/m2_models_test.dart
Normal file
@@ -0,0 +1,90 @@
|
|||||||
|
import 'package:flutter_test/flutter_test.dart';
|
||||||
|
import 'package:showen_v2_flutter/models/ai_model.dart';
|
||||||
|
import 'package:showen_v2_flutter/models/character_pack.dart';
|
||||||
|
import 'package:showen_v2_flutter/models/chat_models.dart';
|
||||||
|
|
||||||
|
void main() {
|
||||||
|
group('CharacterPack / AvailableConfigs', () {
|
||||||
|
test('parses M2.1 config available payload', () {
|
||||||
|
final snapshot = AvailableConfigs.fromJson({
|
||||||
|
'active': 'dog_state_machine.json',
|
||||||
|
'configs': [
|
||||||
|
{
|
||||||
|
'filename': 'dog_state_machine.json',
|
||||||
|
'character': {
|
||||||
|
'name': '小狗',
|
||||||
|
'character_type': 'pet',
|
||||||
|
'render_type': 'video',
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
'filename': 'live2d_demo.json',
|
||||||
|
'character': {
|
||||||
|
'name': 'Live2D',
|
||||||
|
'character_type': 'live2d',
|
||||||
|
'render_type': 'live2d',
|
||||||
|
'live2d_model': 'Hiyori',
|
||||||
|
},
|
||||||
|
},
|
||||||
|
],
|
||||||
|
});
|
||||||
|
|
||||||
|
expect(snapshot.active, 'dog_state_machine.json');
|
||||||
|
expect(snapshot.configs, hasLength(2));
|
||||||
|
expect(snapshot.configs.first.name, '小狗');
|
||||||
|
expect(snapshot.configs.first.typeLabel, '宠物');
|
||||||
|
expect(snapshot.configs.last.isLive2d, isTrue);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
group('ChatTurnResponse', () {
|
||||||
|
test('parses success and error responses', () {
|
||||||
|
final ok = ChatTurnResponse.fromJson({
|
||||||
|
'session_id': 'app_1',
|
||||||
|
'transcription': '你好',
|
||||||
|
'reply_text': '汪!',
|
||||||
|
'reply_audio_path': '/tmp/tts.wav',
|
||||||
|
'error': null,
|
||||||
|
});
|
||||||
|
expect(ok.isOk, isTrue);
|
||||||
|
expect(ok.replyText, '汪!');
|
||||||
|
expect(ok.replyAudioPath, '/tmp/tts.wav');
|
||||||
|
|
||||||
|
final err = ChatTurnResponse.fromJson({
|
||||||
|
'session_id': '',
|
||||||
|
'reply_text': '',
|
||||||
|
'error': 'AI 插件未就绪',
|
||||||
|
});
|
||||||
|
expect(err.isOk, isFalse);
|
||||||
|
expect(err.error, 'AI 插件未就绪');
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
group('ModelsSnapshot', () {
|
||||||
|
test('parses model list and active map', () {
|
||||||
|
final snapshot = ModelsSnapshot.fromJson({
|
||||||
|
'models': [
|
||||||
|
{
|
||||||
|
'id': 'qwen2.5-0.5b-q4_k_m',
|
||||||
|
'kind': 'llm',
|
||||||
|
'name': 'Qwen2.5 0.5B',
|
||||||
|
'version': '1',
|
||||||
|
'size': 400000000,
|
||||||
|
'memory_required': 1000000000,
|
||||||
|
'recommended_tier': '4G',
|
||||||
|
'downloaded': true,
|
||||||
|
'download_progress': 100,
|
||||||
|
},
|
||||||
|
],
|
||||||
|
'active': {'llm': 'qwen2.5-0.5b-q4_k_m', 'asr': 'whisper-tiny'},
|
||||||
|
'used_space': 500000000,
|
||||||
|
'quota': 4000000000,
|
||||||
|
});
|
||||||
|
|
||||||
|
expect(snapshot.models, hasLength(1));
|
||||||
|
expect(snapshot.isActive(snapshot.models.first), isTrue);
|
||||||
|
expect(snapshot.usageRatio, closeTo(0.125, 0.001));
|
||||||
|
expect(snapshot.models.first.kindLabel, 'LLM');
|
||||||
|
});
|
||||||
|
});
|
||||||
|
}
|
||||||
1191
configs/live2d_anime.json
Normal file
1191
configs/live2d_anime.json
Normal file
File diff suppressed because it is too large
Load Diff
204
docs/PLAN_M2.1_NEXT.md
Normal file
204
docs/PLAN_M2.1_NEXT.md
Normal file
@@ -0,0 +1,204 @@
|
|||||||
|
# M2.1 下一阶段实施计划
|
||||||
|
|
||||||
|
> 创建:2026-07-09
|
||||||
|
> 背景:功能不完善;AI 与 Live2D/视频**尚未完整联动**;App/Web 为半成品。
|
||||||
|
> 对照:`docs/STATUS.md`(现状)· `docs/M2.1_PRD.md`(产品定义)
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 0. 目标(本阶段完成的定义)
|
||||||
|
|
||||||
|
**可演示的闭环(P0 验收)**
|
||||||
|
|
||||||
|
1. 设备开机 → App/Web 可连
|
||||||
|
2. 切换角色(至少狗/猫/Live2D 配置)→ 画面与人设同步
|
||||||
|
3. 文字对话 → 客户端播 TTS → **画面有“在说话”反馈**
|
||||||
|
4. App 按住说话 → 同上
|
||||||
|
5. 模型列表可见;切换 LLM 后下一回合生效(失败有明确提示)
|
||||||
|
|
||||||
|
**不做本阶段(明确边界)**
|
||||||
|
|
||||||
|
- 设备本机麦克风/扬声器直连(硬件未接)
|
||||||
|
- 精细口型同步 / 流式打断
|
||||||
|
- 数字人/歌姬全套新视频素材制作
|
||||||
|
- 云端 LLM 实装
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 1. 现状结论(计划前提)
|
||||||
|
|
||||||
|
| 层 | 现状 |
|
||||||
|
|----|------|
|
||||||
|
| AI 管线 | 本地 ASR/LLM/TTS 可跑;HTTP `/api/chat/*` 可用 |
|
||||||
|
| Live2D | 有字幕 `Subtitle`;`live2d_talking` 标志在 HTTP 内,**未驱动嘴部动画** |
|
||||||
|
| 视频状态机 | 有 `talk_state` 配置字段;**对话不会 ChangeScene** |
|
||||||
|
| App | 角色/对话/模型页已写;真机旅程未系统验 |
|
||||||
|
| Web | chat 控制台有入口;HTTP 录音受限 |
|
||||||
|
| 仓库 | 2026-07-09 已提交整理与骨架改动(见 git log) |
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 2. 工作包拆分
|
||||||
|
|
||||||
|
### WP-A · AI ↔ 画面联动(核心缺口)
|
||||||
|
|
||||||
|
**A1. Live2D 说话态接通(优先)**
|
||||||
|
|
||||||
|
| 步骤 | 内容 | 验收 |
|
||||||
|
|------|------|------|
|
||||||
|
| A1.1 | 定义共享通道:消息 `Message::Live2dTalking { on: bool }` **或** 注入 Arc 状态到 Live2D 插件 | 二选一,文档写清 |
|
||||||
|
| A1.2 | HTTP chat 成功路径:开始 `talking=true`,结束按**音频时长或字数**回 `false` | 与 TTS 结束大致对齐(误差 ≤1.5s 可接受) |
|
||||||
|
| A1.3 | Live2D 渲染循环读 talking → `animation.set_talking` | 说话时嘴部开合,结束后回 idle |
|
||||||
|
| A1.4 | 字幕路径保持:`Subtitle` 继续走 | 字+嘴同时有反馈 |
|
||||||
|
|
||||||
|
**A2. 视频角色 talk 状态(次优先)**
|
||||||
|
|
||||||
|
| 步骤 | 内容 | 验收 |
|
||||||
|
|------|------|------|
|
||||||
|
| A2.1 | chat 开始:向 video 发 `ChangeScene(config.character.talk_state)` 或等价 trigger | 有 talk 片段则切过去 |
|
||||||
|
| A2.2 | chat 结束:回 `idle`(或配置的默认态) | 不卡在 talk |
|
||||||
|
| A2.3 | 无 talk 状态时优雅降级(日志 + 保持当前态,不 500) | 猫狗旧包不炸 |
|
||||||
|
|
||||||
|
**A3. 时长与互斥**
|
||||||
|
|
||||||
|
| 步骤 | 内容 |
|
||||||
|
|------|------|
|
||||||
|
| A3.1 | 优先用回复音频时长驱动 talking 窗口;无音频则字数估算 |
|
||||||
|
| A3.2 | 对话进行中拒绝二次对话 / 切角色(或排队策略写死一种) |
|
||||||
|
|
||||||
|
**负责建议**:内核/HTTP(张明远 or 王浩然)+ Live2D/视频(李思琪)
|
||||||
|
**预估**:A1 1~2 天 · A2 1 天 · A3 0.5 天
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
### WP-B · 设备对齐与回归
|
||||||
|
|
||||||
|
| 步骤 | 内容 | 验收 |
|
||||||
|
|------|------|------|
|
||||||
|
| B1 | 本机已提交代码同步到设备 `192.168.31.105` | git 一致或 rsync 可追溯 |
|
||||||
|
| B2 | `cargo check --workspace --all-targets` 零 warning | 贴输出 |
|
||||||
|
| B3 | `cargo test --workspace` 全绿 | 贴输出 |
|
||||||
|
| B4 | `systemctl --user restart showen_v2` + BLE ActiveInstances=1 | 服务稳定 |
|
||||||
|
| B5 | `POST /api/chat/text` 冒烟 | 有 reply_text;Live2D 有嘴/字幕 |
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
### WP-C · App 真机验收与修补
|
||||||
|
|
||||||
|
| 步骤 | 内容 | 验收 |
|
||||||
|
|------|------|------|
|
||||||
|
| C1 | 安装 debug APK,配置 `192.168.31.105:5000` | 能连 |
|
||||||
|
| C2 | 角色页切换 3 套配置 | 画面+人设变 |
|
||||||
|
| C3 | 文字对话 + 自动播 TTS + 重播 | 有声有字 |
|
||||||
|
| C4 | 按住说话一轮 | 转写+回复(允许慢) |
|
||||||
|
| C5 | 模型页列表/切换 | 失败有文案 |
|
||||||
|
| C6 | 按失败项修 Flutter(超时、503、权限) | 不再静默失败 |
|
||||||
|
|
||||||
|
**依赖**:WP-A 至少完成 A1 后再验“说话联动”。
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
### WP-D · Web 验收与修补
|
||||||
|
|
||||||
|
| 步骤 | 内容 |
|
||||||
|
|------|------|
|
||||||
|
| D1 | 角色/文字对话/模型三页真机点通 |
|
||||||
|
| D2 | HTTP 下录音禁用时的固定文案(与 PRD 一致) |
|
||||||
|
| D3 | 切角色清空会话上下文 |
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
### WP-E · 产品化收尾(P1,A~D 之后)
|
||||||
|
|
||||||
|
| 步骤 | 内容 |
|
||||||
|
|------|------|
|
||||||
|
| E1 | App 对话历史本地持久化 + 一键清空 |
|
||||||
|
| E2 | 模型下载进度轮询/失败重试 UX |
|
||||||
|
| E3 | release APK 签名与安装说明 |
|
||||||
|
| E4 | M1.2 tag `m1.2`(老板) |
|
||||||
|
| E5 | 素材:数字人/歌姬 talk/idle(外部依赖,可并行) |
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 3. 推荐执行顺序
|
||||||
|
|
||||||
|
```text
|
||||||
|
Day 0 本计划评审(老板/CEO)
|
||||||
|
Day 1 WP-A1 Live2D talking 接通 + B 设备同步回归
|
||||||
|
Day 2 WP-A2 视频 talk 降级策略 + A3 互斥
|
||||||
|
Day 3 WP-C App 真机四旅程 + 修洞
|
||||||
|
Day 4 WP-D Web 点通 + 文档 STATUS 更新
|
||||||
|
Day 5+ WP-E 按优先级穿插
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 4. 技术要点备忘(实现时)
|
||||||
|
|
||||||
|
### 4.1 Live2D talking 推荐实现
|
||||||
|
|
||||||
|
```
|
||||||
|
HTTP chat 开始
|
||||||
|
→ state.set_live2d_talking(true)
|
||||||
|
→ tx.send(Message::Live2dTalking { on: true }) // 或等价
|
||||||
|
→ tx.send(Message::Subtitle { text })
|
||||||
|
|
||||||
|
Live2DPlugin::handle_message
|
||||||
|
→ renderer.set_talking(on)
|
||||||
|
|
||||||
|
HTTP chat 结束(spawn 延迟)
|
||||||
|
→ set_live2d_talking(false) + Live2dTalking { on: false }
|
||||||
|
```
|
||||||
|
|
||||||
|
避免 Live2D 去轮询 HTTP 内部 AtomicBool(跨插件耦合差)。
|
||||||
|
|
||||||
|
### 4.2 视频 talk
|
||||||
|
|
||||||
|
```
|
||||||
|
render_type == video 时:
|
||||||
|
chat 开始 → PlayerCommand::ChangeScene(talk_state)
|
||||||
|
chat 结束 → ChangeScene("idle") // 或配置 default_idle
|
||||||
|
无该 scene 时: 忽略并 log,不返回 5xx
|
||||||
|
```
|
||||||
|
|
||||||
|
### 4.3 验证命令(设备)
|
||||||
|
|
||||||
|
```bash
|
||||||
|
ssh -p 2222 showen@192.168.31.105
|
||||||
|
systemctl --user status showen_v2
|
||||||
|
curl -sS -m 60 -X POST http://127.0.0.1:5000/api/chat/text \
|
||||||
|
-H 'Content-Type: application/json' \
|
||||||
|
-d '{"text":"你好","session_id":"plan_test"}'
|
||||||
|
# 同时观察 Live2D 嘴部与字幕
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 5. 风险
|
||||||
|
|
||||||
|
| 风险 | 应对 |
|
||||||
|
|------|------|
|
||||||
|
| 对话延迟 5~15s 体感差 | 先保证正确联动;优化单独立项(锁核/更小模型) |
|
||||||
|
| 宠物包无 talk 片段 | 强制降级,不阻塞 Live2D 路径 |
|
||||||
|
| 设备与 git 漂移 | B1 强制对齐后再验 |
|
||||||
|
| 录音权限/机型差异 | App 明确权限引导;失败可走文字 |
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 6. 完成检查清单(勾选)
|
||||||
|
|
||||||
|
- [ ] Live2D:对话时嘴部动画 + 字幕
|
||||||
|
- [ ] 视频:有 talk 则切 talk,无则降级
|
||||||
|
- [ ] App:角色 / 文字 / 语音 / 模型 四旅程通过
|
||||||
|
- [ ] Web:角色 / 文字对话 / 模型通过
|
||||||
|
- [ ] 设备 `cargo test --workspace` 全绿
|
||||||
|
- [ ] `docs/STATUS.md` 矩阵更新为与实机一致
|
||||||
|
- [ ] (可选)release APK
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 7. 变更记录
|
||||||
|
|
||||||
|
| 日期 | 说明 |
|
||||||
|
|------|------|
|
||||||
|
| 2026-07-09 | 初稿:联动缺口 + 分 WP 计划;对应 git 提交含骨架与整理 |
|
||||||
170
docs/STATUS.md
Normal file
170
docs/STATUS.md
Normal file
@@ -0,0 +1,170 @@
|
|||||||
|
# ShowenV2 项目现状板
|
||||||
|
|
||||||
|
> **更新:2026-07-09**
|
||||||
|
> 用途:一页看清「能干什么 / 不能干什么 / 下一步做什么」。
|
||||||
|
> 操作派发仍以 `CLAUDE.md` 为 CEO 手册;本文件是**功能成熟度**权威清单。
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 1. 里程碑总览
|
||||||
|
|
||||||
|
| 里程碑 | 状态 | 说明 |
|
||||||
|
|--------|------|------|
|
||||||
|
| **M1.1** | ✅ 完成 | 插件微内核、视频/设备/HTTP/BLE/WiFi 骨架 |
|
||||||
|
| **M1.2** | ✅ 验收通过 | 目标机 147/147 测试全绿;仅差老板打 tag `m1.2` |
|
||||||
|
| **M2.1** | 🟡 **进行中(半成品)** | 语音数字生命 V1:后端/网页/App 已有骨架,**体验与验收未闭环** |
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 2. 仓库结构(整理后)
|
||||||
|
|
||||||
|
```
|
||||||
|
ShowenV2/
|
||||||
|
├── CLAUDE.md # CEO 操作手册(派发/铁律/当前状态)
|
||||||
|
├── README.md # 架构与快速开始
|
||||||
|
├── PROGRESS.md # 里程碑摘要
|
||||||
|
├── docs/
|
||||||
|
│ ├── STATUS.md # ← 本文件(功能成熟度)
|
||||||
|
│ ├── M2.1_PRD.md # M2.1 产品需求
|
||||||
|
│ └── ...
|
||||||
|
├── src/
|
||||||
|
│ ├── core/ # 微内核
|
||||||
|
│ └── plugins/ # video / http / ble / wifi / device / screen / live2d / ai
|
||||||
|
├── configs/ # 角色内容包 JSON(dog/cat/live2d_anime)
|
||||||
|
├── clients/flutter/ # 安卓控制 App
|
||||||
|
├── scripts/device/ # 设备运维脚本(从根目录迁入)
|
||||||
|
├── tests/ # M1.2 集成测试
|
||||||
|
└── souls/ # 团队档案
|
||||||
|
```
|
||||||
|
|
||||||
|
**根目录禁止再堆**:截图 `*.xwd`、临时模型 `.haru.*`、一次性 `.*.sh`。
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 3. 能力成熟度矩阵
|
||||||
|
|
||||||
|
图例:✅ 可用 · 🟡 半成品 · ❌ 缺失 · 🚫 本期不做
|
||||||
|
|
||||||
|
### 3.1 设备端(Linux ARM64 · 192.168.31.105)
|
||||||
|
|
||||||
|
| 能力 | 状态 | 备注 |
|
||||||
|
|------|------|------|
|
||||||
|
| 开机自启 `showen_v2.service` | ✅ | `Restart=always`,用户级 + Linger |
|
||||||
|
| 视频状态机 / Live2D 渲染 | ✅ | 设备画面主路径 |
|
||||||
|
| HTTP :5000 Web + API | ✅ | |
|
||||||
|
| BLE 广播 + GATT 配网 | ✅ | 已修 LocalName/Includes 冲突;广播实例=1 |
|
||||||
|
| WiFi (nmcli) | ✅ | |
|
||||||
|
| AI 对话管线 ASR→LLM→TTS | 🟡 | 设备实测文字对话可通;延迟数秒~十余秒 |
|
||||||
|
| 模型管理 API | 🟡 | 列表/下载/切换/删除有;进度/配额 UX 待验 |
|
||||||
|
| 角色配置切换 API | ✅ | `/api/config/available` + `switch` 带 character 元信息 |
|
||||||
|
| 单实例锁 | ❌ | 防御性双保险未做 |
|
||||||
|
| 设备本机麦克风/扬声器对话 | 🚫 | 硬件未接;V1 声音走客户端 |
|
||||||
|
|
||||||
|
### 3.2 网页控制端(`chat.html` + `chat.js`)
|
||||||
|
|
||||||
|
| 能力 | 状态 | 备注 |
|
||||||
|
|------|------|------|
|
||||||
|
| 播放/触发/配置/视频/文件/WiFi | ✅ | M1 存量 |
|
||||||
|
| 角色切换 UI | 🟡 | 有入口,端到端验收不足 |
|
||||||
|
| 文字对话 + 浏览器播 TTS | 🟡 | API 通;人设/状态联动待系统验 |
|
||||||
|
| 按住说话 | 🟡 | HTTP 下 getUserMedia 受限;PRD 允许降级 |
|
||||||
|
| 模型管理 UI | 🟡 | 有入口,下载进度/错误态未系统验 |
|
||||||
|
| 与 App 状态互相同步 | 🟡 | 依赖 WS/轮询,未做验收用例 |
|
||||||
|
|
||||||
|
### 3.3 安卓 App(Flutter · v0.4 debug APK)
|
||||||
|
|
||||||
|
| 能力 | 状态 | 备注 |
|
||||||
|
|------|------|------|
|
||||||
|
| 设备连接 / 播放 / 网络 / BLE 配网 / 设置 | ✅ | M1 能力 |
|
||||||
|
| 角色页 | 🟡 | 代码已加,**真机体验未验** |
|
||||||
|
| 对话页(文字+按住说话+播回复) | 🟡 | 代码已加,**真机体验未验** |
|
||||||
|
| 模型管理页 | 🟡 | 代码已加,**真机体验未验** |
|
||||||
|
| debug APK | ✅ | `clients/flutter/build/app/outputs/flutter-apk/app-debug.apk` (~146MB) |
|
||||||
|
| release 签名包 | ❌ | 未打 |
|
||||||
|
| 对话历史本地持久化 / 隐私文案 | ❌ | PRD 有要求 |
|
||||||
|
| 角色卡片封面图 | ❌ | API 未提供 cover |
|
||||||
|
|
||||||
|
### 3.4 内容与素材
|
||||||
|
|
||||||
|
| 项 | 状态 |
|
||||||
|
|----|------|
|
||||||
|
| dog / cat 视频包 | ✅ 可用(路径仍偏仓库外历史形态) |
|
||||||
|
| live2d_anime 包 | 🟡 有配置,素材依赖设备本地 `configs/live2d/` |
|
||||||
|
| 数字人/歌姬完整 4 状态视频包 | ❌ 素材未齐(PRD 最大外部依赖) |
|
||||||
|
| 角色 `talk` 状态全覆盖 | 🟡 宠物包可降级 |
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 4. 未提交改动(本机工作区,2026-07-09)
|
||||||
|
|
||||||
|
以下在仓库 **working tree**,尚未 commit(按老板规则不代提交):
|
||||||
|
|
||||||
|
| 区域 | 内容 |
|
||||||
|
|------|------|
|
||||||
|
| `src/plugins/ble/` | BLE 广播 LocalName 修复 + 串行注册 |
|
||||||
|
| `src/plugins/http/` | chat/audio 说话态/session;chat.js session 头 |
|
||||||
|
| `clients/flutter/` | M2.1 三角色/对话/模型页 + Gradle/依赖升级 |
|
||||||
|
| 根目录清理 | 移除 xwd/haru 垃圾;脚本迁 `scripts/device/` |
|
||||||
|
|
||||||
|
设备端:上述 BLE/HTTP 二进制可能已部署,但 **git 与设备代码可能不完全一致**,合并前需同步。
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 5. 不完善点(按优先级)
|
||||||
|
|
||||||
|
### P0 — 不做则无法说「M2.1 可用」
|
||||||
|
|
||||||
|
1. **真机验收闭环**:App 装机 → 角色切换 → 文字/语音对话 → 模型列表/切换
|
||||||
|
2. **设备 ↔ 本机代码对齐**:commit + 设备 `git pull`/同步 + `cargo test`
|
||||||
|
3. **对话失败可理解**:AI 未就绪 / 超时 / 模型缺失时,App/Web 明确提示
|
||||||
|
|
||||||
|
### P1 — 体验完整度
|
||||||
|
|
||||||
|
4. App 对话历史本地存储 + 清空
|
||||||
|
5. 切换角色时清空会话上下文(App 已调 clear;Web 需确认)
|
||||||
|
6. 模型下载进度实时刷新与失败重试
|
||||||
|
7. Web HTTP 录音限制的产品文案统一
|
||||||
|
8. release APK 与安装渠道
|
||||||
|
|
||||||
|
### P2 — 技术债 / 收尾
|
||||||
|
|
||||||
|
9. M1.2 tag `m1.2`
|
||||||
|
10. 单实例保护
|
||||||
|
11. `sanitize_filename` 测试转正
|
||||||
|
12. CursorVisibility 等 Phase2 消息清理
|
||||||
|
13. 数字人/歌姬素材管线
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 6. 建议下一轮工作顺序
|
||||||
|
|
||||||
|
```text
|
||||||
|
1) 老板/本机:提交当前工作区改动(或拆成 ble / http / flutter 三提交)
|
||||||
|
2) 设备同步 + cargo test --workspace
|
||||||
|
3) App 真机:配网 → 角色 → 对话 → 模型 四条用户旅程
|
||||||
|
4) 按失败项修 P0
|
||||||
|
5) 再谈素材与 release
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 7. 环境速查
|
||||||
|
|
||||||
|
| 环境 | 要点 |
|
||||||
|
|------|------|
|
||||||
|
| 设备 SSH | `ssh -p 2222 showen@192.168.31.105`(密码 showen) |
|
||||||
|
| 设备 Web | `http://192.168.31.105:5000/` |
|
||||||
|
| 本机 Flutter | `source ~/.showen_dev_env` · Flutter 3.44.5 · JDK17 · Android SDK36 |
|
||||||
|
| 本机 APK | `clients/flutter/build/app/outputs/flutter-apk/app-debug.apk` |
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 8. 文档导航
|
||||||
|
|
||||||
|
| 需求 | 文件 |
|
||||||
|
|------|------|
|
||||||
|
| 派任务 / 铁律 | `CLAUDE.md` |
|
||||||
|
| 功能成熟度(本页) | `docs/STATUS.md` |
|
||||||
|
| M2.1 产品定义 | `docs/M2.1_PRD.md` |
|
||||||
|
| 里程碑摘要 | `PROGRESS.md` |
|
||||||
|
| 架构入门 | `README.md` |
|
||||||
15
scripts/device/README.md
Normal file
15
scripts/device/README.md
Normal file
@@ -0,0 +1,15 @@
|
|||||||
|
# 设备运维脚本
|
||||||
|
|
||||||
|
从仓库根目录迁入的临时/运维 shell,供目标机调试用,**非产品运行时依赖**。
|
||||||
|
|
||||||
|
| 脚本 | 用途(以内容为准) |
|
||||||
|
|------|-------------------|
|
||||||
|
| `ssh_check.sh` | SSH 连通检查 |
|
||||||
|
| `build.sh` / `run.sh` / `start.sh` | 设备侧编译/启动辅助 |
|
||||||
|
| 其余 | 历史探测脚本,用前请先读内容 |
|
||||||
|
|
||||||
|
主服务请用:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
systemctl --user status showen_v2.service
|
||||||
|
```
|
||||||
21
scripts/device/analyze.sh
Normal file
21
scripts/device/analyze.sh
Normal file
@@ -0,0 +1,21 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
# 分析下载页面
|
||||||
|
echo "=== Page size ==="
|
||||||
|
wc -c /tmp/dl_page.html
|
||||||
|
|
||||||
|
echo "=== All URLs containing download/zip/native ==="
|
||||||
|
grep -oiE 'https?://[^"'\'' <>]+(download|\.zip|native|cubism)[^"'\'' <>]*' /tmp/dl_page.html | sort -u | head -40
|
||||||
|
|
||||||
|
echo "=== Script sources ==="
|
||||||
|
grep -oiE '<script[^>]*src="[^"]*"' /tmp/dl_page.html | head -20
|
||||||
|
|
||||||
|
echo "=== Data attributes ==="
|
||||||
|
grep -oiE 'data-[a-z]+="[^"]*"' /tmp/dl_page.html | head -20
|
||||||
|
|
||||||
|
echo "=== Form actions ==="
|
||||||
|
grep -oiE '<form[^>]*action="[^"]*"' /tmp/dl_page.html | head -10
|
||||||
|
|
||||||
|
echo "=== Any cubism.live2d URLs ==="
|
||||||
|
grep -oiE 'https?://[a-z.]*live2d[^"'\'' <>]*' /tmp/dl_page.html | sort -u | head -30
|
||||||
|
|
||||||
|
echo "=== DONE ==="
|
||||||
7
scripts/device/build.sh
Normal file
7
scripts/device/build.sh
Normal file
@@ -0,0 +1,7 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
cd /home/showen/Showen/ShowenV2
|
||||||
|
export PATH=/home/showen/.rustup/toolchains/stable-aarch64-unknown-linux-gnu/bin:$PATH
|
||||||
|
pkill -9 -f showen_v2 2>/dev/null
|
||||||
|
sleep 1
|
||||||
|
cargo build --release 2>&1 | tail -3
|
||||||
|
echo "BUILD_EXIT=$?"
|
||||||
39
scripts/device/dl_core.sh
Normal file
39
scripts/device/dl_core.sh
Normal file
@@ -0,0 +1,39 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
# 尝试下载 Cubism SDK for Native (含 Core 库)
|
||||||
|
cd /tmp
|
||||||
|
echo "=== Try downloading Cubism SDK for Native ==="
|
||||||
|
|
||||||
|
# Live2D 官方下载通常用这种 URL 模式
|
||||||
|
# 先尝试常见的下载链接
|
||||||
|
URLS=(
|
||||||
|
"https://cubism.live2d.com/sdk-native/bin/CubismSdkForNative.zip"
|
||||||
|
"https://www.live2d.com/download/cubism-sdk/download-native/?agree=true"
|
||||||
|
"https://download.live2d.com/cubism-sdk/native/CubismSdkForNative.zip"
|
||||||
|
)
|
||||||
|
|
||||||
|
for url in "${URLS[@]}"; do
|
||||||
|
echo "Trying: $url"
|
||||||
|
wget --timeout=15 --tries=1 -q "$url" -O test_download.bin 2>&1
|
||||||
|
if [ $? -eq 0 ]; then
|
||||||
|
SIZE=$(stat -c%s test_download.bin 2>/dev/null || echo 0)
|
||||||
|
echo " Downloaded: $SIZE bytes"
|
||||||
|
if [ "$SIZE" -gt 100000 ]; then
|
||||||
|
echo " Looks like a real file! Checking type..."
|
||||||
|
file test_download.bin
|
||||||
|
mv test_download.bin CubismSdkForNative.zip
|
||||||
|
echo " SUCCESS: saved as CubismSdkForNative.zip"
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
echo " Failed or too small"
|
||||||
|
fi
|
||||||
|
rm -f test_download.bin
|
||||||
|
done
|
||||||
|
|
||||||
|
echo "=== Direct URL attempts failed ==="
|
||||||
|
echo "Checking actual download page for hidden links..."
|
||||||
|
curl -sL "https://www.live2d.com/zh-CHS/sdk/download/native/" 2>/dev/null | grep -oiE 'href="[^"]*\.zip[^"]*"' | head -10
|
||||||
|
echo "---"
|
||||||
|
curl -sL "https://www.live2d.com/download/cubism-sdk/download-native/" 2>/dev/null | grep -oiE 'href="[^"]*download[^"]*"' | head -10
|
||||||
|
|
||||||
|
echo "=== DONE ==="
|
||||||
15
scripts/device/extract.sh
Normal file
15
scripts/device/extract.sh
Normal file
@@ -0,0 +1,15 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
cd /tmp
|
||||||
|
echo "=== Extracting SDK ==="
|
||||||
|
unzip -o cubism_sdk_native.zip -d cubism_sdk 2>&1 | tail -5
|
||||||
|
|
||||||
|
echo "=== Finding Core .so files ==="
|
||||||
|
find cubism_sdk -name "libLive2DCubismCore*" -type f 2>/dev/null
|
||||||
|
|
||||||
|
echo "=== Checking arm64 linux .so ==="
|
||||||
|
ls -lh cubism_sdk/Core/dll/experimental/linux/arm64/ 2>/dev/null
|
||||||
|
|
||||||
|
echo "=== File type ==="
|
||||||
|
file cubism_sdk/Core/dll/experimental/linux/arm64/libLive2DCubismCore.so 2>/dev/null
|
||||||
|
|
||||||
|
echo "=== DONE ==="
|
||||||
16
scripts/device/find_cargo.sh
Normal file
16
scripts/device/find_cargo.sh
Normal file
@@ -0,0 +1,16 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
echo "=== find cargo config ==="
|
||||||
|
find /home/showen -name "config.toml" -path "*.cargo*" 2>/dev/null
|
||||||
|
find /home/showen -name "config" -path "*.cargo*" 2>/dev/null
|
||||||
|
find / -name "config.toml" -path "*cargo*" 2>/dev/null | head -5
|
||||||
|
|
||||||
|
echo "=== check .cargo dir ==="
|
||||||
|
ls -la /home/showen/.cargo/ 2>/dev/null
|
||||||
|
|
||||||
|
echo "=== rustup cargo home ==="
|
||||||
|
echo $CARGO_HOME
|
||||||
|
ls -la ~/.cargo/ 2>/dev/null
|
||||||
|
|
||||||
|
echo "=== project cargo ==="
|
||||||
|
ls -la /home/showen/Showen/ShowenV2/.cargo/ 2>/dev/null
|
||||||
|
find /home/showen/Showen -name ".cargo" -type d 2>/dev/null
|
||||||
11
scripts/device/run.sh
Normal file
11
scripts/device/run.sh
Normal file
@@ -0,0 +1,11 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
killall showen_v2 2>/dev/null
|
||||||
|
sleep 1
|
||||||
|
cd /home/showen/Showen/ShowenV2
|
||||||
|
DISPLAY=:0 RUST_LOG=info nohup ./target/release/showen_v2 --config configs/live2d_anime.json > /tmp/sl2.log 2>&1 &
|
||||||
|
echo "PID=$!"
|
||||||
|
sleep 8
|
||||||
|
echo "=== LOG ==="
|
||||||
|
cat /tmp/sl2.log | tail -50
|
||||||
|
echo "=== PS ==="
|
||||||
|
ps aux | grep showen_v2 | grep -v grep
|
||||||
23
scripts/device/ssh_check.sh
Normal file
23
scripts/device/ssh_check.sh
Normal file
@@ -0,0 +1,23 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
echo "=== DOWNLOAD TOOLS ==="
|
||||||
|
which wget 2>/dev/null && echo "wget: yes" || echo "wget: no"
|
||||||
|
which curl 2>/dev/null && echo "curl: yes" || echo "curl: no"
|
||||||
|
|
||||||
|
echo "=== OPENGL/EGL LIBS ==="
|
||||||
|
ls /usr/lib/aarch64-linux-gnu/libEGL* 2>/dev/null || echo "no EGL lib"
|
||||||
|
ls /usr/lib/aarch64-linux-gnu/libGLESv2* 2>/dev/null || echo "no GLES lib"
|
||||||
|
ls /usr/lib/aarch64-linux-gnu/libGL* 2>/dev/null || echo "no GL lib"
|
||||||
|
|
||||||
|
echo "=== PKG CONFIG ==="
|
||||||
|
pkg-config --list-all 2>/dev/null | grep -iE 'egl|gles|gl' || echo "no pkg-config gl"
|
||||||
|
|
||||||
|
echo "=== BUILD TOOLS ==="
|
||||||
|
gcc --version 2>/dev/null | head -1 || echo "no gcc"
|
||||||
|
g++ --version 2>/dev/null | head -1 || echo "no g++"
|
||||||
|
cmake --version 2>/dev/null | head -1 || echo "no cmake"
|
||||||
|
|
||||||
|
echo "=== RUST ==="
|
||||||
|
ls ~/.rustup/toolchains/*/bin/rustc 2>/dev/null | head -1
|
||||||
|
~/.rustup/toolchains/stable-aarch64-unknown-linux-gnu/bin/rustc --version 2>/dev/null
|
||||||
|
|
||||||
|
echo "=== DONE ==="
|
||||||
12
scripts/device/start.sh
Normal file
12
scripts/device/start.sh
Normal file
@@ -0,0 +1,12 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
# 杀旧进程
|
||||||
|
pkill -9 -f showen_v2 2>/dev/null
|
||||||
|
sleep 1
|
||||||
|
|
||||||
|
cd /home/showen/Showen/ShowenV2
|
||||||
|
export DISPLAY=:0
|
||||||
|
export RUST_LOG=info
|
||||||
|
|
||||||
|
# 后台启动
|
||||||
|
nohup ./target/release/showen_v2 --config configs/live2d_anime.json > /tmp/sl2.log 2>&1 &
|
||||||
|
echo "PID=$!"
|
||||||
@@ -5,9 +5,9 @@ Wants=network.target
|
|||||||
|
|
||||||
[Service]
|
[Service]
|
||||||
Type=simple
|
Type=simple
|
||||||
User=showen
|
|
||||||
Environment=DISPLAY=:0
|
Environment=DISPLAY=:0
|
||||||
Environment=XAUTHORITY=/home/showen/.Xauthority
|
Environment=XAUTHORITY=/home/showen/.Xauthority
|
||||||
|
Environment=PATH=/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/sbin
|
||||||
WorkingDirectory=/home/showen/Showen/ShowenV2
|
WorkingDirectory=/home/showen/Showen/ShowenV2
|
||||||
ExecStart=/home/showen/Showen/ShowenV2/target/release/showen_v2 --config /home/showen/Showen/ShowenV2/configs/dog_state_machine.json
|
ExecStart=/home/showen/Showen/ShowenV2/target/release/showen_v2 --config /home/showen/Showen/ShowenV2/configs/dog_state_machine.json
|
||||||
Restart=on-failure
|
Restart=on-failure
|
||||||
|
|||||||
@@ -69,6 +69,10 @@ pub enum Message {
|
|||||||
/// AI 模型状态变更广播(加载/切换/下载进度)
|
/// AI 模型状态变更广播(加载/切换/下载进度)
|
||||||
AiModelEvent(AiModelEvent),
|
AiModelEvent(AiModelEvent),
|
||||||
|
|
||||||
|
// ── 设备端字幕 (M2.1) ──
|
||||||
|
/// 设备端 Live2D 字幕显示(AI 回复文字 Overlay);HTTP 插件发出,live2d 插件消费
|
||||||
|
Subtitle { text: String },
|
||||||
|
|
||||||
// ── 扩展(未来插件用) ──
|
// ── 扩展(未来插件用) ──
|
||||||
Custom {
|
Custom {
|
||||||
kind: String,
|
kind: String,
|
||||||
|
|||||||
@@ -17,6 +17,7 @@ pub mod plugin_ids {
|
|||||||
pub const BLE: &str = "ble";
|
pub const BLE: &str = "ble";
|
||||||
pub const DEVICE: &str = "device";
|
pub const DEVICE: &str = "device";
|
||||||
pub const SCREEN: &str = "screen";
|
pub const SCREEN: &str = "screen";
|
||||||
|
pub const LIVE2D: &str = "live2d";
|
||||||
}
|
}
|
||||||
|
|
||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
|
|||||||
@@ -5,8 +5,8 @@ use showen_v2::core::service_manager::ServiceManager;
|
|||||||
#[cfg(not(test))]
|
#[cfg(not(test))]
|
||||||
use showen_v2::core::version_manager::VersionManager;
|
use showen_v2::core::version_manager::VersionManager;
|
||||||
use showen_v2::plugins::{
|
use showen_v2::plugins::{
|
||||||
ai::AiPlugin, ble::BlePlugin, device::DevicePlugin, http::HttpPlugin, screen::ScreenPlugin,
|
ai::AiPlugin, ble::BlePlugin, device::DevicePlugin, http::HttpPlugin, live2d::Live2DPlugin,
|
||||||
video::VideoPlugin, wifi::WifiPlugin,
|
screen::ScreenPlugin, video::VideoPlugin, wifi::WifiPlugin,
|
||||||
};
|
};
|
||||||
use std::sync::atomic::{AtomicBool, Ordering};
|
use std::sync::atomic::{AtomicBool, Ordering};
|
||||||
use std::sync::Arc;
|
use std::sync::Arc;
|
||||||
@@ -75,6 +75,9 @@ fn main() -> Result<()> {
|
|||||||
manager.register(Box::new(VideoPlugin::new()));
|
manager.register(Box::new(VideoPlugin::new()));
|
||||||
println!(" ✓ VideoPlugin");
|
println!(" ✓ VideoPlugin");
|
||||||
|
|
||||||
|
manager.register(Box::new(Live2DPlugin::new()));
|
||||||
|
println!(" ✓ Live2DPlugin");
|
||||||
|
|
||||||
manager.register(Box::new(BlePlugin::new()));
|
manager.register(Box::new(BlePlugin::new()));
|
||||||
println!(" ✓ BlePlugin");
|
println!(" ✓ BlePlugin");
|
||||||
|
|
||||||
|
|||||||
@@ -250,6 +250,11 @@ pub fn run_ble_service(
|
|||||||
shared: shared.clone(),
|
shared: shared.clone(),
|
||||||
},
|
},
|
||||||
);
|
);
|
||||||
|
// BlueZ LEAdvertisement1 约束(5.55+):
|
||||||
|
// Includes 里若含 "local-name",就禁止再设 LocalName 属性,否则
|
||||||
|
// parse_local_name 报 "Local name already included" →
|
||||||
|
// "Failed to parse advertisement"。
|
||||||
|
// 我们需要自定义设备名,因此只用 LocalName,Includes 仅保留 tx-power。
|
||||||
cr.insert(
|
cr.insert(
|
||||||
ADV_PATH,
|
ADV_PATH,
|
||||||
&[advertisement_iface],
|
&[advertisement_iface],
|
||||||
@@ -257,7 +262,7 @@ pub fn run_ble_service(
|
|||||||
advertisement_type: "peripheral".to_string(),
|
advertisement_type: "peripheral".to_string(),
|
||||||
service_uuids: vec![SERVICE_UUID.to_string()],
|
service_uuids: vec![SERVICE_UUID.to_string()],
|
||||||
local_name: device_name.clone(),
|
local_name: device_name.clone(),
|
||||||
includes: vec!["tx-power".to_string(), "local-name".to_string()],
|
includes: vec!["tx-power".to_string()],
|
||||||
},
|
},
|
||||||
);
|
);
|
||||||
|
|
||||||
@@ -315,20 +320,37 @@ pub fn run_ble_service(
|
|||||||
|
|
||||||
// 先尝试清理上一次进程残留的注册(防止崩溃后 BlueZ 状态残留)
|
// 先尝试清理上一次进程残留的注册(防止崩溃后 BlueZ 状态残留)
|
||||||
let _ = unregister_ble_objects(&conn, &adapter_path);
|
let _ = unregister_ble_objects(&conn, &adapter_path);
|
||||||
|
// 给 BlueZ 一点时间释放残留 GATT/Adv 实例
|
||||||
|
for _ in 0..5 {
|
||||||
|
if stop.load(Ordering::SeqCst) {
|
||||||
|
return Ok(());
|
||||||
|
}
|
||||||
|
conn.process(Duration::from_millis(50)).ok();
|
||||||
|
}
|
||||||
|
|
||||||
|
// 串行注册:先 GATT,再 Advertisement。并行时若 Adv 成功、GATT 失败,
|
||||||
|
// 残留 ActiveInstances 会导致后续 "Failed to create entry in database"。
|
||||||
let gatt_serial = send_register_gatt_app(&conn, &adapter_path)?;
|
let gatt_serial = send_register_gatt_app(&conn, &adapter_path)?;
|
||||||
let ad_serial = send_register_advertisement(&conn, &adapter_path)?;
|
|
||||||
if let Ok(mut replies) = registration_replies.lock() {
|
if let Ok(mut replies) = registration_replies.lock() {
|
||||||
replies.gatt_serial = Some(gatt_serial);
|
replies.gatt_serial = Some(gatt_serial);
|
||||||
|
}
|
||||||
|
eprintln!("[BLE] RegisterApplication sent, waiting...");
|
||||||
|
if let Err(error) =
|
||||||
|
wait_for_one_registration_reply(&conn, ®istration_replies, "gatt", Duration::from_secs(10))
|
||||||
|
{
|
||||||
|
let _ = unregister_ble_objects(&conn, &adapter_path);
|
||||||
|
return Err(error);
|
||||||
|
}
|
||||||
|
|
||||||
|
let ad_serial = send_register_advertisement(&conn, &adapter_path)?;
|
||||||
|
if let Ok(mut replies) = registration_replies.lock() {
|
||||||
replies.advertisement_serial = Some(ad_serial);
|
replies.advertisement_serial = Some(ad_serial);
|
||||||
}
|
}
|
||||||
eprintln!("[BLE] registration requests sent, waiting for BlueZ replies...");
|
eprintln!("[BLE] RegisterAdvertisement sent, waiting...");
|
||||||
|
if let Err(error) = wait_for_one_registration_reply(
|
||||||
if let Err(error) = wait_for_registration_replies(
|
|
||||||
&conn,
|
&conn,
|
||||||
®istration_replies,
|
®istration_replies,
|
||||||
gatt_serial,
|
"advertisement",
|
||||||
ad_serial,
|
|
||||||
Duration::from_secs(10),
|
Duration::from_secs(10),
|
||||||
) {
|
) {
|
||||||
let _ = unregister_ble_objects(&conn, &adapter_path);
|
let _ = unregister_ble_objects(&conn, &adapter_path);
|
||||||
@@ -575,36 +597,34 @@ fn replies_for_serial(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fn wait_for_registration_replies(
|
fn wait_for_one_registration_reply(
|
||||||
conn: &Connection,
|
conn: &Connection,
|
||||||
replies: &Arc<Mutex<RegistrationReplies>>,
|
replies: &Arc<Mutex<RegistrationReplies>>,
|
||||||
gatt_serial: u32,
|
which: &str,
|
||||||
advertisement_serial: u32,
|
|
||||||
timeout: Duration,
|
timeout: Duration,
|
||||||
) -> Result<()> {
|
) -> Result<()> {
|
||||||
let deadline = Instant::now() + timeout;
|
let deadline = Instant::now() + timeout;
|
||||||
|
let op = match which {
|
||||||
|
"gatt" => "RegisterApplication",
|
||||||
|
"advertisement" => "RegisterAdvertisement",
|
||||||
|
other => other,
|
||||||
|
};
|
||||||
|
|
||||||
loop {
|
loop {
|
||||||
if let Ok(mut replies) = replies.lock() {
|
if let Ok(mut replies) = replies.lock() {
|
||||||
match reply_status(&mut replies.gatt, "RegisterApplication")? {
|
let slot = match which {
|
||||||
Some(()) => {}
|
"gatt" => &mut replies.gatt,
|
||||||
None => {}
|
"advertisement" => &mut replies.advertisement,
|
||||||
}
|
_ => return Err(anyhow!("unknown BLE registration target: {which}")),
|
||||||
match reply_status(&mut replies.advertisement, "RegisterAdvertisement")? {
|
};
|
||||||
Some(()) => {}
|
if let Some(()) = reply_status(slot, op)? {
|
||||||
None => {}
|
|
||||||
}
|
|
||||||
|
|
||||||
if replies.gatt.is_some() && replies.advertisement.is_some() {
|
|
||||||
return Ok(());
|
return Ok(());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
let now = Instant::now();
|
let now = Instant::now();
|
||||||
if now >= deadline {
|
if now >= deadline {
|
||||||
return Err(anyhow!(
|
return Err(anyhow!("timed out waiting for BLE {op} reply"));
|
||||||
"timed out waiting for BLE registration reply (gatt_serial={gatt_serial}, advertisement_serial={advertisement_serial})"
|
|
||||||
));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
conn.process(Duration::from_millis(100).min(deadline.saturating_duration_since(now)))
|
conn.process(Duration::from_millis(100).min(deadline.saturating_duration_since(now)))
|
||||||
|
|||||||
@@ -1,7 +1,8 @@
|
|||||||
//! BlePlugin — BLE 配网服务
|
//! BlePlugin — BLE 配网服务
|
||||||
//!
|
//!
|
||||||
//! 通过 D-Bus 与 BlueZ 交互,注册 GATT 服务和 LE Advertisement。
|
//! 通过 D-Bus 与 BlueZ 交互,注册 GATT 服务和 LE Advertisement。
|
||||||
//! 含 LocalName 双连接修复。
|
//! 注意:Advertisement 不可同时 Includes["local-name"] + LocalName 属性
|
||||||
|
//! (BlueZ 会报 Failed to parse advertisement)。
|
||||||
|
|
||||||
mod gatt;
|
mod gatt;
|
||||||
|
|
||||||
@@ -95,11 +96,20 @@ impl Plugin for BlePlugin {
|
|||||||
if stop.load(Ordering::SeqCst) {
|
if stop.load(Ordering::SeqCst) {
|
||||||
return Ok(());
|
return Ok(());
|
||||||
}
|
}
|
||||||
|
// BlueZ 残留状态(database / advertisement)需要更长冷却时间
|
||||||
|
let err_text = format!("{error:#}");
|
||||||
|
let wait_secs = if err_text.contains("database")
|
||||||
|
|| err_text.contains("parse advertisement")
|
||||||
|
|| err_text.contains("Already Exists")
|
||||||
|
{
|
||||||
|
8
|
||||||
|
} else {
|
||||||
|
3
|
||||||
|
};
|
||||||
eprintln!(
|
eprintln!(
|
||||||
"[BlePlugin] worker error: {error:#}, restarting in 3 seconds..."
|
"[BlePlugin] worker error: {err_text}, restarting in {wait_secs} seconds..."
|
||||||
);
|
);
|
||||||
// 等待 3 秒,但如果 stop 被设置则立即退出
|
for _ in 0..(wait_secs * 10) {
|
||||||
for _ in 0..30 {
|
|
||||||
if stop.load(Ordering::SeqCst) {
|
if stop.load(Ordering::SeqCst) {
|
||||||
return Ok(());
|
return Ok(());
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -6,145 +6,47 @@
|
|||||||
<title>Showen 数字生命控制台</title>
|
<title>Showen 数字生命控制台</title>
|
||||||
<style>
|
<style>
|
||||||
:root{--bg:#0f1117;--surface:#1a1d27;--surface2:#242836;--border:#2e3345;--text:#e4e6ef;--muted:#8b8fa3;--accent:#6366f1;--accent-glow:rgba(99,102,241,.15);--green:#22c55e;--amber:#f59e0b;--red:#ef4444;--radius:12px;--pet:#f59e0b;--human:#6366f1;--singer:#ec4899;--live2d:#22c55e}
|
:root{--bg:#0f1117;--surface:#1a1d27;--surface2:#242836;--border:#2e3345;--text:#e4e6ef;--muted:#8b8fa3;--accent:#6366f1;--accent-glow:rgba(99,102,241,.15);--green:#22c55e;--amber:#f59e0b;--red:#ef4444;--radius:12px;--pet:#f59e0b;--human:#6366f1;--singer:#ec4899;--live2d:#22c55e}
|
||||||
*{box-sizing:border-box;margin:0;padding:0}
|
*{box-sizing:border-box;margin:0;padding:0}body{background:var(--bg);color:var(--text);font:14px/1.6 -apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,"Noto Sans SC",sans-serif;min-height:100vh}::selection{background:var(--accent);color:#fff}::-webkit-scrollbar{width:6px;height:6px}::-webkit-scrollbar-track{background:transparent}::-webkit-scrollbar-thumb{background:var(--border);border-radius:3px}
|
||||||
body{background:var(--bg);color:var(--text);font:14px/1.6 -apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,"Noto Sans SC",sans-serif;min-height:100vh}
|
.app{max-width:1200px;margin:0 auto;padding:16px 20px}
|
||||||
::-webkit-scrollbar{width:6px;height:6px}::-webkit-scrollbar-track{background:transparent}::-webkit-scrollbar-thumb{background:var(--border);border-radius:3px}
|
header{display:flex;align-items:center;justify-content:space-between;gap:12px;padding:16px 0;border-bottom:1px solid var(--border);margin-bottom:16px;flex-wrap:wrap}header h1{font-size:20px;font-weight:600;display:flex;align-items:center;gap:8px;background:linear-gradient(135deg,#6366f1,#a78bfa);-webkit-background-clip:text;-webkit-text-fill-color:transparent}header h1 .dot{width:8px;height:8px;border-radius:50%;background:var(--green);-webkit-text-fill-color:initial}.header-actions{display:flex;align-items:center;gap:10px;flex-wrap:wrap}.header-link{display:inline-flex;align-items:center;gap:8px;padding:8px 16px;border-radius:8px;color:#fff;font:inherit;cursor:pointer;text-decoration:none;background:var(--accent)}.header-link.dl{background:linear-gradient(135deg,var(--accent),#a78bfa)}.ws-badge{font-size:11px;padding:4px 10px;border-radius:99px;border:1px solid var(--border);color:var(--muted);background:var(--surface);white-space:nowrap}
|
||||||
.app{max-width:1000px;margin:0 auto;padding:16px 20px}
|
|
||||||
h1{font-size:20px;font-weight:600;margin-bottom:4px;display:flex;align-items:center;gap:8px}
|
|
||||||
h1 .dot{width:8px;height:8px;border-radius:50%;background:var(--green)}
|
|
||||||
.subtitle{font-size:12px;color:var(--muted);margin-bottom:16px}
|
.subtitle{font-size:12px;color:var(--muted);margin-bottom:16px}
|
||||||
.tabs{display:flex;gap:4px;margin-bottom:16px;border-bottom:1px solid var(--border)}
|
.tabs{display:flex;gap:4px;background:var(--surface);border-radius:var(--radius);padding:4px;margin-bottom:16px;overflow-x:auto}.tab{padding:8px 16px;border-radius:8px;border:0;background:0;color:var(--muted);cursor:pointer;font:inherit;white-space:nowrap;transition:all .2s}.tab:hover{color:var(--text);background:var(--surface2)}.tab.active{color:#fff;background:var(--accent);box-shadow:0 2px 8px rgba(99,102,241,.3)}.panel{display:none}.panel.active{display:block}
|
||||||
.tab{padding:8px 16px;cursor:pointer;border-radius:8px 8px 0 0;color:var(--muted);font-size:14px;transition:.2s;border-bottom:2px solid transparent;margin-bottom:-1px}
|
.char-bar{display:flex;align-items:center;gap:12px;background:var(--surface);border:1px solid var(--border);border-radius:var(--radius);padding:12px 16px;margin-bottom:12px}.char-bar .avatar{width:40px;height:40px;border-radius:50%;background:var(--surface2);display:flex;align-items:center;justify-content:center;font-size:20px}.char-bar .info{flex:1}.char-bar .info .name{font-weight:600;font-size:15px}.char-bar .info .type-badge{font-size:11px;padding:2px 8px;border-radius:4px;margin-left:8px;text-transform:uppercase}.type-badge.pet{background:rgba(245,158,11,.2);color:var(--pet)}.type-badge.human{background:rgba(99,102,241,.2);color:var(--human)}.type-badge.singer{background:rgba(236,72,153,.2);color:var(--singer)}.type-badge.live2d{background:rgba(34,197,94,.2);color:var(--live2d)}.char-bar .render-badge{font-size:11px;color:var(--muted);padding:2px 8px;border:1px solid var(--border);border-radius:4px}
|
||||||
.tab:hover{color:var(--text)}
|
.chat-box{background:var(--surface);border:1px solid var(--border);border-radius:var(--radius);height:45vh;overflow-y:auto;padding:16px;margin-bottom:12px}.msg{margin-bottom:12px;max-width:80%}.msg.user{margin-left:auto;text-align:right}.msg .bubble{display:inline-block;padding:10px 14px;border-radius:14px;font-size:14px;line-height:1.5}.msg.user .bubble{background:var(--accent);color:#fff;border-bottom-right-radius:4px}.msg.bot .bubble{background:var(--surface2);border:1px solid var(--border);border-bottom-left-radius:4px}.msg .meta{font-size:11px;color:var(--muted);margin-top:4px}.chat-input{display:flex;gap:8px}.chat-input input{flex:1;padding:10px 14px;background:var(--surface);border:1px solid var(--border);border-radius:var(--radius);color:var(--text);font-size:14px;outline:none}.chat-input input:focus{border-color:var(--accent)}.send-btn{padding:10px 20px;background:var(--accent);color:#fff;border:none;border-radius:var(--radius);cursor:pointer;font-size:14px;white-space:nowrap}button:disabled{opacity:.5;cursor:not-allowed}.status-bar{font-size:12px;color:var(--muted);margin-top:8px;min-height:18px}.status-bar.error{color:var(--red)}.status-bar.busy{color:var(--amber)}
|
||||||
.tab.active{color:var(--text);border-bottom-color:var(--accent);background:var(--accent-glow)}
|
.live2d-container{background:var(--surface);border:1px solid var(--border);border-radius:var(--radius);height:45vh;margin-bottom:12px;display:flex;align-items:center;justify-content:center;position:relative;overflow:hidden}.live2d-placeholder{color:var(--muted);text-align:center}.live2d-placeholder .icon{font-size:48px;margin-bottom:8px}.live2d-talking{position:absolute;top:8px;right:8px;background:var(--green);color:#fff;padding:4px 10px;border-radius:4px;font-size:12px;animation:pulse 1s infinite}@keyframes pulse{0%,100%{opacity:1}50%{opacity:.6}}
|
||||||
.panel{display:none}.panel.active{display:block}
|
.mic-btn{width:44px;height:44px;border-radius:50%;border:none;background:var(--surface2);color:var(--text);cursor:pointer;font-size:18px;display:flex;align-items:center;justify-content:center;transition:.2s;flex-shrink:0}.mic-btn:hover:not(:disabled){background:var(--accent);color:#fff}.mic-btn.recording{background:var(--red);color:#fff;animation:micPulse 1s infinite}.mic-btn:disabled{opacity:.4;cursor:not-allowed}@keyframes micPulse{0%,100%{box-shadow:0 0 0 0 rgba(239,68,68,.5)}50%{box-shadow:0 0 0 8px rgba(239,68,68,0)}}.rec-tip{font-size:11px;color:var(--amber);margin-top:6px;line-height:1.5}.rec-tip code{background:var(--surface2);padding:1px 5px;border-radius:3px;font-size:10px}.audio-inline{margin-top:8px}.audio-inline audio{width:100%;max-width:280px;height:32px}
|
||||||
.char-bar{display:flex;align-items:center;gap:12px;background:var(--surface);border:1px solid var(--border);border-radius:var(--radius);padding:12px 16px;margin-bottom:12px}
|
.char-grid{display:grid;grid-template-columns:repeat(auto-fill,minmax(220px,1fr));gap:12px}.char-card{background:var(--surface);border:2px solid var(--border);border-radius:var(--radius);padding:16px;cursor:pointer;transition:.2s}.char-card:hover{border-color:var(--accent)}.char-card.active{border-color:var(--green);background:var(--accent-glow)}.char-card .name{font-size:16px;font-weight:600;margin-bottom:4px}.char-card .strat{font-size:11px;color:var(--muted);margin-top:6px;line-height:1.4}.char-card .badge{display:inline-block;margin-top:8px;padding:2px 8px;background:var(--green);color:#fff;border-radius:4px;font-size:11px}
|
||||||
.char-bar .avatar{width:40px;height:40px;border-radius:50%;background:var(--surface2);display:flex;align-items:center;justify-content:center;font-size:20px}
|
.model-bar{display:flex;gap:12px;margin-bottom:16px;flex-wrap:wrap}.model-stat{background:var(--surface);border:1px solid var(--border);border-radius:8px;padding:8px 14px;font-size:12px}.model-stat .label{color:var(--muted);margin-right:4px}.model-stat .val{font-weight:600}.model-list{display:flex;flex-direction:column;gap:8px}.model-item{display:flex;align-items:center;justify-content:space-between;background:var(--surface);border:1px solid var(--border);border-radius:8px;padding:12px 16px}.model-item .info{flex:1}.model-item .info .name{font-weight:600;font-size:14px}.model-item .info .desc{font-size:12px;color:var(--muted);margin-top:2px}.model-item .actions{display:flex;gap:6px}.model-item .actions button{padding:6px 12px;border:1px solid var(--border);background:var(--surface2);color:var(--text);border-radius:6px;cursor:pointer;font-size:12px}.model-item .actions button:hover{border-color:var(--accent);color:var(--accent)}.model-item .actions button.danger:hover{border-color:var(--red);color:var(--red)}.model-item .actions button.active{background:var(--green);color:#fff;border-color:var(--green)}.tag{display:inline-block;padding:2px 6px;border-radius:4px;font-size:10px;margin-left:6px}.tag.llm{background:rgba(99,102,241,.2);color:#a5b4fc}.tag.asr{background:rgba(34,197,94,.2);color:#86efac}.tag.tts{background:rgba(245,158,11,.2);color:#fcd34d}.tag.downloaded{background:rgba(34,197,94,.2);color:#86efac}.tag.active{background:var(--green);color:#fff}
|
||||||
.char-bar .info{flex:1}
|
.grid{display:grid;grid-template-columns:repeat(auto-fit,minmax(340px,1fr));gap:14px}.card{background:var(--surface);border:1px solid var(--border);border-radius:var(--radius);padding:16px}.card h2{font-size:15px;font-weight:600;margin-bottom:12px}.stats{display:grid;grid-template-columns:repeat(2,1fr);gap:8px}.stat{background:var(--surface2);border-radius:8px;padding:8px 12px}.stat .label{display:block;font-size:11px;color:var(--muted)}.stat .val{font-size:14px;font-weight:600}.stat .val.ok{color:var(--green)}.stat .val.warn{color:var(--amber)}.stat .val.err{color:var(--red)}.btns{display:flex;gap:8px;flex-wrap:wrap;margin-top:8px}.btns>*{flex:1;min-width:80px}button{font:inherit;cursor:pointer;border:0;border-radius:8px;padding:8px 16px;transition:all .15s}.btn{background:var(--accent);color:#fff}.btn:hover{filter:brightness(1.1)}.btn-s{background:var(--surface2);color:var(--text);border:1px solid var(--border)}.btn-s:hover{border-color:var(--accent);color:var(--accent)}.btn-g{background:var(--green);color:#fff}.btn-d{background:rgba(239,68,68,.15);color:var(--red);border:1px solid rgba(239,68,68,.3)}.btn-d:hover{background:rgba(239,68,68,.25)}.row{display:flex;gap:8px;align-items:flex-end;flex-wrap:wrap}.row>div{flex:1;min-width:120px}label{display:block;font-size:12px;color:var(--muted);margin-bottom:4px}input,select,textarea{width:100%;padding:8px 12px;background:var(--surface2);border:1px solid var(--border);border-radius:8px;color:var(--text);font:inherit}input:focus,select:focus,textarea:focus{border-color:var(--accent);outline:none}textarea{min-height:200px;font-family:ui-monospace,"Cascadia Code","Consolas",monospace;font-size:12px;resize:vertical}.list{display:flex;flex-direction:column;gap:6px;max-height:260px;overflow-y:auto}.list .item{display:flex;align-items:center;gap:8px;padding:8px 12px;background:var(--surface2);border-radius:8px}.list .item .name{flex:1;font-size:13px}.list .item .meta{font-size:11px;color:var(--muted);white-space:nowrap}.list .item .dir-icon{font-size:16px}.file-toolbar{display:flex;gap:8px;align-items:center;flex-wrap:wrap;margin-bottom:8px}.file-breadcrumb{font-size:12px;color:var(--muted);margin-bottom:8px}.file-breadcrumb span{cursor:pointer}.file-breadcrumb span:hover{text-decoration:underline}.file-breadcrumb .sep{margin:0 4px;cursor:default}.checkbox-label{display:flex;align-items:center;gap:4px;margin:0}
|
||||||
.char-bar .info .name{font-weight:600;font-size:15px}
|
.toast{position:fixed;bottom:20px;left:50%;transform:translateX(-50%);background:var(--surface2);border:1px solid var(--border);color:var(--text);padding:10px 20px;border-radius:8px;z-index:999;display:none;box-shadow:0 4px 20px rgba(0,0,0,.4)}.toast.ok{border-color:rgba(34,197,94,.4)}.toast.err{border-color:rgba(239,68,68,.4);color:var(--red)}
|
||||||
.char-bar .info .type-badge{font-size:11px;padding:2px 8px;border-radius:4px;margin-left:8px;text-transform:uppercase}
|
.modal-backdrop{position:fixed;inset:0;background:rgba(10,12,18,.72);backdrop-filter:blur(10px);display:none;align-items:center;justify-content:center;padding:20px;z-index:998}.modal-backdrop.open{display:flex}.download-modal{width:min(100%,420px);background:linear-gradient(180deg,rgba(36,40,54,.98),rgba(26,29,39,.98));border:1px solid rgba(99,102,241,.28);border-radius:20px;padding:22px;box-shadow:0 24px 60px rgba(0,0,0,.4)}.download-modal h2{font-size:22px;margin-bottom:8px}.download-modal p{color:var(--muted);margin-bottom:18px}.download-qr{display:flex;justify-content:center;align-items:center;padding:14px;background:rgba(99,102,241,.08);border:1px solid rgba(99,102,241,.2);border-radius:16px;margin-bottom:16px}.download-qr img{display:block;width:180px;height:180px;border-radius:12px;background:#fff}.download-actions{display:flex;gap:10px;flex-wrap:wrap}.download-actions>*{flex:1}.download-meta{font-size:13px;margin-bottom:14px;padding:10px 12px;border-radius:12px;background:rgba(255,255,255,.03);border:1px solid var(--border)}.download-meta.warn{color:var(--amber);border-color:rgba(245,158,11,.3);background:rgba(245,158,11,.08)}.download-note{font-size:12px;color:var(--muted);margin-top:12px}
|
||||||
.type-badge.pet{background:rgba(245,158,11,.2);color:var(--pet)}
|
@media(max-width:600px){.app{padding:12px}.tabs{flex-wrap:wrap}.grid{grid-template-columns:1fr}.header-actions{width:100%}}
|
||||||
.type-badge.human{background:rgba(99,102,241,.2);color:var(--human)}
|
|
||||||
.type-badge.singer{background:rgba(236,72,153,.2);color:var(--singer)}
|
|
||||||
.type-badge.live2d{background:rgba(34,197,94,.2);color:var(--live2d)}
|
|
||||||
.char-bar .render-badge{font-size:11px;color:var(--muted);padding:2px 8px;border:1px solid var(--border);border-radius:4px}
|
|
||||||
.chat-box{background:var(--surface);border:1px solid var(--border);border-radius:var(--radius);height:45vh;overflow-y:auto;padding:16px;margin-bottom:12px}
|
|
||||||
.msg{margin-bottom:12px;max-width:80%}
|
|
||||||
.msg.user{margin-left:auto;text-align:right}
|
|
||||||
.msg .bubble{display:inline-block;padding:10px 14px;border-radius:14px;font-size:14px;line-height:1.5}
|
|
||||||
.msg.user .bubble{background:var(--accent);color:#fff;border-bottom-right-radius:4px}
|
|
||||||
.msg.bot .bubble{background:var(--surface2);border:1px solid var(--border);border-bottom-left-radius:4px}
|
|
||||||
.msg .audio{margin-top:6px;display:flex;align-items:center;gap:6px;font-size:12px;color:var(--muted)}
|
|
||||||
.msg .audio audio{height:28px;max-width:240px}
|
|
||||||
.msg .meta{font-size:11px;color:var(--muted);margin-top:4px}
|
|
||||||
.chat-input{display:flex;gap:8px}
|
|
||||||
.chat-input input{flex:1;padding:10px 14px;background:var(--surface);border:1px solid var(--border);border-radius:var(--radius);color:var(--text);font-size:14px;outline:none}
|
|
||||||
.chat-input input:focus{border-color:var(--accent)}
|
|
||||||
.chat-input button{padding:10px 20px;background:var(--accent);color:#fff;border:none;border-radius:var(--radius);cursor:pointer;font-size:14px;white-space:nowrap}
|
|
||||||
.chat-input button:disabled{opacity:.5;cursor:not-allowed}
|
|
||||||
.status-bar{font-size:12px;color:var(--muted);margin-top:8px;min-height:18px}
|
|
||||||
.status-bar.error{color:var(--red)}
|
|
||||||
.status-bar.busy{color:var(--amber)}
|
|
||||||
.live2d-container{background:var(--surface);border:1px solid var(--border);border-radius:var(--radius);height:45vh;margin-bottom:12px;display:flex;align-items:center;justify-content:center;position:relative;overflow:hidden}
|
|
||||||
.live2d-placeholder{color:var(--muted);text-align:center}
|
|
||||||
.live2d-placeholder .icon{font-size:48px;margin-bottom:8px}
|
|
||||||
.live2d-talking{position:absolute;top:8px;right:8px;background:var(--green);color:#fff;padding:4px 10px;border-radius:4px;font-size:12px;animation:pulse 1s infinite}
|
|
||||||
@keyframes pulse{0%,100%{opacity:1}50%{opacity:.6}}
|
|
||||||
.char-grid{display:grid;grid-template-columns:repeat(auto-fill,minmax(220px,1fr));gap:12px}
|
|
||||||
.char-card{background:var(--surface);border:2px solid var(--border);border-radius:var(--radius);padding:16px;cursor:pointer;transition:.2s}
|
|
||||||
.char-card:hover{border-color:var(--accent)}
|
|
||||||
.char-card.active{border-color:var(--green);background:var(--accent-glow)}
|
|
||||||
.char-card .name{font-size:16px;font-weight:600;margin-bottom:4px}
|
|
||||||
.char-card .strat{font-size:11px;color:var(--muted);margin-top:6px;line-height:1.4}
|
|
||||||
.char-card .badge{display:inline-block;margin-top:8px;padding:2px 8px;background:var(--green);color:#fff;border-radius:4px;font-size:11px}
|
|
||||||
.model-bar{display:flex;gap:12px;margin-bottom:16px;flex-wrap:wrap}
|
|
||||||
.model-stat{background:var(--surface);border:1px solid var(--border);border-radius:8px;padding:8px 14px;font-size:12px}
|
|
||||||
.model-stat .label{color:var(--muted);margin-right:4px}
|
|
||||||
.model-stat .val{font-weight:600}
|
|
||||||
.model-list{display:flex;flex-direction:column;gap:8px}
|
|
||||||
.model-item{display:flex;align-items:center;justify-content:space-between;background:var(--surface);border:1px solid var(--border);border-radius:8px;padding:12px 16px}
|
|
||||||
.model-item .info{flex:1}
|
|
||||||
.model-item .info .name{font-weight:600;font-size:14px}
|
|
||||||
.model-item .info .desc{font-size:12px;color:var(--muted);margin-top:2px}
|
|
||||||
.model-item .actions{display:flex;gap:6px}
|
|
||||||
.model-item .actions button{padding:6px 12px;border:1px solid var(--border);background:var(--surface2);color:var(--text);border-radius:6px;cursor:pointer;font-size:12px}
|
|
||||||
.model-item .actions button:hover{border-color:var(--accent);color:var(--accent)}
|
|
||||||
.model-item .actions button.danger:hover{border-color:var(--red);color:var(--red)}
|
|
||||||
.model-item .actions button.active{background:var(--green);color:#fff;border-color:var(--green)}
|
|
||||||
.tag{display:inline-block;padding:2px 6px;border-radius:4px;font-size:10px;margin-left:6px}
|
|
||||||
.tag.llm{background:rgba(99,102,241,.2);color:#a5b4fc}
|
|
||||||
.tag.asr{background:rgba(34,197,94,.2);color:#86efac}
|
|
||||||
.tag.tts{background:rgba(245,158,11,.2);color:#fcd34d}
|
|
||||||
.tag.downloaded{background:rgba(34,197,94,.2);color:#86efac}
|
|
||||||
.tag.active{background:var(--green);color:#fff}
|
|
||||||
.mic-btn{width:44px;height:44px;border-radius:50%;border:none;background:var(--surface2);color:var(--text);cursor:pointer;font-size:18px;display:flex;align-items:center;justify-content:center;transition:.2s;flex-shrink:0}
|
|
||||||
.mic-btn:hover:not(:disabled){background:var(--accent);color:#fff}
|
|
||||||
.mic-btn.recording{background:var(--red);color:#fff;animation:micPulse 1s infinite}
|
|
||||||
.mic-btn:disabled{opacity:.4;cursor:not-allowed}
|
|
||||||
@keyframes micPulse{0%,100%{box-shadow:0 0 0 0 rgba(239,68,68,.5)}50%{box-shadow:0 0 0 8px rgba(239,68,68,0)}}
|
|
||||||
.rec-tip{font-size:11px;color:var(--amber);margin-top:6px;line-height:1.5}
|
|
||||||
.rec-tip code{background:var(--surface2);padding:1px 5px;border-radius:3px;font-size:10px}
|
|
||||||
.audio-inline{margin-top:8px}
|
|
||||||
.audio-inline audio{width:100%;max-width:280px;height:32px}
|
|
||||||
</style>
|
</style>
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
<div class="app">
|
<div class="app">
|
||||||
<h1><span class="dot"></span> Showen 数字生命控制台</h1>
|
<header><h1><span class="dot"></span> Showen 数字生命控制台</h1><div class="header-actions"><span class="ws-badge" id="ws-badge">WS 连接中</span><button class="header-link dl" onclick="openDownloadModal()">下载 App</button></div></header>
|
||||||
<div class="subtitle">统一入口 · 角色对话 · 模型管理</div>
|
<div class="subtitle">统一入口 · 角色对话 · 模型管理 · 设备控制</div>
|
||||||
<div class="char-bar" id="charBar">
|
<div class="char-bar" id="charBar"><div class="avatar" id="charAvatar">🐶</div><div class="info"><span class="name" id="charName">加载中...</span><span class="type-badge pet" id="charType">pet</span></div><div class="render-badge" id="charRender">video</div></div>
|
||||||
<div class="avatar" id="charAvatar">🐶</div>
|
|
||||||
<div class="info"><span class="name" id="charName">加载中...</span><span class="type-badge pet" id="charType">pet</span></div>
|
|
||||||
<div class="render-badge" id="charRender">video</div>
|
|
||||||
</div>
|
|
||||||
<div class="tabs">
|
<div class="tabs">
|
||||||
<div class="tab active" data-tab="chat">对话</div>
|
<button class="tab active" data-tab="chat">对话</button><button class="tab" data-tab="character">角色</button><button class="tab" data-tab="models">模型</button><button class="tab" data-tab="control">播放控制</button><button class="tab" data-tab="videos">视频管理</button><button class="tab" data-tab="files">文件管理</button><button class="tab" data-tab="wifi">网络设置</button><button class="tab" data-tab="settings">系统配置</button>
|
||||||
<div class="tab" data-tab="character">角色</div>
|
|
||||||
<div class="tab" data-tab="models">模型</div>
|
|
||||||
</div>
|
</div>
|
||||||
<div class="panel active" id="panel-chat">
|
<div class="panel active" id="panel-chat"><div id="renderArea"></div><div class="chat-box" id="chatBox" style="display:none"></div><div class="chat-input"><input type="text" id="chatInput" placeholder="输入文字与角色对话..." autocomplete="off"><button class="send-btn" id="sendBtn" onclick="sendChat()">发送</button><button class="mic-btn" id="micBtn" title="按住说话(松开发送)" disabled>🎙</button></div><div class="status-bar" id="chatStatus"></div><div class="rec-tip" id="recTip"></div></div>
|
||||||
<div id="renderArea"></div>
|
<div class="panel" id="panel-character"><div style="margin-bottom:12px;font-size:13px;color:var(--muted)">不同角色类型采用不同渲染和对话策略:pet(视频+拟声) / human(视频+自然) / singer(视频+元气) / live2d(Canvas渲染+动效)</div><div class="char-grid" id="charGrid"><div style="color:var(--muted)">加载中...</div></div></div>
|
||||||
<div class="chat-box" id="chatBox" style="display:none"></div>
|
<div class="panel" id="panel-models"><div class="model-bar" id="modelBar"></div><div class="model-list" id="modelList"><div style="color:var(--muted)">加载中...</div></div></div>
|
||||||
<div class="chat-input"><input type="text" id="chatInput" placeholder="输入文字与角色对话..." autocomplete="off"><button id="sendBtn" onclick="sendChat()">发送</button><button class="mic-btn" id="micBtn" title="按住说话(松开发送)" disabled>🎙</button></div>
|
<section class="panel" id="panel-control"><div class="grid"><div class="card"><h2>播放状态</h2><div class="stats"><div class="stat"><span class="label">状态</span><span id="st-state" class="val">--</span></div><div class="stat"><span class="label">当前视频</span><span id="st-video" class="val">--</span></div><div class="stat"><span class="label">索引</span><span id="st-index" class="val">--</span></div><div class="stat"><span class="label">列表长度</span><span id="st-len" class="val">--</span></div></div></div><div class="card"><h2>播放操作</h2><div class="btns"><button class="btn-s" onclick="wsReady?wsCmd({cmd:'prev'}):api('POST','/api/previous')">上一个</button><button class="btn" onclick="wsReady?wsCmd({cmd:'play'}):api('POST','/api/play')">播放</button><button class="btn-s" onclick="wsReady?wsCmd({cmd:'pause'}):api('POST','/api/pause')">暂停</button><button class="btn" onclick="wsReady?wsCmd({cmd:'next'}):api('POST','/api/next')">下一个</button></div><div class="row" style="margin-top:12px"><div><label>跳转到索引</label><input id="goto-idx" type="number" min="0" placeholder="0"></div><div style="flex:0"><label> </label><button class="btn" onclick="gotoVideo()">跳转</button></div></div></div><div class="card" style="grid-column:1/-1"><h2>触发器</h2><div class="btns"><button class="btn-s" onclick="triggerPreset('voice','name')">语音唤醒</button><button class="btn-s" onclick="triggerPreset('button','button1')">按钮 1</button><button class="btn-s" onclick="triggerPreset('button','button2')">按钮 2</button><button class="btn-s" onclick="triggerPreset('sensor','touch')">触摸感应</button></div><div class="row" style="margin-top:10px"><div><label>触发器名称</label><input id="tr-name" type="text" placeholder="voice"></div><div><label>触发器值</label><input id="tr-value" type="text" placeholder="name"></div><div style="flex:0"><label> </label><button class="btn" onclick="triggerCustom()">发送</button></div></div></div></div></section>
|
||||||
<div class="status-bar" id="chatStatus"></div>
|
<section class="panel" id="panel-videos"><div class="grid"><div class="card"><h2>上传视频</h2><input id="upload-file" type="file" accept="video/*" multiple><div class="btns"><button class="btn" onclick="uploadVideos()">上传</button></div></div><div class="card"><h2>设备视频文件</h2><div id="video-list" class="list"><div class="item"><span class="name">加载中...</span></div></div><div class="btns"><button class="btn-s" onclick="loadVideoList()">刷新</button></div></div></div></section>
|
||||||
<div class="rec-tip" id="recTip"></div>
|
<section class="panel" id="panel-files"><div class="card"><h2>文件管理器</h2><div class="file-toolbar"><select id="fm-dir" onchange="fmNavigate('')"><option value="videos">视频目录</option><option value="configs">配置目录</option><option value="plugins">插件目录</option></select><button class="btn-s" onclick="fmRefresh()">刷新</button><button class="btn-s" onclick="fmMkdir()">新建文件夹</button><button class="btn" onclick="document.getElementById('fm-upload-input').click()">上传文件</button><input id="fm-upload-input" type="file" multiple style="display:none" onchange="fmUpload(this)"></div><div id="fm-breadcrumb" class="file-breadcrumb"></div><div id="fm-list" class="list" style="max-height:400px"><div class="item"><span class="name">选择目录后加载...</span></div></div><div class="btns" style="margin-top:8px"><button class="btn-d" id="fm-del-btn" onclick="fmDeleteSelected()" style="display:none">删除选中</button></div></div></section>
|
||||||
|
<section class="panel" id="panel-wifi"><div class="grid"><div class="card"><h2>网络状态</h2><div class="stats"><div class="stat"><span class="label">WiFi</span><span id="wifi-connected" class="val">--</span></div><div class="stat"><span class="label">SSID</span><span id="wifi-ssid" class="val">--</span></div><div class="stat"><span class="label">IP</span><span id="wifi-ip" class="val">--</span></div><div class="stat"><span class="label">BLE</span><span id="ble-status" class="val">--</span></div></div><div class="btns"><button class="btn-s" onclick="loadWifiStatus();loadBleStatus()">刷新状态</button></div></div><div class="card"><h2>WiFi 扫描</h2><div id="wifi-list" class="list"><div class="item"><span class="name">点击扫描搜索附近网络</span></div></div><div class="btns"><button class="btn" onclick="scanWifi()">扫描网络</button></div></div><div class="card"><h2>连接 WiFi</h2><label>SSID</label><input id="wifi-ssid-input" type="text" placeholder="网络名称"><label style="margin-top:8px">密码</label><input id="wifi-pass-input" type="password" placeholder="WiFi 密码"><div class="btns"><button class="btn" onclick="connectWifi()">连接</button></div></div><div class="card"><h2>热点 / BLE</h2><label>热点名称</label><input id="ap-ssid" type="text" value="Showen"><label style="margin-top:8px">热点密码</label><input id="ap-pass" type="text" value="12345678"><div class="btns"><button class="btn-g" onclick="startAP()">开启热点</button><button class="btn-d" onclick="stopAP()">关闭热点</button></div><label style="margin-top:8px">BLE 设备名</label><input id="ble-name" type="text" value="Showen"><div class="btns"><button class="btn-s" onclick="startBLE()">启动 BLE</button><button class="btn-d" onclick="stopBLE()">停止 BLE</button></div></div></div></section>
|
||||||
|
<section class="panel" id="panel-settings"><div class="grid"><div class="card" style="grid-column:1/-1"><h2>配置文件切换</h2><div class="row"><div><label>当前配置</label><select id="cfg-select"><option>加载中...</option></select></div><div style="flex:0"><label> </label><button class="btn" onclick="switchConfig()">切换</button></div></div></div><div class="card"><h2>显示设置</h2><div id="display-form"></div><div class="btns"><button class="btn" onclick="saveDisplay()">保存显示设置</button></div></div><div class="card"><h2>配置编辑器</h2><textarea id="cfg-editor" placeholder="加载中..."></textarea><div class="btns"><button class="btn-s" onclick="loadConfig()">重新加载</button><button class="btn-s" onclick="formatConfig()">格式化</button><button class="btn" onclick="saveConfig()">保存配置</button></div></div></div></section>
|
||||||
</div>
|
</div>
|
||||||
<div class="panel" id="panel-character">
|
<div class="toast" id="toast"></div>
|
||||||
<div style="margin-bottom:12px;font-size:13px;color:var(--muted)">不同角色类型采用不同渲染和对话策略:pet(视频+拟声) / human(视频+自然) / singer(视频+元气) / live2d(Canvas渲染+动效)</div>
|
<div class="modal-backdrop" id="download-modal" onclick="closeDownloadModal(event)"><div class="download-modal"><h2>下载手机 App</h2><p>扫描二维码或点击下载,支持蓝牙配网和远程控制</p><div class="download-qr"><img id="download-qr-image" style="display:none"></div><div class="download-meta" id="download-meta">正在获取 App 信息...</div><div class="download-actions"><a class="header-link dl" id="download-apk-link" style="display:none;text-decoration:none" href="#">下载 APK</a><button class="btn-s" onclick="closeDownloadModal()">关闭</button></div><div class="download-note">仅支持 Android 设备</div></div></div>
|
||||||
<div class="char-grid" id="charGrid"><div style="color:var(--muted)">加载中...</div></div>
|
<!-- Live2D 渲染依赖:PixiJS v6 + Cubism Core + pixi-live2d-display -->
|
||||||
</div>
|
<script src="https://cdn.jsdelivr.net/npm/pixi.js@6.5.10/dist/browser/pixi.min.js"></script>
|
||||||
<div class="panel" id="panel-models">
|
<script src="https://cubism.live2d.com/sdk-web/cubismcore/live2dcubismcore.min.js"></script>
|
||||||
<div class="model-bar" id="modelBar"></div>
|
<script src="https://cdn.jsdelivr.net/gh/dylanNew/live2d/webgl/Live2D/lib/live2d.min.js"></script>
|
||||||
<div class="model-list" id="modelList"><div style="color:var(--muted)">加载中...</div></div>
|
<script src="https://cdn.jsdelivr.net/npm/pixi-live2d-display/dist/index.min.js"></script>
|
||||||
</div>
|
<script src="chat.js"></script>
|
||||||
</div>
|
|
||||||
<script>
|
|
||||||
const $=s=>document.querySelector(s);const sessionId='web_'+Date.now();let chatBusy=false;let currentChar={name:'未知',character_type:'pet',render_type:'video',talk_state:'talk'};
|
|
||||||
const charStrategies={pet:{icon:'🐶',label:'宠物',render:'video',placeholder:'和宠物说说话...'},human:{icon:'🧑',label:'数字人',render:'video',placeholder:'和数字人对话...'},singer:{icon:'🎤',label:'歌姬',render:'video',placeholder:'和歌姬聊天...'},live2d:{icon:'✨',label:'Live2D数字人',render:'live2d',placeholder:'和Live2D数字人对话...'}};
|
|
||||||
document.querySelectorAll('.tab').forEach(t=>{t.onclick=()=>{document.querySelectorAll('.tab').forEach(x=>x.classList.remove('active'));document.querySelectorAll('.panel').forEach(x=>x.classList.remove('active'));t.classList.add('active');$('#panel-'+t.dataset.tab).classList.add('active');if(t.dataset.tab==='character')loadCharacters();if(t.dataset.tab==='models')loadModels();};});
|
|
||||||
function applyCharStrategy(char){currentChar=char;const strat=charStrategies[char.character_type||'pet']||charStrategies.pet;$('#charAvatar').textContent=strat.icon;$('#charName').textContent=char.name||'未知角色';const tb=$('#charType');tb.textContent=strat.label;tb.className='type-badge '+(char.character_type||'pet');$('#charRender').textContent=char.render_type||strat.render;const ra=$('#renderArea');const cb=$('#chatBox');if((char.render_type||strat.render)==='live2d'){cb.style.display='none';ra.innerHTML='<div class="live2d-container" id="live2dContainer"><div class="live2d-placeholder"><div class="icon">✨</div>Live2D 渲染区<br><small>模型: '+(char.live2d_model||'未配置')+'</small></div></div>';}else{ra.innerHTML='';cb.style.display='block';}$('#chatInput').placeholder=strat.placeholder;}
|
|
||||||
async function sendChat(){const input=$('#chatInput');const text=input.value.trim();if(!text||chatBusy)return;chatBusy=true;$('#sendBtn').disabled=true;$('#chatStatus').textContent='思考中...';$('#chatStatus').className='status-bar busy';input.value='';addMsg('user',text);if(currentChar.render_type!=='live2d'&¤tChar.talk_state)triggerTalkState(true);if(currentChar.render_type==='live2d')showLive2dTalking(true);const botMsg=addMsg('bot','思考中...');try{const res=await fetch('/api/chat/text',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({text,session_id:sessionId})});const data=await res.json();handleChatResponse(data,botMsg);}catch(e){showChatError(botMsg,'请求失败: '+e.message);}chatBusy=false;$('#sendBtn').disabled=false;$('#chatInput').focus();}
|
|
||||||
function audioUrl(path){return '/api/chat/audio/file?path='+encodeURIComponent(path);}
|
|
||||||
function handleChatResponse(data,botMsg){if(data.error){showChatError(botMsg,'错误: '+data.error);return;}botMsg.querySelector('.bubble').textContent=data.reply_text||(data.transcription?'(无回复)':'(空回复)');if(data.transcription&&data.transcription.trim()){const tr=document.createElement('div');tr.className='meta';tr.style.color='var(--muted)';tr.textContent='🎤 你说: '+data.transcription;botMsg.querySelector('.bubble').insertAdjacentElement('beforebegin',tr);}if(data.reply_audio_path){const ad=document.createElement('div');ad.className='audio-inline';ad.innerHTML='<span style="font-size:12px;color:var(--muted)">🔊 回复语音</span><audio controls src="'+audioUrl(data.reply_audio_path)+'"></audio>';botMsg.appendChild(ad);}$('#chatStatus').textContent='';$('#chatStatus').className='status-bar';const rl=(data.reply_text||'').length;const tm=Math.max(2000,rl*200);setTimeout(()=>{triggerTalkState(false);showLive2dTalking(false);},tm);}
|
|
||||||
function showChatError(botMsg,msg){botMsg.querySelector('.bubble').textContent=msg;botMsg.querySelector('.bubble').style.color='var(--red)';$('#chatStatus').textContent=msg;$('#chatStatus').className='status-bar error';triggerTalkState(false);showLive2dTalking(false);}
|
|
||||||
function triggerTalkState(talking){const scene=talking?(currentChar.talk_state||'talk'):'idle';fetch('/api/scene',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({scene})}).catch(()=>{});}
|
|
||||||
function showLive2dTalking(talking){const c=$('#live2dContainer');if(!c)return;const ex=c.querySelector('.live2d-talking');if(talking&&!ex){const b=document.createElement('div');b.className='live2d-talking';b.textContent='说话中';c.appendChild(b);}else if(!talking&&ex)ex.remove();}
|
|
||||||
function addMsg(role,text){const box=$('#chatBox');const div=document.createElement('div');div.className='msg '+role;const t=new Date().toLocaleTimeString('zh-CN',{hour12:false});div.innerHTML='<div class="bubble"></div><div class="meta">'+t+'</div>';div.querySelector('.bubble').textContent=text;box.appendChild(div);box.scrollTop=box.scrollHeight;return div;}
|
|
||||||
$('#chatInput').addEventListener('keydown',e=>{if(e.key==='Enter'&&!e.shiftKey){e.preventDefault();sendChat();}});
|
|
||||||
async function loadCharacters(){try{const res=await fetch('/api/config/available');const data=await res.json();const grid=$('#charGrid');grid.innerHTML='';const cfgRes=await fetch('/api/config');const cfg=await cfgRes.json();const char=cfg.character||{};const strat=charStrategies[char.character_type||'pet']||charStrategies.pet;(data.configs||[]).forEach(c=>{const isActive=c===(data.active||'');const card=document.createElement('div');card.className='char-card'+(isActive?' active':'');const name=char.name||c.replace(/\.json$/,'').replace(/_/g,' ');card.innerHTML='<div class="name">'+(strat.icon||'📦')+' '+name+'</div><div><span class="type-badge '+(char.character_type||'pet')+'">'+strat.label+'</span> '+(char.render_type||strat.render)+'</div><div class="strat">策略: 拟声/自然/元气 (依据角色)</div>'+(isActive?'<span class="badge">使用中</span>':'');card.onclick=()=>switchCharacter(c);grid.appendChild(card);});}catch(e){$('#charGrid').innerHTML='<div style="color:var(--red)">加载失败</div>';}}
|
|
||||||
async function switchCharacter(filename){if(!confirm('切换到 '+filename+' ?'))return;try{const res=await fetch('/api/config/switch',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({filename})});const data=await res.json();if(data.status==='ok'||(data.message&&data.message.includes('成功'))){alert('已切换');loadCurrentChar();loadCharacters();}else alert('失败: '+(data.message||'未知'));}catch(e){alert('失败: '+e.message);}}
|
|
||||||
async function loadCurrentChar(){try{const res=await fetch('/api/config');const cfg=await res.json();applyCharStrategy(cfg.character||{name:'未知',character_type:'pet',render_type:'video'});}catch(e){console.error(e);}}
|
|
||||||
async function loadModels(){try{const res=await fetch('/api/models');const data=await res.json();const bar=$('#modelBar');const u=Math.round((data.used_space||0)/1048576);const q=Math.round((data.quota||0)/1048576);bar.innerHTML='<div class="model-stat"><span class="label">配额:</span><span class="val">'+u+'/'+q+' MB</span></div><div class="model-stat"><span class="label">已下载:</span><span class="val">'+(data.models||[]).filter(m=>m.downloaded).length+'/'+(data.models||[]).length+'</span></div>';const list=$('#modelList');list.innerHTML='';const active=data.active||{};(data.models||[]).forEach(m=>{const item=document.createElement('div');item.className='model-item';const ia=active[m.kind]===m.id;const s=Math.round(m.size/1048576);const me=Math.round(m.memory_required/1048576);let a='';if(m.downloaded){if(ia)a='<button class="active" disabled>使用中</button>';else a='<button onclick="switchModel(\''+m.id+'\',\''+m.kind+'\')">切换</button> <button class="danger" onclick="deleteModel(\''+m.id+'\')">删除</button>';}else a='<button onclick="downloadModel(\''+m.id+'\')">下载</button>';item.innerHTML='<div class="info"><div class="name">'+m.name+' <span class="tag '+m.kind+'">'+m.kind.toUpperCase()+'</span>'+(m.downloaded?'<span class="tag downloaded">已下载</span>':'')+(ia?'<span class="tag active">活跃</span>':'')+'</div><div class="desc">'+s+'MB | 需 '+me+'MB | '+m.recommended_tier+'</div></div><div class="actions">'+a+'</div>';list.appendChild(item);});}catch(e){$('#modelList').innerHTML='<div style="color:var(--red)">失败</div>';}}
|
|
||||||
async function downloadModel(id){try{const res=await fetch('/api/models/download',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({model_id:id})});const data=await res.json();alert(data.message||'下载已启动');setTimeout(loadModels,3000);}catch(e){alert('失败');}}
|
|
||||||
async function switchModel(id,kind){try{const res=await fetch('/api/models/switch',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({model_id:id,kind})});const data=await res.json();alert(data.message||'已切换');loadModels();}catch(e){alert('失败');}}
|
|
||||||
async function deleteModel(id){if(!confirm('删除 '+id+'?'))return;try{const res=await fetch('/api/models/delete',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({model_id:id})});const data=await res.json();alert(data.message||'已删除');loadModels();}catch(e){alert('失败');}}
|
|
||||||
initMic();
|
|
||||||
async function initMic(){const micBtn=$('#micBtn');const tip=$('#recTip');if(!navigator.mediaDevices||!navigator.mediaDevices.getUserMedia){tip.innerHTML='当前浏览器不支持录音。请使用文字对话。';return;}if(!window.isSecureContext){micBtn.disabled=true;tip.innerHTML='⚠️ 录音需要安全上下文(HTTPS 或 localhost)。当前为 HTTP 访问,录音已禁用。<br>启用方法(桌面 Chrome/Edge):右键浏览器图标 → 属性 → 在目标末尾加 <code>--unsafely-treat-insecure-origin-as-secure=http://192.168.31.105:5000</code> → 重启浏览器并访问本页。<br>或直接用文字对话,回复语音仍可正常播放。';return;}let mediaRecorder=null;let chunks=[];let recStream=null;let recTimer=null;const startRec=async()=>{if(chatBusy)return;try{recStream=await navigator.mediaDevices.getUserMedia({audio:{channelCount:1,sampleRate:16000,echoCancellation:true,noiseSuppression:true}});chunks=[];mediaRecorder=new MediaRecorder(recStream);mediaRecorder.ondataavailable=e=>{if(e.data.size>0)chunks.push(e.data);};mediaRecorder.onstop=()=>{if(recTimer){clearTimeout(recTimer);recTimer=null;}recStream.getTracks().forEach(t=>t.stop());recStream=null;const blob=new Blob(chunks,{type:mediaRecorder.mimeType||'audio/webm'});if(blob.size<1000){micBtn.classList.remove('recording');micBtn.textContent='🎙';$('#chatStatus').textContent='录音过短,已取消';$('#chatStatus').className='status-bar error';return;}sendAudioBlob(blob,mediaRecorder.mimeType||'audio/webm');};mediaRecorder.start();micBtn.classList.add('recording');micBtn.textContent='⏹';$('#chatStatus').textContent='录音中...(松开发送)';$('#chatStatus').className='status-bar busy';recTimer=setTimeout(()=>{if(mediaRecorder&&mediaRecorder.state==='recording'){stopRec();$('#chatStatus').textContent='录音达到 30s 上限,自动发送';}},30000);}catch(e){micBtn.classList.remove('recording');micBtn.textContent='🎙';$('#chatStatus').textContent='麦克风启动失败: '+e.message;$('#chatStatus').className='status-bar error';}};const stopRec=()=>{if(mediaRecorder&&mediaRecorder.state==='recording'){mediaRecorder.stop();micBtn.classList.remove('recording');micBtn.textContent='🎙';}};micBtn.disabled=false;micBtn.addEventListener('mousedown',startRec);micBtn.addEventListener('touchstart',e=>{e.preventDefault();startRec();});micBtn.addEventListener('mouseup',stopRec);micBtn.addEventListener('mouseleave',stopRec);micBtn.addEventListener('touchend',e=>{e.preventDefault();stopRec();});}
|
|
||||||
async function sendAudioBlob(blob,mimeType){if(chatBusy)return;chatBusy=true;$('#sendBtn').disabled=true;const micBtn=$('#micBtn');micBtn.disabled=true;$('#chatStatus').textContent='转码中...';$('#chatStatus').className='status-bar busy';const userMsg=addMsg('user','🎤 [语音消息]');const playUrl=URL.createObjectURL(blob);const up=document.createElement('div');up.className='audio-inline';up.innerHTML='<span style="font-size:11px;color:var(--muted)">你的录音</span><audio controls src="'+playUrl+'"></audio>';userMsg.appendChild(up);if(currentChar.render_type!=='live2d'&¤tChar.talk_state)triggerTalkState(true);if(currentChar.render_type==='live2d')showLive2dTalking(true);const botMsg=addMsg('bot','思考中...');try{const wavBlob=await blobToWav(blob);$('#chatStatus').textContent='识别中...';const res=await fetch('/api/chat/audio',{method:'POST',headers:{'Content-Type':'audio/wav','X-Audio-Format':'wav'},body:wavBlob});const data=await res.json();handleChatResponse(data,botMsg);}catch(e){showChatError(botMsg,'请求失败: '+e.message);}chatBusy=false;$('#sendBtn').disabled=false;micBtn.disabled=false;}
|
|
||||||
async function blobToWav(blob){const arrayBuf=await blob.arrayBuffer();const audioCtx=new(window.AudioContext||window.webkitAudioContext)({sampleRate:16000});const decoded=await audioCtx.decodeAudioData(arrayBuf);const pcm=decodeToMonoPCM16(decoded,16000);audioCtx.close();return encodeWavBlob(pcm,16000);}
|
|
||||||
function decodeToMonoPCM16(audioBuffer,targetRate){const numCh=audioBuffer.numberOfChannels;const len=audioBuffer.length;const srcRate=audioBuffer.sampleRate;const outLen=Math.round(len*targetRate/srcRate);const out=new Int16Array(outLen);const tmp=new Float32Array(outLen);for(let ch=0;ch<numCh;ch++){const data=audioBuffer.getChannelData(ch);for(let i=0;i<outLen;i++){const srcIdx=i*srcRate/targetRate;const i0=Math.floor(srcIdx);const i1=Math.min(i0+1,len-1);const frac=srcIdx-i0;tmp[i]+=data[i0]*(1-frac)+data[i1]*frac;}}for(let i=0;i<outLen;i++){let s=tmp[i]/numCh;s=Math.max(-1,Math.min(1,s));out[i]=s<0?s*0x8000:s*0x7FFF;}return out;}
|
|
||||||
function encodeWavBlob(samples,sampleRate){const buf=new ArrayBuffer(44+samples.length*2);const view=new DataView(buf);const writeStr=(off,s)=>{for(let i=0;i<s.length;i++)view.setUint8(off+i,s.charCodeAt(i));};writeStr(0,'RIFF');view.setUint32(4,36+samples.length*2,true);writeStr(8,'WAVE');writeStr(12,'fmt ');view.setUint32(16,16,true);view.setUint16(20,1,true);view.setUint16(22,1,true);view.setUint32(24,sampleRate,true);view.setUint32(28,sampleRate*2,true);view.setUint16(32,2,true);view.setUint16(34,16,true);writeStr(36,'data');view.setUint32(40,samples.length*2,true);let off=44;for(let i=0;i<samples.length;i++){view.setInt16(off,samples[i],true);off+=2;}return new Blob([buf],{type:'audio/wav'});}
|
|
||||||
loadCurrentChar();
|
|
||||||
</script>
|
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
|||||||
79
src/plugins/http/chat.js
Normal file
79
src/plugins/http/chat.js
Normal file
@@ -0,0 +1,79 @@
|
|||||||
|
/* Showen 统一控制台 JS — chat.js */
|
||||||
|
var $=function(id){return typeof id==='string'?document.getElementById(id):id};
|
||||||
|
var ws=null,wsReady=false,cachedConfig=null,fmCurrentDir='videos',fmCurrentPath='',chatBusy=false,currentChar={name:'未知',character_type:'pet',render_type:'video',talk_state:'talk'},sessionId='web_'+Date.now();
|
||||||
|
var charStrategies={pet:{icon:'🐶',label:'宠物',render:'video',placeholder:'和宠物说说话...'},human:{icon:'🧑',label:'数字人',render:'video',placeholder:'和数字人对话...'},singer:{icon:'🎤',label:'歌姬',render:'video',placeholder:'和歌姬聊天...'},live2d:{icon:'✨',label:'Live2D数字人',render:'live2d',placeholder:'和Live2D数字人对话...'}};
|
||||||
|
function toast(m,e){var el=$('toast');el.textContent=m;el.className='toast '+(e?'err':'ok');el.style.display='block';clearTimeout(el._t);el._t=setTimeout(function(){el.style.display='none'},3000)}
|
||||||
|
function esc(v){return String(v).replace(/[&<>"]/g,function(c){return({'&':'&','<':'<','>':'>','"':'"'})[c]})}
|
||||||
|
function ea(v){return esc(v).replace(/'/g,''')}
|
||||||
|
function js(v){return String(v).replace(/\\/g,'\\\\').replace(/'/g,"\\'")}
|
||||||
|
function formatBytes(s){if(s===undefined||s===null||isNaN(s))return'--';if(s<1024)return s+' B';if(s<1048576)return(s/1024).toFixed(1)+' KB';if(s<1073741824)return(s/1048576).toFixed(1)+' MB';return(s/1073741824).toFixed(1)+' GB'}
|
||||||
|
document.querySelectorAll('.tab').forEach(function(t){t.onclick=function(){document.querySelectorAll('.tab').forEach(function(e){e.classList.remove('active')});document.querySelectorAll('.panel').forEach(function(e){e.classList.remove('active')});t.classList.add('active');$('panel-'+t.dataset.tab).classList.add('active');var tab=t.dataset.tab;if(tab==='character')loadCharacters();if(tab==='models')loadModels();if(tab==='videos')loadVideoList();if(tab==='files')fmRefresh();if(tab==='wifi'){loadWifiStatus();loadBleStatus()}if(tab==='settings'&&!cachedConfig){loadConfig();loadAvailableConfigs()}}});
|
||||||
|
function connectWS(){var proto=location.protocol==='https:'?'wss:':'ws:';ws=new WebSocket(proto+'//'+location.host+'/ws');ws.onopen=function(){wsReady=true;$('ws-badge').textContent='WS 已连接';$('ws-badge').style.borderColor='rgba(34,197,94,.4)';$('ws-badge').style.color='#22c55e';$('ws-badge').style.background='rgba(34,197,94,.1)'};ws.onclose=function(){wsReady=false;$('ws-badge').textContent='WS 断开';$('ws-badge').style.borderColor='rgba(239,68,68,.3)';$('ws-badge').style.color='#ef4444';$('ws-badge').style.background='rgba(239,68,68,.1)';setTimeout(connectWS,2000)};ws.onerror=function(){wsReady=false};ws.onmessage=function(ev){try{var msg=JSON.parse(ev.data);if(msg.type==='status_update')applyStatus(msg.data);else if(msg.type==='state_update')toast('场景: '+msg.data.old_state+' -> '+msg.data.new_state);else if(msg.type==='wifi_update')applyWifi(msg.data);else if(msg.type==='ble_update')applyBle(msg.data);else if(msg.type==='config_update'){cachedConfig=msg.data;applyCharStrategy(msg.data.character||{})}}catch(e){}}}
|
||||||
|
function wsCmd(obj){if(wsReady)ws.send(JSON.stringify(obj));else toast('WebSocket 未连接',true)}
|
||||||
|
function api(method,path,body){var opts={method:method,headers:{}};if(body!==undefined){if(typeof body==='string'){opts.headers['Content-Type']='application/json';opts.body=body}else if(body instanceof FormData){opts.body=body}else{opts.headers['Content-Type']='application/json';opts.body=JSON.stringify(body)}}return fetch(path,opts).then(function(r){return r.json().then(function(d){if(!r.ok)throw d;return d})}).then(function(d){if(d.message)toast(d.message,d.status==='error');return d}).catch(function(e){toast((e&&e.message)||'请求失败',true);throw e})}
|
||||||
|
function applyStatus(d){var el=$('st-state');if(!d.running){el.textContent='已停止';el.className='val warn'}else if(d.paused){el.textContent='已暂停';el.className='val warn'}else{el.textContent='播放中';el.className='val ok'}$('st-video').textContent=d.current_video||'无';$('st-index').textContent=d.current_index;$('st-len').textContent=d.playlist_length}
|
||||||
|
function refreshStatus(){fetch('/api/status').then(function(r){return r.json()}).then(applyStatus).catch(function(){})}
|
||||||
|
function applyWifi(d){if(d.connected!==undefined){$('wifi-connected').textContent=d.connected?'已连接':'未连接';$('wifi-connected').className=d.connected?'val ok':'val err';$('wifi-ssid').textContent=d.ssid||'--';$('wifi-ip').textContent=d.ip||'--'}}
|
||||||
|
function applyBle(d){if(d.ready!==undefined){var el=$('ble-status');el.textContent=d.ready?'运行中':'未就绪';el.className=d.ready?'val ok':'val warn'}}
|
||||||
|
function gotoVideo(){var idx=$('goto-idx').value;if(idx===''){toast('请输入索引',true);return}if(wsReady)wsCmd({cmd:'goto',index:parseInt(idx,10)});else api('POST','/api/goto/'+idx)}
|
||||||
|
function triggerPreset(n,v){if(wsReady)wsCmd({cmd:'trigger',name:n,value:v||''});else api('POST','/api/trigger/'+encodeURIComponent(n)+'/'+encodeURIComponent(v||''))}
|
||||||
|
function triggerCustom(){var n=$('tr-name').value,v=$('tr-value').value;if(!n){toast('请输入触发器名',true);return}triggerPreset(n,v)}
|
||||||
|
function loadVideoList(){fetch('/api/videos').then(function(r){return r.json()}).then(function(files){var el=$('video-list');if(!files.length){el.innerHTML='<div class="item"><span class="name">目录中没有视频文件</span></div>';return}el.innerHTML=files.map(function(f){var sz=f.size<1048576?(f.size/1024).toFixed(1)+' KB':(f.size/1048576).toFixed(1)+' MB';return '<div class="item"><span class="name">'+esc(f.name)+'</span><span class="meta">'+sz+'</span><button class="btn-d" onclick="deleteVideo(\''+js(f.name)+'\')">删除</button></div>'}).join('')}).catch(function(){toast('加载视频列表失败',true)})}
|
||||||
|
function uploadVideos(){var input=$('upload-file');if(!input.files.length){toast('请先选择文件',true);return}var fd=new FormData();for(var i=0;i<input.files.length;i++)fd.append('file',input.files[i],input.files[i].name);fetch('/api/videos/upload',{method:'POST',body:fd}).then(function(r){return r.json()}).then(function(d){toast(d.message,d.status==='error');input.value='';loadVideoList()}).catch(function(){toast('上传失败',true)})}
|
||||||
|
function deleteVideo(name){if(!confirm('确定删除 '+name+' ?'))return;fetch('/api/videos/'+encodeURIComponent(name),{method:'DELETE'}).then(function(r){return r.json()}).then(function(d){toast(d.message,d.status==='error');loadVideoList()}).catch(function(){toast('删除失败',true)})}
|
||||||
|
function fmRefresh(){fmNavigate(fmCurrentPath)}
|
||||||
|
function fmNavigate(subpath){fmCurrentDir=$('fm-dir').value;fmCurrentPath=subpath||'';var url='/api/files/'+fmCurrentDir;if(fmCurrentPath)url+='?path='+encodeURIComponent(fmCurrentPath);var bc=$('fm-breadcrumb');var parts=fmCurrentPath?fmCurrentPath.split('/'):[];var html='<span onclick="fmNavigate(\'\')">'+({'videos':'视频目录','configs':'配置目录','plugins':'插件目录'}[fmCurrentDir]||fmCurrentDir)+'</span>';var acc='';for(var i=0;i<parts.length;i++){if(parts[i]){acc+=(acc?'/':'')+parts[i];html+='<span class="sep">/</span><span onclick="fmNavigate(\''+js(acc)+'\')">'+esc(parts[i])+'</span>'}}bc.innerHTML=html;fetch(url).then(function(r){return r.json()}).then(function(entries){var el=$('fm-list');if(entries.status==='error'){el.innerHTML='<div class="item"><span class="name">'+esc(entries.message)+'</span></div>';return}if(!entries.length){el.innerHTML='<div class="item"><span class="name">空目录</span></div>';$('fm-del-btn').style.display='none';return}var html='';for(var i=0;i<entries.length;i++){var e=entries[i];var sz=e.is_dir?'':e.size<1048576?(e.size/1024).toFixed(1)+' KB':(e.size/1048576).toFixed(1)+' MB';var fp=fmCurrentPath?(fmCurrentPath+'/'+e.name):e.name;html+='<div class="item"><label class="checkbox-label"><input type="checkbox" class="fm-check" data-path="'+esc(fp)+'" data-isdir="'+(e.is_dir?'1':'0')+'"></label>';if(e.is_dir){html+='<span class="dir-icon">📁</span><span class="name" style="cursor:pointer;color:var(--amber)" onclick="fmNavigate(\''+js(fp)+'\')">'+esc(e.name)+'</span>'}else{html+='<span class="name">'+esc(e.name)+'</span>'}html+='<span class="meta">'+sz+'</span>';if(!e.is_dir){html+='<button class="btn-s" onclick="fmDownload(\''+js(fp)+'\')">下载</button>'}html+='</div>'}el.innerHTML=html;el.querySelectorAll('.fm-check').forEach(function(cb){cb.onchange=fmUpdateDelBtn});fmUpdateDelBtn()}).catch(function(){toast('加载文件列表失败',true)})}
|
||||||
|
function fmUpdateDelBtn(){var cbs=document.querySelectorAll('.fm-check:checked');$('fm-del-btn').style.display=cbs.length?'':'none';$('fm-del-btn').textContent='删除选中 ('+cbs.length+')'}
|
||||||
|
function fmDeleteSelected(){var cbs=document.querySelectorAll('.fm-check:checked');if(!cbs.length)return;if(!confirm('确定删除 '+cbs.length+' 个项目?'))return;var promises=[];cbs.forEach(function(cb){var p=cb.dataset.path;promises.push(fetch('/api/files/'+fmCurrentDir+'/delete',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({path:p})}).then(function(r){return r.json()}))});Promise.all(promises).then(function(results){var ok=0,fail=0;results.forEach(function(r){if(r.status==='ok')ok++;else fail++});toast('删除完成: '+ok+' 成功'+(fail?' / '+fail+' 失败':''),fail>0);fmRefresh()})}
|
||||||
|
function fmDownload(path){window.open('/api/files/'+fmCurrentDir+'/download?path='+encodeURIComponent(path),'_blank')}
|
||||||
|
function fmUpload(input){if(!input.files.length)return;var fd=new FormData();for(var i=0;i<input.files.length;i++)fd.append('file',input.files[i],input.files[i].name);var url='/api/files/'+fmCurrentDir+'/upload';if(fmCurrentPath)url+='?path='+encodeURIComponent(fmCurrentPath);fetch(url,{method:'POST',body:fd}).then(function(r){return r.json()}).then(function(d){toast(d.message,d.status==='error');input.value='';fmRefresh()}).catch(function(){toast('上传失败',true)})}
|
||||||
|
function fmMkdir(){var name=prompt('输入新文件夹名称:');if(!name)return;var path=fmCurrentPath?(fmCurrentPath+'/'+name):name;fetch('/api/files/'+fmCurrentDir+'/mkdir',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({path:path})}).then(function(r){return r.json()}).then(function(d){toast(d.message,d.status==='error');fmRefresh()}).catch(function(){toast('创建失败',true)})}
|
||||||
|
function loadWifiStatus(){fetch('/api/wifi/status').then(function(r){return r.json()}).then(applyWifi).catch(function(){})}
|
||||||
|
function scanWifi(){$('wifi-list').innerHTML='<div class="item"><span class="name">扫描中...</span></div>';fetch('/api/wifi/scan').then(function(r){return r.json()}).then(function(list){if(!list.length){$('wifi-list').innerHTML='<div class="item"><span class="name">未发现 WiFi</span></div>';return}$('wifi-list').innerHTML=list.map(function(n){return '<div class="item"><span class="name">'+esc(n.ssid||'隐藏网络')+'</span><span class="meta">'+esc(String(n.signal||0))+' / '+esc(n.security||'OPEN')+'</span><button class="btn-s" onclick="selectWifi(\''+js(n.ssid||'')+'\')">选择</button></div>'}).join('')}).catch(function(){toast('扫描失败',true)})}
|
||||||
|
function selectWifi(ssid){$('wifi-ssid-input').value=ssid}
|
||||||
|
function connectWifi(){var s=$('wifi-ssid-input').value,p=$('wifi-pass-input').value;if(!s){toast('请输入 WiFi 名称',true);return}if(wsReady)wsCmd({cmd:'connect',ssid:s,password:p});else api('POST','/api/wifi/connect',{ssid:s,password:p}).then(function(){setTimeout(loadWifiStatus,1500)})}
|
||||||
|
function startAP(){var s=$('ap-ssid').value||'showen',p=$('ap-pass').value||'12345678';if(p.length<8){toast('热点密码至少 8 位',true);return}if(wsReady)wsCmd({cmd:'ap_start',ssid:s,password:p});else api('POST','/api/wifi/ap/start',{ssid:s,password:p})}
|
||||||
|
function stopAP(){if(wsReady)wsCmd({cmd:'ap_stop'});else api('POST','/api/wifi/ap/stop')}
|
||||||
|
function loadBleStatus(){fetch('/api/ble/status').then(function(r){return r.json()}).then(function(d){var el=$('ble-status');if(d.running){el.textContent='运行中 / '+(d.device_name||'showen');el.className='val ok'}else{el.textContent='未就绪';el.className='val warn'}}).catch(function(){})}
|
||||||
|
function startBLE(){api('POST','/api/ble/start',{device_name:$('ble-name').value||'showen'}).then(loadBleStatus)}
|
||||||
|
function stopBLE(){api('POST','/api/ble/stop').then(loadBleStatus)}
|
||||||
|
function loadAvailableConfigs(){fetch('/api/config/available').then(function(r){return r.json()}).then(function(d){var sel=$('cfg-select');sel.innerHTML='';(d.configs||[]).forEach(function(item){var f=typeof item==='string'?item:item.filename;var opt=document.createElement('option');opt.value=f;opt.textContent=f;if(f===d.active)opt.selected=true;sel.appendChild(opt)})}).catch(function(){})}
|
||||||
|
function switchConfig(){var f=$('cfg-select').value;if(!f){toast('请选择配置',true);return}if(!confirm('确定切换到 '+f+' ?'))return;api('POST','/api/config/switch',{filename:f}).then(function(){loadConfig();loadAvailableConfigs()})}
|
||||||
|
function loadConfig(){fetch('/api/config').then(function(r){return r.json()}).then(function(cfg){cachedConfig=cfg;$('cfg-editor').value=JSON.stringify(cfg,null,2);renderDisplay(cfg.display);applyCharStrategy(cfg.character||{})}).catch(function(){toast('加载配置失败',true)})}
|
||||||
|
function formatConfig(){try{$('cfg-editor').value=JSON.stringify(JSON.parse($('cfg-editor').value),null,2)}catch(_){toast('JSON 格式错误',true)}}
|
||||||
|
function saveConfig(){var raw=$('cfg-editor').value;try{JSON.parse(raw)}catch(_){toast('JSON 格式错误',true);return}api('POST','/api/config',raw).then(loadConfig)}
|
||||||
|
function renderDisplay(d){if(!d)return;var h='';h+='<label class="checkbox-label"><input id="d-fullscreen" type="checkbox" '+(d.fullscreen?'checked':'')+'> 全屏模式</label>';h+='<label>窗口标题</label><input id="d-title" type="text" value="'+ea(d.window_title||'')+'">';h+='<label>旋转角度</label><input id="d-rotation" type="number" value="'+ea(String(d.rotation||0))+'">';h+='<label>渲染宽度</label><input id="d-render-width" type="number" value="'+ea(String(d.render_width||1024))+'">';h+='<label>渲染高度</label><input id="d-render-height" type="number" value="'+ea(String(d.render_height||1024))+'">';h+='<label>色键下限 (H,S,V)</label><input id="d-ck-min" type="text" value="'+ea((d.chroma_key&&d.chroma_key.hsv_min?d.chroma_key.hsv_min.join(','):'0,0,200'))+'">';h+='<label>色键上限 (H,S,V)</label><input id="d-ck-max" type="text" value="'+ea((d.chroma_key&&d.chroma_key.hsv_max?d.chroma_key.hsv_max.join(','):'180,30,255'))+'">';h+='<label>透视校正点 (JSON)</label><input id="d-points" type="text" value="'+ea(JSON.stringify((d.perspective_correction&&d.perspective_correction.points)||[]))+'">';$('display-form').innerHTML=h}
|
||||||
|
function saveDisplay(){if(!cachedConfig){loadConfig();return}var n=JSON.parse(JSON.stringify(cachedConfig));n.display.fullscreen=$('d-fullscreen').checked;n.display.window_title=$('d-title').value;n.display.rotation=parseInt($('d-rotation').value||'0',10);n.display.render_width=parseInt($('d-render-width').value||'1024',10);n.display.render_height=parseInt($('d-render-height').value||'1024',10);n.display.chroma_key=n.display.chroma_key||{};n.display.chroma_key.hsv_min=$('d-ck-min').value.split(',').map(function(v){return parseInt(v.trim()||'0',10)});n.display.chroma_key.hsv_max=$('d-ck-max').value.split(',').map(function(v){return parseInt(v.trim()||'0',10)});n.display.perspective_correction=n.display.perspective_correction||{};try{n.display.perspective_correction.points=JSON.parse($('d-points').value)}catch(_){toast('透视点 JSON 无效',true);return}cachedConfig=n;$('cfg-editor').value=JSON.stringify(n,null,2);saveConfig()}
|
||||||
|
function updateDownloadModal(info){var meta=$('download-meta'),link=$('download-apk-link'),qr=$('download-qr-image');if(!info||!info.apk_available){meta.textContent='APK 尚未发布,请稍后再试';meta.className='download-meta warn';link.style.display='none';qr.style.display='none';qr.removeAttribute('src');return}var url=location.origin+(info.download_url||'/download/showen-app.apk');meta.textContent='版本 '+(info.version||'0.1.0')+' · '+formatBytes(info.apk_size);meta.className='download-meta';link.style.display='inline-flex';link.href=info.download_url||'/download/showen-app.apk';qr.style.display='block';qr.src='https://api.qrserver.com/v1/create-qr-code/?size=180x180&data='+encodeURIComponent(url)}
|
||||||
|
function openDownloadModal(){var modal=$('download-modal');$('download-meta').textContent='正在获取 App 信息...';$('download-meta').className='download-meta';$('download-apk-link').style.display='none';$('download-qr-image').style.display='none';$('download-qr-image').removeAttribute('src');modal.classList.add('open');fetch('/api/app/info').then(function(r){if(!r.ok)throw new Error('加载 App 信息失败');return r.json()}).then(updateDownloadModal).catch(function(){$('download-meta').textContent='APK 信息加载失败,请稍后再试';$('download-meta').className='download-meta warn';$('download-apk-link').style.display='none';$('download-qr-image').style.display='none'})}
|
||||||
|
function closeDownloadModal(ev){if(ev&&ev.target!==$('download-modal'))return;$('download-modal').classList.remove('open')}
|
||||||
|
document.addEventListener('keydown',function(ev){if(ev.key==='Escape')closeDownloadModal()});
|
||||||
|
function applyCharStrategy(char){currentChar=char;var strat=charStrategies[char.character_type||'pet']||charStrategies.pet;$('charAvatar').textContent=strat.icon;$('charName').textContent=char.name||'未知角色';var tb=$('charType');tb.textContent=strat.label;tb.className='type-badge '+(char.character_type||'pet');$('charRender').textContent=char.render_type||strat.render;var ra=$('renderArea');var cb=$('chatBox');if((char.render_type||strat.render)==='live2d'){cb.style.display='none';ra.innerHTML='<div class="live2d-container" id="live2dContainer"><canvas id="live2dCanvas"></canvas><div class="live2d-placeholder" id="live2dPlaceholder"><div class="icon">✨</div>加载 Live2D 模型中...<br><small>模型: '+(char.live2d_model||'未配置')+'</small></div></div>';initLive2D(char)}else{ra.innerHTML='';cb.style.display='block';destroyLive2D()}$('chatInput').placeholder=strat.placeholder}
|
||||||
|
async function sendChat(){var input=$('chatInput');var text=input.value.trim();if(!text||chatBusy)return;chatBusy=true;$('sendBtn').disabled=true;$('chatStatus').textContent='思考中...';$('chatStatus').className='status-bar busy';input.value='';addMsg('user',text);if(currentChar.render_type!=='live2d'&¤tChar.talk_state)triggerTalkState(true);if(currentChar.render_type==='live2d')showLive2dTalking(true);var botMsg=addMsg('bot','思考中...');try{var res=await fetch('/api/chat/text',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({text:text,session_id:sessionId})});var data=await res.json();handleChatResponse(data,botMsg)}catch(e){showChatError(botMsg,'请求失败: '+e.message)}chatBusy=false;$('sendBtn').disabled=false;$('chatInput').focus()}
|
||||||
|
function audioUrl(path){return '/api/chat/audio/file?path='+encodeURIComponent(path)}
|
||||||
|
function handleChatResponse(data,botMsg){if(data.error){showChatError(botMsg,'错误: '+data.error);return}botMsg.querySelector('.bubble').textContent=data.reply_text||(data.transcription?'(无回复)':'(空回复)');if(data.transcription&&data.transcription.trim()){var tr=document.createElement('div');tr.className='meta';tr.style.color='var(--muted)';tr.textContent='🎤 你说: '+data.transcription;botMsg.querySelector('.bubble').insertAdjacentElement('beforebegin',tr)}if(data.reply_audio_path){var ad=document.createElement('div');ad.className='audio-inline';ad.innerHTML='<span style="font-size:12px;color:var(--muted)">🔊 回复语音</span><audio controls src="'+audioUrl(data.reply_audio_path)+'"></audio>';botMsg.appendChild(ad)}$('chatStatus').textContent='';$('chatStatus').className='status-bar';var rl=(data.reply_text||'').length;var tm=Math.max(2000,rl*200);setTimeout(function(){triggerTalkState(false);showLive2dTalking(false)},tm)}
|
||||||
|
function showChatError(botMsg,msg){botMsg.querySelector('.bubble').textContent=msg;botMsg.querySelector('.bubble').style.color='var(--red)';$('chatStatus').textContent=msg;$('chatStatus').className='status-bar error';triggerTalkState(false);showLive2dTalking(false)}
|
||||||
|
function triggerTalkState(talking){var scene=talking?(currentChar.talk_state||'talk'):'idle';fetch('/api/scene',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({scene:scene})}).catch(function(){})}
|
||||||
|
function showLive2dTalking(talking){live2dTalking=talking;if(!talking&&live2dModel&&live2dModel.internalModel&&live2dModel.internalModel.coreModel){live2dModel.internalModel.coreModel.setParameterValueById('ParamMouthOpenY',0)}}
|
||||||
|
function addMsg(role,text){var box=$('chatBox');var div=document.createElement('div');div.className='msg '+role;var t=new Date().toLocaleTimeString('zh-CN',{hour12:false});div.innerHTML='<div class="bubble"></div><div class="meta">'+t+'</div>';div.querySelector('.bubble').textContent=text;box.appendChild(div);box.scrollTop=box.scrollHeight;return div}
|
||||||
|
$('chatInput').addEventListener('keydown',function(e){if(e.key==='Enter'&&!e.shiftKey){e.preventDefault();sendChat()}});
|
||||||
|
async function loadCharacters(){try{var res=await fetch('/api/config/available');var data=await res.json();var grid=$('charGrid');grid.innerHTML='';(data.configs||[]).forEach(function(item){var filename=item.filename||item;var char=item.character||{};var ct=char.character_type||'pet';var strat=charStrategies[ct]||charStrategies.pet;var isActive=filename===(data.active||'');var name=char.name||filename.replace(/\.json$/,'').replace(/_/g,' ');var rt=char.render_type||strat.render;var modelInfo=char.live2d_model?'<br><small style="color:var(--muted)">模型: '+char.live2d_model+'</small>':'';var card=document.createElement('div');card.className='char-card'+(isActive?' active':'');card.innerHTML='<div class="name">'+(strat.icon||'📦')+' '+name+'</div><div><span class="type-badge '+ct+'">'+strat.label+'</span> <span class="render-badge">'+rt+'</span></div><div class="strat">'+(rt==='live2d'?'Canvas 渲染 + 嘴部动效':'视频播放 + 状态机')+modelInfo+'</div>'+(isActive?'<span class="badge">使用中</span>':'');card.onclick=function(){switchCharacter(filename)};grid.appendChild(card)})}catch(e){$('charGrid').innerHTML='<div style="color:var(--red)">加载失败</div>'}}
|
||||||
|
async function switchCharacter(filename){if(!confirm('切换到 '+filename+' ?'))return;try{var res=await fetch('/api/config/switch',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({filename:filename})});var data=await res.json();if(data.status==='ok'||(data.message&&data.message.includes('成功'))){toast('已切换');await loadConfig();loadCharacters()}else toast('失败: '+(data.message||'未知'),true)}catch(e){toast('失败: '+e.message,true)}}
|
||||||
|
async function loadModels(){try{var res=await fetch('/api/models');var data=await res.json();var bar=$('modelBar');var u=Math.round((data.used_space||0)/1048576);var q=Math.round((data.quota||0)/1048576);bar.innerHTML='<div class="model-stat"><span class="label">配额:</span><span class="val">'+u+'/'+q+' MB</span></div><div class="model-stat"><span class="label">已下载:</span><span class="val">'+(data.models||[]).filter(function(m){return m.downloaded}).length+'/'+(data.models||[]).length+'</span></div>';var list=$('modelList');list.innerHTML='';var active=data.active||{};(data.models||[]).forEach(function(m){var item=document.createElement('div');item.className='model-item';var ia=active[m.kind]===m.id;var s=Math.round(m.size/1048576);var me=Math.round(m.memory_required/1048576);var a='';if(m.downloaded){if(ia)a='<button class="active" disabled>使用中</button>';else a='<button onclick="switchModel(\''+m.id+'\',\''+m.kind+'\')">切换</button> <button class="danger" onclick="deleteModel(\''+m.id+'\')">删除</button>'}else a='<button onclick="downloadModel(\''+m.id+'\')">下载</button>';item.innerHTML='<div class="info"><div class="name">'+m.name+' <span class="tag '+m.kind+'">'+m.kind.toUpperCase()+'</span>'+(m.downloaded?'<span class="tag downloaded">已下载</span>':'')+(ia?'<span class="tag active">活跃</span>':'')+'</div><div class="desc">'+s+'MB | 需 '+me+'MB | '+m.recommended_tier+'</div></div><div class="actions">'+a+'</div>';list.appendChild(item)})}catch(e){$('modelList').innerHTML='<div style="color:var(--red)">失败</div>'}}
|
||||||
|
async function downloadModel(id){try{var res=await fetch('/api/models/download',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({model_id:id})});var data=await res.json();toast(data.message||'下载已启动');setTimeout(loadModels,3000)}catch(e){toast('失败',true)}}
|
||||||
|
async function switchModel(id,kind){try{var res=await fetch('/api/models/switch',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({model_id:id,kind:kind})});var data=await res.json();toast(data.message||'已切换');loadModels()}catch(e){toast('失败',true)}}
|
||||||
|
async function deleteModel(id){if(!confirm('删除 '+id+'?'))return;try{var res=await fetch('/api/models/delete',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({model_id:id})});var data=await res.json();toast(data.message||'已删除');loadModels()}catch(e){toast('失败',true)}}
|
||||||
|
initMic();
|
||||||
|
async function initMic(){var micBtn=$('micBtn');var tip=$('recTip');if(!navigator.mediaDevices||!navigator.mediaDevices.getUserMedia){tip.innerHTML='当前浏览器不支持录音。请使用文字对话。';return}if(!window.isSecureContext){micBtn.disabled=true;tip.innerHTML='⚠️ 录音需要安全上下文(HTTPS 或 localhost)。当前为 HTTP 访问,录音已禁用。<br>启用方法(桌面 Chrome/Edge):右键浏览器图标 → 属性 → 在目标末尾加 <code>--unsafely-treat-insecure-origin-as-secure=http://192.168.31.105:5000</code> → 重启浏览器并访问本页。<br>或直接用文字对话,回复语音仍可正常播放。';return}var mediaRecorder=null,chunks=[],recStream=null,recTimer=null;var startRec=async function(){if(chatBusy)return;try{recStream=await navigator.mediaDevices.getUserMedia({audio:{channelCount:1,sampleRate:16000,echoCancellation:true,noiseSuppression:true}});chunks=[];mediaRecorder=new MediaRecorder(recStream);mediaRecorder.ondataavailable=function(e){if(e.data.size>0)chunks.push(e.data)};mediaRecorder.onstop=function(){if(recTimer){clearTimeout(recTimer);recTimer=null}recStream.getTracks().forEach(function(t){t.stop()});recStream=null;var blob=new Blob(chunks,{type:mediaRecorder.mimeType||'audio/webm'});if(blob.size<1000){micBtn.classList.remove('recording');micBtn.textContent='🎙';$('chatStatus').textContent='录音过短,已取消';$('chatStatus').className='status-bar error';return}sendAudioBlob(blob,mediaRecorder.mimeType||'audio/webm')};mediaRecorder.start();micBtn.classList.add('recording');micBtn.textContent='⏹';$('chatStatus').textContent='录音中...(松开发送)';$('chatStatus').className='status-bar busy';recTimer=setTimeout(function(){if(mediaRecorder&&mediaRecorder.state==='recording'){stopRec();$('chatStatus').textContent='录音达到 30s 上限,自动发送'}},30000)}catch(e){micBtn.classList.remove('recording');micBtn.textContent='🎙';$('chatStatus').textContent='麦克风启动失败: '+e.message;$('chatStatus').className='status-bar error'}};var stopRec=function(){if(mediaRecorder&&mediaRecorder.state==='recording'){mediaRecorder.stop();micBtn.classList.remove('recording');micBtn.textContent='🎙'}};micBtn.disabled=false;micBtn.addEventListener('mousedown',startRec);micBtn.addEventListener('touchstart',function(e){e.preventDefault();startRec()});micBtn.addEventListener('mouseup',stopRec);micBtn.addEventListener('mouseleave',stopRec);micBtn.addEventListener('touchend',function(e){e.preventDefault();stopRec()})}
|
||||||
|
async function sendAudioBlob(blob,mimeType){if(chatBusy)return;chatBusy=true;$('sendBtn').disabled=true;var micBtn=$('micBtn');micBtn.disabled=true;$('chatStatus').textContent='转码中...';$('chatStatus').className='status-bar busy';var userMsg=addMsg('user','🎤 [语音消息]');var playUrl=URL.createObjectURL(blob);var up=document.createElement('div');up.className='audio-inline';up.innerHTML='<span style="font-size:11px;color:var(--muted)">你的录音</span><audio controls src="'+playUrl+'"></audio>';userMsg.appendChild(up);if(currentChar.render_type!=='live2d'&¤tChar.talk_state)triggerTalkState(true);if(currentChar.render_type==='live2d')showLive2dTalking(true);var botMsg=addMsg('bot','思考中...');try{var wavBlob=await blobToWav(blob);$('chatStatus').textContent='识别中...';var res=await fetch('/api/chat/audio',{method:'POST',headers:{'Content-Type':'audio/wav','X-Audio-Format':'wav','X-Session-Id':sessionId},body:wavBlob});var data=await res.json();handleChatResponse(data,botMsg)}catch(e){showChatError(botMsg,'请求失败: '+e.message)}chatBusy=false;$('sendBtn').disabled=false;micBtn.disabled=false}
|
||||||
|
/* WAV 转码:浏览器录音(webm/opus) → 16k mono PCM16 wav,whisper-cli 直接可处理 */
|
||||||
|
async function blobToWav(blob){var arrayBuf=await blob.arrayBuffer();var audioCtx=new(window.AudioContext||window.webkitAudioContext)({sampleRate:16000});var decoded=await audioCtx.decodeAudioData(arrayBuf);var pcm=decodeToMonoPCM16(decoded,16000);audioCtx.close();return encodeWavBlob(pcm,16000)}
|
||||||
|
function decodeToMonoPCM16(audioBuffer,targetRate){var numCh=audioBuffer.numberOfChannels;var len=audioBuffer.length;var srcRate=audioBuffer.sampleRate;var outLen=Math.round(len*targetRate/srcRate);var out=new Int16Array(outLen);var tmp=new Float32Array(outLen);for(var ch=0;ch<numCh;ch++){var data=audioBuffer.getChannelData(ch);for(var i=0;i<outLen;i++){var srcIdx=i*srcRate/targetRate;var i0=Math.floor(srcIdx);var i1=Math.min(i0+1,len-1);var frac=srcIdx-i0;tmp[i]+=data[i0]*(1-frac)+data[i1]*frac}}for(var i=0;i<outLen;i++){var s=tmp[i]/numCh;s=Math.max(-1,Math.min(1,s));out[i]=s<0?s*0x8000:s*0x7FFF}return out}
|
||||||
|
function encodeWavBlob(samples,sampleRate){var buf=new ArrayBuffer(44+samples.length*2);var view=new DataView(buf);var writeStr=function(off,s){for(var i=0;i<s.length;i++)view.setUint8(off+i,s.charCodeAt(i))};writeStr(0,'RIFF');view.setUint32(4,36+samples.length*2,true);writeStr(8,'WAVE');writeStr(12,'fmt ');view.setUint32(16,16,true);view.setUint16(20,1,true);view.setUint16(22,1,true);view.setUint32(24,sampleRate,true);view.setUint32(28,sampleRate*2,true);view.setUint16(32,2,true);view.setUint16(34,16,true);writeStr(36,'data');view.setUint32(40,samples.length*2,true);var off=44;for(var i=0;i<samples.length;i++){view.setInt16(off,samples[i],true);off+=2}return new Blob([buf],{type:'audio/wav'})}
|
||||||
|
/* ==================== Live2D 渲染 ==================== */
|
||||||
|
var live2dApp=null,live2dModel=null,live2dTalking=false,live2dTickerFn=null;
|
||||||
|
function initLive2D(char){destroyLive2D();if(typeof PIXI==='undefined'||typeof PIXI.live2d==='undefined'){$('live2dPlaceholder').innerHTML='<div class="icon">⚠️</div>Live2D SDK 加载失败<br><small>请检查网络连接(CDN 需联网)</small>';return}if(!char.live2d_model){$('live2dPlaceholder').innerHTML='<div class="icon">✨</div>未配置 Live2D 模型';return}try{var canvas=$('live2dCanvas');var container=$('live2dContainer');var w=container.clientWidth||400;var h=container.clientHeight||300;live2dApp=new PIXI.Application({view:canvas,backgroundAlpha:0,width:w,height:h});window.PIXI=PIXI;loadLive2DModel(char.live2d_model)}catch(e){$('live2dPlaceholder').innerHTML='<div class="icon">⚠️</div>初始化失败: '+e.message}}
|
||||||
|
async function loadLive2DModel(modelPath){var modelUrl='/live2d/'+modelPath.replace(/^\//,'').split('/').map(encodeURIComponent).join('/');var ph=$('live2dPlaceholder');try{var resolvedUrl=modelUrl;if(!resolvedUrl.endsWith('.model3.json')&&!resolvedUrl.endsWith('.model.json')){resolvedUrl=resolvedUrl.replace(/\/$/,'')+'/index.model3.json'}live2dModel=await PIXI.live2d.Live2DModel.from(resolvedUrl);live2dApp.stage.addChild(live2dModel);live2dModel.anchor.set(0.5,0.5);live2dModel.x=live2dApp.screen.width/2;live2dModel.y=live2dApp.screen.height/2;var scale=Math.min(live2dApp.screen.width/live2dModel.width,live2dApp.screen.height/live2dModel.height)*0.9;live2dModel.scale.set(scale);ph.style.display='none';live2dTickerFn=function(){if(live2dModel&&live2dModel.internalModel&&live2dModel.internalModel.coreModel){if(live2dTalking){var v=Math.abs(Math.sin(Date.now()/120))*0.8+0.2;live2dModel.internalModel.coreModel.setParameterValueById('ParamMouthOpenY',v)}else{live2dModel.internalModel.coreModel.setParameterValueById('ParamMouthOpenY',0)}var breath=Math.sin(Date.now()/2000)*0.05;live2dModel.internalModel.coreModel.setParameterValueById('ParamBreath',breath)}};live2dApp.ticker.add(live2dTickerFn)}catch(e){ph.innerHTML='<div class="icon">⚠️</div>模型加载失败: '+e.message+'<br><small>路径: '+modelUrl+'</small>';ph.style.display='block'}}
|
||||||
|
function destroyLive2D(){if(live2dTickerFn&&live2dApp){live2dApp.ticker.remove(live2dTickerFn)}live2dTickerFn=null;if(live2dModel){try{live2dModel.destroy()}catch(e){}live2dModel=null}if(live2dApp){try{live2dApp.destroy(true)}catch(e){}live2dApp=null}}
|
||||||
|
/* 启动 */
|
||||||
|
connectWS();refreshStatus();loadConfig();
|
||||||
72
src/plugins/http/live2d_display.html
Normal file
72
src/plugins/http/live2d_display.html
Normal file
@@ -0,0 +1,72 @@
|
|||||||
|
<!doctype html>
|
||||||
|
<html lang="zh-CN">
|
||||||
|
<head>
|
||||||
|
<meta charset="utf-8">
|
||||||
|
<title>Live2D Display</title>
|
||||||
|
<style>
|
||||||
|
*{margin:0;padding:0;box-sizing:border-box}
|
||||||
|
html,body{width:100%;height:100%;background:#000;overflow:hidden}
|
||||||
|
#canvas{display:block;width:100%;height:100%}
|
||||||
|
#status{position:fixed;top:8px;left:8px;color:#888;font:12px monospace;z-index:10}
|
||||||
|
</style>
|
||||||
|
</head>
|
||||||
|
<body>
|
||||||
|
<canvas id="canvas"></canvas>
|
||||||
|
<div id="status">加载中...</div>
|
||||||
|
<script src="https://cdn.jsdelivr.net/npm/pixi.js@6.5.10/dist/browser/pixi.min.js"></script>
|
||||||
|
<script src="https://cubism.live2d.com/sdk-web/cubismcore/live2dcubismcore.min.js"></script>
|
||||||
|
<script src="https://cdn.jsdelivr.net/gh/dylanNew/live2d/webgl/Live2D/lib/live2d.min.js"></script>
|
||||||
|
<script src="https://cdn.jsdelivr.net/npm/pixi-live2d-display/dist/index.min.js"></script>
|
||||||
|
<script>
|
||||||
|
window.PIXI=PIXI;
|
||||||
|
var app,model,talking=false;
|
||||||
|
var statusEl=document.getElementById('status');
|
||||||
|
var canvas=document.getElementById('canvas');
|
||||||
|
function setStatus(s){statusEl.textContent=s}
|
||||||
|
async function init(){
|
||||||
|
try{
|
||||||
|
var res=await fetch('/api/config');
|
||||||
|
var cfg=await res.json();
|
||||||
|
var char=cfg.character||{};
|
||||||
|
var modelPath=char.live2d_model;
|
||||||
|
if(!modelPath){setStatus('未配置 live2d_model');return}
|
||||||
|
var w=window.innerWidth,h=window.innerHeight;
|
||||||
|
app=new PIXI.Application({view:canvas,backgroundAlpha:0,width:w,height:h,resolution:window.devicePixelRatio||1,autoDensity:true});
|
||||||
|
var modelUrl='/live2d/'+modelPath.replace(/^\//,'').split('/').map(encodeURIComponent).join('/');
|
||||||
|
setStatus('加载模型: '+modelPath);
|
||||||
|
model=await PIXI.live2d.Live2DModel.from(modelUrl);
|
||||||
|
app.stage.addChild(model);
|
||||||
|
model.anchor.set(0.5,0.5);
|
||||||
|
model.x=app.screen.width/2;
|
||||||
|
model.y=app.screen.height/2;
|
||||||
|
var scale=Math.min(app.screen.width/model.width,app.screen.height/model.height)*0.9;
|
||||||
|
model.scale.set(scale);
|
||||||
|
setStatus('');
|
||||||
|
app.ticker.add(function(){
|
||||||
|
if(!model||!model.internalModel||!model.internalModel.coreModel)return;
|
||||||
|
if(talking){var v=Math.abs(Math.sin(Date.now()/120))*0.8+0.2;model.internalModel.coreModel.setParameterValueById('ParamMouthOpenY',v)}
|
||||||
|
else{model.internalModel.coreModel.setParameterValueById('ParamMouthOpenY',0)}
|
||||||
|
var breath=Math.sin(Date.now()/2000)*0.05;
|
||||||
|
model.internalModel.coreModel.setParameterValueById('ParamBreath',breath);
|
||||||
|
});
|
||||||
|
// 轮询对话状态
|
||||||
|
setInterval(pollTalking,500);
|
||||||
|
}catch(e){setStatus('错误: '+e.message)}
|
||||||
|
}
|
||||||
|
var lastTalk=false;
|
||||||
|
async function pollTalking(){
|
||||||
|
try{
|
||||||
|
var res=await fetch('/api/live2d/talking');
|
||||||
|
if(res.ok){var d=await res.json();talking=!!d.talking}
|
||||||
|
}catch(e){}
|
||||||
|
}
|
||||||
|
window.addEventListener('resize',function(){
|
||||||
|
if(!app)return;
|
||||||
|
var w=window.innerWidth,h=window.innerHeight;
|
||||||
|
app.renderer.resize(w,h);
|
||||||
|
if(model){model.x=app.screen.width/2;model.y=app.screen.height/2;var s=Math.min(app.screen.width/model.width,app.screen.height/model.height)*0.9;model.scale.set(s)}
|
||||||
|
});
|
||||||
|
init();
|
||||||
|
</script>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
@@ -5,11 +5,12 @@
|
|||||||
mod routes;
|
mod routes;
|
||||||
|
|
||||||
use crate::core::config::AppConfig;
|
use crate::core::config::AppConfig;
|
||||||
use crate::core::message::{Envelope, Message};
|
use crate::core::message::{Destination, Envelope, Message};
|
||||||
use crate::core::plugin::{Platform, Plugin, PluginContext, PluginInfo};
|
use crate::core::plugin::{Platform, Plugin, PluginContext, PluginInfo};
|
||||||
use anyhow::{Context, Result};
|
use anyhow::{Context, Result};
|
||||||
use serde::Serialize;
|
use serde::Serialize;
|
||||||
use std::sync::atomic::{AtomicBool, Ordering};
|
use std::sync::atomic::{AtomicBool, Ordering};
|
||||||
|
use std::sync::mpsc;
|
||||||
use std::sync::{Arc, Condvar, Mutex};
|
use std::sync::{Arc, Condvar, Mutex};
|
||||||
use std::thread::JoinHandle;
|
use std::thread::JoinHandle;
|
||||||
use tokio::sync::broadcast;
|
use tokio::sync::broadcast;
|
||||||
@@ -52,10 +53,14 @@ pub(crate) struct HttpState {
|
|||||||
ai_pipeline: Mutex<Option<std::sync::Arc<crate::plugins::ai::ChatPipeline>>>,
|
ai_pipeline: Mutex<Option<std::sync::Arc<crate::plugins::ai::ChatPipeline>>>,
|
||||||
/// AI 模型管理器共享句柄(HTTP 模型管理 API 调用)
|
/// AI 模型管理器共享句柄(HTTP 模型管理 API 调用)
|
||||||
ai_models: Mutex<Option<std::sync::Arc<std::sync::Mutex<crate::plugins::ai::model_manager::ModelManager>>>>,
|
ai_models: Mutex<Option<std::sync::Arc<std::sync::Mutex<crate::plugins::ai::model_manager::ModelManager>>>>,
|
||||||
|
/// Live2D 说话状态(设备端 Firefox 轮询,驱动嘴部动效)
|
||||||
|
live2d_talking: AtomicBool,
|
||||||
|
/// 向其他插件(如 live2d)转发消息的出口(init 时由 PluginContext.tx 注入)
|
||||||
|
outbox: mpsc::Sender<Envelope>,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl HttpState {
|
impl HttpState {
|
||||||
fn new(config: Arc<AppConfig>) -> Self {
|
fn new(config: Arc<AppConfig>, tx: mpsc::Sender<Envelope>) -> Self {
|
||||||
let (ws_events, _) = broadcast::channel(32);
|
let (ws_events, _) = broadcast::channel(32);
|
||||||
let player_status = crate::core::message::PlayerStatusData {
|
let player_status = crate::core::message::PlayerStatusData {
|
||||||
running: false,
|
running: false,
|
||||||
@@ -81,6 +86,19 @@ impl HttpState {
|
|||||||
plugin_states: Mutex::new(Vec::new()),
|
plugin_states: Mutex::new(Vec::new()),
|
||||||
ai_pipeline: Mutex::new(None),
|
ai_pipeline: Mutex::new(None),
|
||||||
ai_models: Mutex::new(None),
|
ai_models: Mutex::new(None),
|
||||||
|
live2d_talking: AtomicBool::new(false),
|
||||||
|
outbox: tx,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 向指定插件发送消息(用于把 AI 回复文字推给 live2d 做设备端字幕)。
|
||||||
|
pub(crate) fn send_message(&self, to: Destination, msg: Message) {
|
||||||
|
if let Err(e) = self.outbox.send(Envelope {
|
||||||
|
from: "http".to_string(),
|
||||||
|
to,
|
||||||
|
message: msg,
|
||||||
|
}) {
|
||||||
|
eprintln!("[HttpPlugin] 发送消息失败: {e}");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -113,6 +131,16 @@ impl HttpState {
|
|||||||
self.ai_models.lock().ok().and_then(|slot| slot.clone())
|
self.ai_models.lock().ok().and_then(|slot| slot.clone())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// 设置 Live2D 说话状态(对话开始/结束时调用)
|
||||||
|
pub(crate) fn set_live2d_talking(&self, talking: bool) {
|
||||||
|
self.live2d_talking.store(talking, Ordering::SeqCst);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 获取 Live2D 说话状态(设备端轮询接口调用)
|
||||||
|
pub(crate) fn live2d_talking(&self) -> bool {
|
||||||
|
self.live2d_talking.load(Ordering::SeqCst)
|
||||||
|
}
|
||||||
|
|
||||||
fn publish_wifi_result(&self, payload: String) {
|
fn publish_wifi_result(&self, payload: String) {
|
||||||
if let Ok(mut state) = self.wifi_response.lock() {
|
if let Ok(mut state) = self.wifi_response.lock() {
|
||||||
state.version += 1;
|
state.version += 1;
|
||||||
@@ -299,7 +327,10 @@ impl Plugin for HttpPlugin {
|
|||||||
}
|
}
|
||||||
|
|
||||||
fn init(&mut self, ctx: PluginContext) -> Result<()> {
|
fn init(&mut self, ctx: PluginContext) -> Result<()> {
|
||||||
let state = Arc::new(HttpState::new(Arc::clone(&ctx.config)));
|
let state = Arc::new(HttpState::new(
|
||||||
|
Arc::clone(&ctx.config),
|
||||||
|
ctx.tx.clone(),
|
||||||
|
));
|
||||||
// 注册 AI 句柄(如果 main.rs 已设置)
|
// 注册 AI 句柄(如果 main.rs 已设置)
|
||||||
if let Some(pipeline) = self.ai_pipeline.take() {
|
if let Some(pipeline) = self.ai_pipeline.take() {
|
||||||
state.register_ai_pipeline(pipeline);
|
state.register_ai_pipeline(pipeline);
|
||||||
|
|||||||
@@ -149,6 +149,7 @@ pub(crate) fn build_routes(
|
|||||||
let ai_api = chat_text_route(Arc::clone(&state))
|
let ai_api = chat_text_route(Arc::clone(&state))
|
||||||
.or(chat_audio_route(Arc::clone(&state)))
|
.or(chat_audio_route(Arc::clone(&state)))
|
||||||
.or(chat_audio_file_route(Arc::clone(&state)))
|
.or(chat_audio_file_route(Arc::clone(&state)))
|
||||||
|
.or(live2d_talking_route(Arc::clone(&state)))
|
||||||
.or(models_list_route(Arc::clone(&state)))
|
.or(models_list_route(Arc::clone(&state)))
|
||||||
.or(model_download_route(Arc::clone(&state)))
|
.or(model_download_route(Arc::clone(&state)))
|
||||||
.or(model_switch_route(Arc::clone(&state)))
|
.or(model_switch_route(Arc::clone(&state)))
|
||||||
@@ -158,8 +159,8 @@ pub(crate) fn build_routes(
|
|||||||
let api = core_api.or(media_api).or(plugin_api).or(file_api).or(ai_api);
|
let api = core_api.or(media_api).or(plugin_api).or(file_api).or(ai_api);
|
||||||
|
|
||||||
root_route()
|
root_route()
|
||||||
.or(chat_page_route())
|
|
||||||
.or(download_route(Arc::clone(&state)))
|
.or(download_route(Arc::clone(&state)))
|
||||||
|
.or(live2d_static_route(Arc::clone(&state)))
|
||||||
.or(ws_route(tx.clone(), Arc::clone(&state)))
|
.or(ws_route(tx.clone(), Arc::clone(&state)))
|
||||||
.or(api)
|
.or(api)
|
||||||
.with(
|
.with(
|
||||||
@@ -170,24 +171,43 @@ pub(crate) fn build_routes(
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// GET / 和 /index.html 和 /chat — 统一入口(chat.html)
|
||||||
fn root_route() -> impl Filter<Extract = impl Reply, Error = warp::Rejection> + Clone {
|
fn root_route() -> impl Filter<Extract = impl Reply, Error = warp::Rejection> + Clone {
|
||||||
warp::path::end()
|
let index = warp::path::end()
|
||||||
.and(warp::get())
|
.and(warp::get())
|
||||||
.map(|| warp::reply::html(WEB_UI_HTML))
|
.map(|| warp::reply::html(include_str!("chat.html")));
|
||||||
.or(
|
let index_html = warp::path("index.html")
|
||||||
warp::path("index.html")
|
|
||||||
.and(warp::path::end())
|
|
||||||
.and(warp::get())
|
|
||||||
.map(|| warp::reply::html(WEB_UI_HTML)),
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
/// GET /chat — AI 对话控制端页面
|
|
||||||
fn chat_page_route() -> impl Filter<Extract = impl Reply, Error = warp::Rejection> + Clone {
|
|
||||||
warp::path("chat")
|
|
||||||
.and(warp::path::end())
|
.and(warp::path::end())
|
||||||
.and(warp::get())
|
.and(warp::get())
|
||||||
.map(|| warp::reply::html(include_str!("chat.html")))
|
.map(|| warp::reply::html(include_str!("chat.html")));
|
||||||
|
let chat = warp::path("chat")
|
||||||
|
.and(warp::path::end())
|
||||||
|
.and(warp::get())
|
||||||
|
.map(|| warp::reply::html(include_str!("chat.html")));
|
||||||
|
let chat_js = warp::path("chat.js")
|
||||||
|
.and(warp::path::end())
|
||||||
|
.and(warp::get())
|
||||||
|
.map(|| {
|
||||||
|
let body = include_str!("chat.js");
|
||||||
|
match warp::http::Response::builder()
|
||||||
|
.header("Content-Type", "application/javascript; charset=utf-8")
|
||||||
|
.header("Cache-Control", "no-store")
|
||||||
|
.header("Content-Length", body.len().to_string())
|
||||||
|
.body(body.to_string())
|
||||||
|
{
|
||||||
|
Ok(resp) => resp.into_response(),
|
||||||
|
Err(_) => warp::reply::with_status(
|
||||||
|
warp::reply::html("JS 加载失败".to_string()),
|
||||||
|
StatusCode::INTERNAL_SERVER_ERROR,
|
||||||
|
)
|
||||||
|
.into_response(),
|
||||||
|
}
|
||||||
|
});
|
||||||
|
let live2d_display = warp::path("live2d-display.html")
|
||||||
|
.and(warp::path::end())
|
||||||
|
.and(warp::get())
|
||||||
|
.map(|| warp::reply::html(include_str!("live2d_display.html")));
|
||||||
|
index.or(index_html).or(chat).or(chat_js).or(live2d_display)
|
||||||
}
|
}
|
||||||
|
|
||||||
fn ws_route(
|
fn ws_route(
|
||||||
@@ -234,6 +254,97 @@ fn download_route(
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// GET /live2d/** — Live2D 模型静态文件(.moc3/.model3.json/.png/.physics3.json 等)
|
||||||
|
///
|
||||||
|
/// 从 source_dir/live2d/ 目录托管,支持子目录。用于浏览器 Cubism SDK 加载模型。
|
||||||
|
fn live2d_static_route(
|
||||||
|
state: Arc<HttpState>,
|
||||||
|
) -> impl Filter<Extract = impl Reply, Error = warp::Rejection> + Clone {
|
||||||
|
warp::path("live2d")
|
||||||
|
.and(warp::path::peek())
|
||||||
|
.and(warp::get())
|
||||||
|
.and(with_state(state))
|
||||||
|
.and_then(|tail: warp::path::Peek, state: Arc<HttpState>| async move {
|
||||||
|
let rel = tail.as_str();
|
||||||
|
// 防路径穿越:不允许 .. 段
|
||||||
|
if rel.contains("..") || rel.starts_with('/') {
|
||||||
|
return Ok::<_, Infallible>(
|
||||||
|
warp::reply::with_status(
|
||||||
|
warp::reply::html("无效路径".to_string()),
|
||||||
|
StatusCode::BAD_REQUEST,
|
||||||
|
)
|
||||||
|
.into_response(),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
let base = state.config().source_dir.join("live2d");
|
||||||
|
let full = base.join(rel);
|
||||||
|
// canonicalize 校验最终路径仍在 base 内
|
||||||
|
let canonical_base = match base.canonicalize() {
|
||||||
|
Ok(p) => p,
|
||||||
|
Err(_) => {
|
||||||
|
return Ok(warp::reply::with_status(
|
||||||
|
warp::reply::html("live2d 目录不存在".to_string()),
|
||||||
|
StatusCode::NOT_FOUND,
|
||||||
|
)
|
||||||
|
.into_response());
|
||||||
|
}
|
||||||
|
};
|
||||||
|
let canonical_full = match full.canonicalize() {
|
||||||
|
Ok(p) => p,
|
||||||
|
Err(_) => {
|
||||||
|
return Ok(warp::reply::with_status(
|
||||||
|
warp::reply::html("文件不存在".to_string()),
|
||||||
|
StatusCode::NOT_FOUND,
|
||||||
|
)
|
||||||
|
.into_response());
|
||||||
|
}
|
||||||
|
};
|
||||||
|
if !canonical_full.starts_with(&canonical_base) || !canonical_full.is_file() {
|
||||||
|
return Ok(warp::reply::with_status(
|
||||||
|
warp::reply::html("文件不存在".to_string()),
|
||||||
|
StatusCode::NOT_FOUND,
|
||||||
|
)
|
||||||
|
.into_response());
|
||||||
|
}
|
||||||
|
|
||||||
|
// 按扩展名设 Content-Type
|
||||||
|
let ext = canonical_full
|
||||||
|
.extension()
|
||||||
|
.and_then(|e| e.to_str())
|
||||||
|
.unwrap_or("")
|
||||||
|
.to_lowercase();
|
||||||
|
let content_type = match ext.as_str() {
|
||||||
|
"json" => "application/json; charset=utf-8",
|
||||||
|
"png" => "image/png",
|
||||||
|
"moc3" => "application/octet-stream",
|
||||||
|
"physics3" => "application/json",
|
||||||
|
"cdi3" => "application/json",
|
||||||
|
"mot3" => "application/json",
|
||||||
|
_ => "application/octet-stream",
|
||||||
|
};
|
||||||
|
match std::fs::read(&canonical_full) {
|
||||||
|
Ok(data) => match warp::http::Response::builder()
|
||||||
|
.header("Content-Type", content_type)
|
||||||
|
.header("Content-Length", data.len().to_string())
|
||||||
|
.header("Cache-Control", "no-store")
|
||||||
|
.body(data)
|
||||||
|
{
|
||||||
|
Ok(resp) => Ok(resp.into_response()),
|
||||||
|
Err(_) => Ok(warp::reply::with_status(
|
||||||
|
warp::reply::html("响应构建失败".to_string()),
|
||||||
|
StatusCode::INTERNAL_SERVER_ERROR,
|
||||||
|
)
|
||||||
|
.into_response()),
|
||||||
|
},
|
||||||
|
Err(_) => Ok(warp::reply::with_status(
|
||||||
|
warp::reply::html("读取失败".to_string()),
|
||||||
|
StatusCode::INTERNAL_SERVER_ERROR,
|
||||||
|
)
|
||||||
|
.into_response()),
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
fn status_route(
|
fn status_route(
|
||||||
state: Arc<HttpState>,
|
state: Arc<HttpState>,
|
||||||
) -> impl Filter<Extract = impl Reply, Error = warp::Rejection> + Clone {
|
) -> impl Filter<Extract = impl Reply, Error = warp::Rejection> + Clone {
|
||||||
@@ -436,23 +547,57 @@ fn config_available_route(
|
|||||||
.and_then(|state: Arc<HttpState>| async move {
|
.and_then(|state: Arc<HttpState>| async move {
|
||||||
let config = state.config();
|
let config = state.config();
|
||||||
let configs_dir = &config.source_dir;
|
let configs_dir = &config.source_dir;
|
||||||
let mut files: Vec<String> = Vec::new();
|
// 每个配置文件提取 character 元信息,供前端渲染角色卡片
|
||||||
if let Ok(entries) = std::fs::read_dir(configs_dir) {
|
let mut entries: Vec<serde_json::Value> = Vec::new();
|
||||||
for entry in entries.flatten() {
|
if let Ok(read_entries) = std::fs::read_dir(configs_dir) {
|
||||||
|
for entry in read_entries.flatten() {
|
||||||
let name = entry.file_name().to_string_lossy().into_owned();
|
let name = entry.file_name().to_string_lossy().into_owned();
|
||||||
if name.ends_with(".json") {
|
if !name.ends_with(".json") {
|
||||||
files.push(name);
|
continue;
|
||||||
}
|
}
|
||||||
|
let path = entry.path();
|
||||||
|
let char_info = match std::fs::read_to_string(&path) {
|
||||||
|
Ok(content) => {
|
||||||
|
match serde_json::from_str::<serde_json::Value>(&content) {
|
||||||
|
Ok(v) => {
|
||||||
|
let c = v.get("character").cloned().unwrap_or_default();
|
||||||
|
serde_json::json!({
|
||||||
|
"name": c.get("name").and_then(|n| n.as_str()).unwrap_or(&name).to_string(),
|
||||||
|
"character_type": c.get("character_type").and_then(|t| t.as_str()).unwrap_or("pet").to_string(),
|
||||||
|
"render_type": c.get("render_type").and_then(|r| r.as_str()).unwrap_or("video").to_string(),
|
||||||
|
"live2d_model": c.get("live2d_model").and_then(|m| m.as_str()).map(|s| s.to_string()),
|
||||||
|
})
|
||||||
|
}
|
||||||
|
Err(_) => serde_json::json!({
|
||||||
|
"name": name.clone(),
|
||||||
|
"character_type": "pet",
|
||||||
|
"render_type": "video",
|
||||||
|
"live2d_model": null,
|
||||||
|
}),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Err(_) => serde_json::json!({
|
||||||
|
"name": name.clone(),
|
||||||
|
"character_type": "pet",
|
||||||
|
"render_type": "video",
|
||||||
|
"live2d_model": null,
|
||||||
|
}),
|
||||||
|
};
|
||||||
|
entries.push(serde_json::json!({
|
||||||
|
"filename": name,
|
||||||
|
"character": char_info,
|
||||||
|
}));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
files.sort();
|
entries.sort_by(|a, b| {
|
||||||
// 标记当前活跃的配置
|
a["filename"].as_str().cmp(&b["filename"].as_str())
|
||||||
|
});
|
||||||
let active = config.source_path
|
let active = config.source_path
|
||||||
.file_name()
|
.file_name()
|
||||||
.map(|n| n.to_string_lossy().into_owned())
|
.map(|n| n.to_string_lossy().into_owned())
|
||||||
.unwrap_or_default();
|
.unwrap_or_default();
|
||||||
let result = serde_json::json!({
|
let result = serde_json::json!({
|
||||||
"configs": files,
|
"configs": entries,
|
||||||
"active": active,
|
"active": active,
|
||||||
});
|
});
|
||||||
Ok::<_, Infallible>(json_response(StatusCode::OK, &result))
|
Ok::<_, Infallible>(json_response(StatusCode::OK, &result))
|
||||||
@@ -2015,6 +2160,9 @@ fn chat_text_route(
|
|||||||
};
|
};
|
||||||
|
|
||||||
// AI 管线是同步阻塞调用(ASR/LLM/TTS 子进程),用 spawn_blocking 避免阻塞 tokio reactor
|
// AI 管线是同步阻塞调用(ASR/LLM/TTS 子进程),用 spawn_blocking 避免阻塞 tokio reactor
|
||||||
|
// 设置 Live2D 说话状态(设备端 Firefox 轮询驱动嘴部动效)
|
||||||
|
let talking_state = Arc::clone(&state);
|
||||||
|
talking_state.set_live2d_talking(true);
|
||||||
let resp = tokio::task::spawn_blocking(move || pipeline.run(&chat_req))
|
let resp = tokio::task::spawn_blocking(move || pipeline.run(&chat_req))
|
||||||
.await
|
.await
|
||||||
.unwrap_or_else(|e| ChatResponse {
|
.unwrap_or_else(|e| ChatResponse {
|
||||||
@@ -2024,6 +2172,31 @@ fn chat_text_route(
|
|||||||
reply_audio_path: None,
|
reply_audio_path: None,
|
||||||
error: Some(format!("AI 管线执行失败: {e}")),
|
error: Some(format!("AI 管线执行失败: {e}")),
|
||||||
});
|
});
|
||||||
|
// 回复音频时长估算后重置 talking(按字数估算)
|
||||||
|
let reset_after = if resp.error.is_none() {
|
||||||
|
std::time::Duration::from_millis(
|
||||||
|
((resp.reply_text.len() as u64) * 200).max(2000),
|
||||||
|
)
|
||||||
|
} else {
|
||||||
|
std::time::Duration::from_millis(0)
|
||||||
|
};
|
||||||
|
let reset_state = Arc::clone(&state);
|
||||||
|
tokio::spawn(async move {
|
||||||
|
if !reset_after.is_zero() {
|
||||||
|
tokio::time::sleep(reset_after).await;
|
||||||
|
}
|
||||||
|
reset_state.set_live2d_talking(false);
|
||||||
|
});
|
||||||
|
|
||||||
|
// 设备端字幕:把回复文字推给 live2d 插件做屏幕 Overlay
|
||||||
|
if resp.error.is_none() && !resp.reply_text.is_empty() {
|
||||||
|
state.send_message(
|
||||||
|
Destination::Plugin("live2d".to_string()),
|
||||||
|
Message::Subtitle {
|
||||||
|
text: resp.reply_text.clone(),
|
||||||
|
},
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
if resp.error.is_some() {
|
if resp.error.is_some() {
|
||||||
Ok(json_response(StatusCode::INTERNAL_SERVER_ERROR, &resp))
|
Ok(json_response(StatusCode::INTERNAL_SERVER_ERROR, &resp))
|
||||||
@@ -2038,6 +2211,10 @@ fn chat_text_route(
|
|||||||
/// 注意:上传的音频会被传给 whisper-cli,它通过文件扩展名判断格式。
|
/// 注意:上传的音频会被传给 whisper-cli,它通过文件扩展名判断格式。
|
||||||
/// 浏览器 MediaRecorder 默认产 webm/opus,移动端可能产 m4a/aac。
|
/// 浏览器 MediaRecorder 默认产 webm/opus,移动端可能产 m4a/aac。
|
||||||
/// 服务端不强校验格式,但建议客户端尽量转 wav/16k 单声道。
|
/// 服务端不强校验格式,但建议客户端尽量转 wav/16k 单声道。
|
||||||
|
///
|
||||||
|
/// 可选头:
|
||||||
|
/// - `X-Audio-Format`: webm|ogg|m4a|mp3|wav
|
||||||
|
/// - `X-Session-Id`: 会话 ID(多端一致上下文)
|
||||||
fn chat_audio_route(
|
fn chat_audio_route(
|
||||||
state: Arc<HttpState>,
|
state: Arc<HttpState>,
|
||||||
) -> impl Filter<Extract = impl Reply, Error = warp::Rejection> + Clone {
|
) -> impl Filter<Extract = impl Reply, Error = warp::Rejection> + Clone {
|
||||||
@@ -2046,10 +2223,12 @@ fn chat_audio_route(
|
|||||||
.and(warp::body::content_length_limit(20 * 1024 * 1024))
|
.and(warp::body::content_length_limit(20 * 1024 * 1024))
|
||||||
.and(warp::body::bytes())
|
.and(warp::body::bytes())
|
||||||
.and(warp::header::optional::<String>("X-Audio-Format"))
|
.and(warp::header::optional::<String>("X-Audio-Format"))
|
||||||
|
.and(warp::header::optional::<String>("X-Session-Id"))
|
||||||
.and(with_state(state))
|
.and(with_state(state))
|
||||||
.and_then(
|
.and_then(
|
||||||
|bytes: bytes::Bytes,
|
|bytes: bytes::Bytes,
|
||||||
fmt_hint: Option<String>,
|
fmt_hint: Option<String>,
|
||||||
|
session_hint: Option<String>,
|
||||||
state: Arc<HttpState>| async move {
|
state: Arc<HttpState>| async move {
|
||||||
let pipeline = match state.ai_pipeline() {
|
let pipeline = match state.ai_pipeline() {
|
||||||
Some(p) => p,
|
Some(p) => p,
|
||||||
@@ -2087,7 +2266,9 @@ fn chat_audio_route(
|
|||||||
));
|
));
|
||||||
}
|
}
|
||||||
|
|
||||||
let session_id = format!("app_{}", std::process::id());
|
let session_id = session_hint
|
||||||
|
.filter(|s| !s.trim().is_empty())
|
||||||
|
.unwrap_or_else(|| format!("app_{}", std::process::id()));
|
||||||
let chat_req = ChatRequest {
|
let chat_req = ChatRequest {
|
||||||
session_id,
|
session_id,
|
||||||
input: ChatInput::Audio {
|
input: ChatInput::Audio {
|
||||||
@@ -2097,6 +2278,10 @@ fn chat_audio_route(
|
|||||||
max_tokens: config.character.max_tokens,
|
max_tokens: config.character.max_tokens,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
// 与文字对话一致:驱动 Live2D 说话态
|
||||||
|
let talking_state = Arc::clone(&state);
|
||||||
|
talking_state.set_live2d_talking(true);
|
||||||
|
|
||||||
let audio_path_clone = audio_path.clone();
|
let audio_path_clone = audio_path.clone();
|
||||||
let resp = tokio::task::spawn_blocking(move || pipeline.run(&chat_req))
|
let resp = tokio::task::spawn_blocking(move || pipeline.run(&chat_req))
|
||||||
.await
|
.await
|
||||||
@@ -2111,6 +2296,31 @@ fn chat_audio_route(
|
|||||||
// 清理上传的临时音频
|
// 清理上传的临时音频
|
||||||
let _ = std::fs::remove_file(&audio_path_clone);
|
let _ = std::fs::remove_file(&audio_path_clone);
|
||||||
|
|
||||||
|
let reset_after = if resp.error.is_none() {
|
||||||
|
std::time::Duration::from_millis(
|
||||||
|
((resp.reply_text.len() as u64) * 200).max(2000),
|
||||||
|
)
|
||||||
|
} else {
|
||||||
|
std::time::Duration::from_millis(0)
|
||||||
|
};
|
||||||
|
let reset_state = Arc::clone(&state);
|
||||||
|
tokio::spawn(async move {
|
||||||
|
if !reset_after.is_zero() {
|
||||||
|
tokio::time::sleep(reset_after).await;
|
||||||
|
}
|
||||||
|
reset_state.set_live2d_talking(false);
|
||||||
|
});
|
||||||
|
|
||||||
|
// 设备端字幕:把回复文字推给 live2d 插件做屏幕 Overlay
|
||||||
|
if resp.error.is_none() && !resp.reply_text.is_empty() {
|
||||||
|
state.send_message(
|
||||||
|
Destination::Plugin("live2d".to_string()),
|
||||||
|
Message::Subtitle {
|
||||||
|
text: resp.reply_text.clone(),
|
||||||
|
},
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
if resp.error.is_some() {
|
if resp.error.is_some() {
|
||||||
Ok(json_response(StatusCode::INTERNAL_SERVER_ERROR, &resp))
|
Ok(json_response(StatusCode::INTERNAL_SERVER_ERROR, &resp))
|
||||||
} else {
|
} else {
|
||||||
@@ -2206,6 +2416,21 @@ fn chat_audio_file_route(
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// GET /api/live2d/talking — 返回当前 Live2D 说话状态(设备端 Firefox 轮询)
|
||||||
|
fn live2d_talking_route(
|
||||||
|
state: Arc<HttpState>,
|
||||||
|
) -> impl Filter<Extract = impl Reply, Error = warp::Rejection> + Clone {
|
||||||
|
warp::path!("api" / "live2d" / "talking")
|
||||||
|
.and(warp::get())
|
||||||
|
.and(with_state(state))
|
||||||
|
.and_then(|state: Arc<HttpState>| async move {
|
||||||
|
Ok::<_, Infallible>(json_response(
|
||||||
|
StatusCode::OK,
|
||||||
|
&serde_json::json!({ "talking": state.live2d_talking() }),
|
||||||
|
))
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
// ── AI 模型管理 API (M2.1) ──
|
// ── AI 模型管理 API (M2.1) ──
|
||||||
|
|
||||||
/// GET /api/models — 列出所有模型
|
/// GET /api/models — 列出所有模型
|
||||||
@@ -2345,427 +2570,3 @@ fn json_response<T: Serialize>(status: StatusCode, payload: &T) -> warp::reply::
|
|||||||
warp::reply::with_status(warp::reply::json(payload), status).into_response()
|
warp::reply::with_status(warp::reply::json(payload), status).into_response()
|
||||||
}
|
}
|
||||||
|
|
||||||
const WEB_UI_HTML: &str = r##"<!doctype html>
|
|
||||||
<html lang="zh-CN">
|
|
||||||
<head>
|
|
||||||
<meta charset="utf-8">
|
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
|
||||||
<title>Showen 控制台</title>
|
|
||||||
<style>
|
|
||||||
:root{--bg:#0f1117;--surface:#1a1d27;--surface2:#242836;--border:#2e3345;--text:#e4e6ef;--muted:#8b8fa3;--accent:#6366f1;--accent-glow:rgba(99,102,241,.15);--green:#22c55e;--amber:#f59e0b;--red:#ef4444;--radius:12px}
|
|
||||||
*{box-sizing:border-box;margin:0;padding:0}
|
|
||||||
body{background:var(--bg);color:var(--text);font:14px/1.6 -apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,"Noto Sans SC",sans-serif;min-height:100vh}
|
|
||||||
::selection{background:var(--accent);color:#fff}
|
|
||||||
::-webkit-scrollbar{width:6px;height:6px}::-webkit-scrollbar-track{background:transparent}::-webkit-scrollbar-thumb{background:var(--border);border-radius:3px}
|
|
||||||
|
|
||||||
.app{max-width:1200px;margin:0 auto;padding:16px 20px}
|
|
||||||
header{display:flex;align-items:center;justify-content:space-between;gap:12px;padding:16px 0;border-bottom:1px solid var(--border);margin-bottom:16px;flex-wrap:wrap}
|
|
||||||
header h1{font-size:20px;font-weight:600;background:linear-gradient(135deg,#6366f1,#a78bfa);-webkit-background-clip:text;-webkit-text-fill-color:transparent}
|
|
||||||
header .badge{font-size:11px;padding:3px 10px;border-radius:99px;background:var(--accent-glow);color:var(--accent);border:1px solid rgba(99,102,241,.3)}
|
|
||||||
.header-actions{display:flex;align-items:center;gap:10px;flex-wrap:wrap}
|
|
||||||
.header-link{display:inline-flex;align-items:center;justify-content:center;gap:8px;padding:8px 16px;border-radius:8px;color:#fff;font:inherit;cursor:pointer;transition:all .15s;text-decoration:none}
|
|
||||||
|
|
||||||
.modal-backdrop{position:fixed;inset:0;background:rgba(10,12,18,.72);backdrop-filter:blur(10px);display:none;align-items:center;justify-content:center;padding:20px;z-index:998}
|
|
||||||
.modal-backdrop.open{display:flex}
|
|
||||||
.download-modal{width:min(100%,420px);background:linear-gradient(180deg,rgba(36,40,54,.98),rgba(26,29,39,.98));border:1px solid rgba(99,102,241,.28);border-radius:20px;padding:22px;box-shadow:0 24px 60px rgba(0,0,0,.4)}
|
|
||||||
.download-modal h2{font-size:22px;margin-bottom:8px}
|
|
||||||
.download-modal p{color:var(--muted);margin-bottom:18px}
|
|
||||||
.download-qr{display:flex;justify-content:center;align-items:center;padding:14px;background:rgba(99,102,241,.08);border:1px solid rgba(99,102,241,.2);border-radius:16px;margin-bottom:16px}
|
|
||||||
.download-qr img{display:block;width:180px;height:180px;border-radius:12px;background:#fff}
|
|
||||||
.download-actions{display:flex;gap:10px;flex-wrap:wrap}
|
|
||||||
.download-actions>*{flex:1}
|
|
||||||
.download-meta{font-size:13px;color:var(--text);margin-bottom:14px;padding:10px 12px;border-radius:12px;background:rgba(255,255,255,.03);border:1px solid var(--border)}
|
|
||||||
.download-meta.warn{color:var(--amber);border-color:rgba(245,158,11,.3);background:rgba(245,158,11,.08)}
|
|
||||||
.download-note{font-size:12px;color:var(--muted);margin-top:12px}
|
|
||||||
|
|
||||||
.tabs{display:flex;gap:4px;background:var(--surface);border-radius:var(--radius);padding:4px;margin-bottom:16px;overflow-x:auto}
|
|
||||||
.tab{padding:8px 16px;border-radius:8px;border:0;background:0;color:var(--muted);cursor:pointer;font:inherit;white-space:nowrap;transition:all .2s}
|
|
||||||
.tab:hover{color:var(--text);background:var(--surface2)}
|
|
||||||
.tab.active{color:#fff;background:var(--accent);box-shadow:0 2px 8px rgba(99,102,241,.3)}
|
|
||||||
.panel{display:none}.panel.active{display:block}
|
|
||||||
|
|
||||||
.grid{display:grid;grid-template-columns:repeat(auto-fit,minmax(340px,1fr));gap:14px}
|
|
||||||
.card{background:var(--surface);border:1px solid var(--border);border-radius:var(--radius);padding:16px}
|
|
||||||
.card h2{font-size:14px;font-weight:600;color:var(--muted);text-transform:uppercase;letter-spacing:.5px;margin-bottom:12px}
|
|
||||||
.stats{display:grid;grid-template-columns:1fr 1fr;gap:8px}
|
|
||||||
.stat{background:var(--surface2);border-radius:8px;padding:10px 12px}
|
|
||||||
.stat .label{font-size:11px;color:var(--muted);display:block}.stat .val{font-size:16px;font-weight:600;color:var(--accent)}
|
|
||||||
.stat .val.ok{color:var(--green)}.stat .val.warn{color:var(--amber)}.stat .val.err{color:var(--red)}
|
|
||||||
|
|
||||||
.btns{display:flex;gap:8px;flex-wrap:wrap;margin-top:10px}
|
|
||||||
button{border:0;border-radius:8px;padding:8px 16px;font:inherit;cursor:pointer;transition:all .15s}
|
|
||||||
.btn{background:var(--accent);color:#fff}.btn:hover{opacity:.85;transform:translateY(-1px)}
|
|
||||||
.btn-s{background:var(--surface2);color:var(--text);border:1px solid var(--border)}.btn-s:hover{border-color:var(--accent);color:var(--accent)}
|
|
||||||
.btn-d{background:rgba(239,68,68,.1);color:var(--red);border:1px solid rgba(239,68,68,.2)}.btn-d:hover{background:rgba(239,68,68,.2)}
|
|
||||||
.btn-g{background:rgba(34,197,94,.1);color:var(--green);border:1px solid rgba(34,197,94,.2)}.btn-g:hover{background:rgba(34,197,94,.2)}
|
|
||||||
|
|
||||||
input,select,textarea{width:100%;padding:8px 12px;border:1px solid var(--border);border-radius:8px;background:var(--surface2);color:var(--text);font:inherit;outline:0;transition:border-color .2s}
|
|
||||||
input:focus,select:focus,textarea:focus{border-color:var(--accent)}
|
|
||||||
textarea{min-height:200px;font-family:"Fira Code",monospace;font-size:13px;resize:vertical}
|
|
||||||
label{display:block;font-size:12px;color:var(--muted);margin:8px 0 4px}
|
|
||||||
.row{display:flex;gap:8px;align-items:end}.row>*{flex:1}
|
|
||||||
|
|
||||||
.list{max-height:300px;overflow:auto;border:1px solid var(--border);border-radius:8px;background:var(--surface2)}
|
|
||||||
.item{display:flex;justify-content:space-between;align-items:center;padding:8px 12px;border-bottom:1px solid var(--border);gap:8px;font-size:13px}
|
|
||||||
.item:last-child{border-bottom:0}
|
|
||||||
.item .name{flex:1;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}
|
|
||||||
.item .meta{color:var(--muted);font-size:12px;white-space:nowrap}
|
|
||||||
.item .dir-icon{color:var(--amber);margin-right:4px}
|
|
||||||
|
|
||||||
.toast{position:fixed;top:16px;right:16px;padding:10px 18px;border-radius:8px;color:#fff;font-size:13px;display:none;z-index:999;backdrop-filter:blur(8px);max-width:360px}
|
|
||||||
.toast.ok{background:rgba(34,197,94,.9)}.toast.err{background:rgba(239,68,68,.9)}
|
|
||||||
|
|
||||||
.file-breadcrumb{display:flex;gap:4px;align-items:center;margin-bottom:10px;font-size:13px;flex-wrap:wrap}
|
|
||||||
.file-breadcrumb span{color:var(--muted);cursor:pointer;padding:2px 6px;border-radius:4px}.file-breadcrumb span:hover{background:var(--surface2);color:var(--text)}
|
|
||||||
.file-breadcrumb .sep{color:var(--border);cursor:default;padding:0}.file-breadcrumb .sep:hover{background:none;color:var(--border)}
|
|
||||||
.file-toolbar{display:flex;gap:8px;margin-bottom:10px;flex-wrap:wrap;align-items:center}
|
|
||||||
.file-toolbar select{width:auto;min-width:120px}
|
|
||||||
.checkbox-label{display:flex;align-items:center;gap:6px;font-size:13px;cursor:pointer}
|
|
||||||
.checkbox-label input[type=checkbox]{width:auto;accent-color:var(--accent)}
|
|
||||||
|
|
||||||
@media (max-width:720px){.grid{grid-template-columns:1fr}.stats{grid-template-columns:1fr}header h1{font-size:16px}}
|
|
||||||
</style>
|
|
||||||
</head>
|
|
||||||
<body>
|
|
||||||
<div id="toast" class="toast"></div>
|
|
||||||
<div id="download-modal" class="modal-backdrop" onclick="closeDownloadModal(event)">
|
|
||||||
<div class="download-modal">
|
|
||||||
<h2>下载 Showen App</h2>
|
|
||||||
<p id="download-modal-desc">扫描二维码或点击下载,支持蓝牙配网和远程控制</p>
|
|
||||||
<div id="download-meta" class="download-meta">正在获取 App 信息...</div>
|
|
||||||
<div class="download-qr"><img id="download-qr-image" alt="Showen App 下载二维码"></div>
|
|
||||||
<div class="download-actions">
|
|
||||||
<a id="download-apk-link" class="btn header-link" href="/download/showen-app.apk" download>下载 APK</a>
|
|
||||||
<button class="btn-s" type="button" onclick="closeDownloadModal()">关闭</button>
|
|
||||||
</div>
|
|
||||||
<div class="download-note">若二维码加载失败,可直接点击下载按钮获取 APK。</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="app">
|
|
||||||
<header>
|
|
||||||
<h1>Showen 控制台</h1>
|
|
||||||
<div class="header-actions">
|
|
||||||
<button class="btn" type="button" onclick="openDownloadModal()">下载 App</button>
|
|
||||||
<span class="badge" id="ws-badge">WS 连接中...</span>
|
|
||||||
</div>
|
|
||||||
</header>
|
|
||||||
|
|
||||||
<div class="tabs">
|
|
||||||
<button class="tab active" data-tab="control">播放控制</button>
|
|
||||||
<button class="tab" data-tab="videos">视频管理</button>
|
|
||||||
<button class="tab" data-tab="files">文件管理</button>
|
|
||||||
<button class="tab" data-tab="wifi">网络设置</button>
|
|
||||||
<button class="tab" data-tab="settings">系统配置</button>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<!-- 播放控制 -->
|
|
||||||
<section class="panel active" id="panel-control">
|
|
||||||
<div class="grid">
|
|
||||||
<div class="card">
|
|
||||||
<h2>播放状态</h2>
|
|
||||||
<div class="stats">
|
|
||||||
<div class="stat"><span class="label">状态</span><span id="st-state" class="val">--</span></div>
|
|
||||||
<div class="stat"><span class="label">当前视频</span><span id="st-video" class="val">--</span></div>
|
|
||||||
<div class="stat"><span class="label">索引</span><span id="st-index" class="val">--</span></div>
|
|
||||||
<div class="stat"><span class="label">列表长度</span><span id="st-len" class="val">--</span></div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="card">
|
|
||||||
<h2>播放操作</h2>
|
|
||||||
<div class="btns">
|
|
||||||
<button class="btn-s" onclick="wsReady?wsCmd({cmd:'prev'}):api('POST','/api/previous')">上一个</button>
|
|
||||||
<button class="btn" onclick="wsReady?wsCmd({cmd:'play'}):api('POST','/api/play')">播放</button>
|
|
||||||
<button class="btn-s" onclick="wsReady?wsCmd({cmd:'pause'}):api('POST','/api/pause')">暂停</button>
|
|
||||||
<button class="btn" onclick="wsReady?wsCmd({cmd:'next'}):api('POST','/api/next')">下一个</button>
|
|
||||||
</div>
|
|
||||||
<div class="row" style="margin-top:12px">
|
|
||||||
<div><label>跳转到索引</label><input id="goto-idx" type="number" min="0" placeholder="0"></div>
|
|
||||||
<div style="flex:0"><label> </label><button class="btn" onclick="gotoVideo()">跳转</button></div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="card" style="grid-column:1/-1">
|
|
||||||
<h2>触发器</h2>
|
|
||||||
<div class="btns">
|
|
||||||
<button class="btn-s" onclick="triggerPreset('voice','name')">语音唤醒</button>
|
|
||||||
<button class="btn-s" onclick="triggerPreset('button','button1')">按钮 1</button>
|
|
||||||
<button class="btn-s" onclick="triggerPreset('button','button2')">按钮 2</button>
|
|
||||||
<button class="btn-s" onclick="triggerPreset('sensor','touch')">触摸感应</button>
|
|
||||||
</div>
|
|
||||||
<div class="row" style="margin-top:10px">
|
|
||||||
<div><label>触发器名称</label><input id="tr-name" type="text" placeholder="voice"></div>
|
|
||||||
<div><label>触发器值</label><input id="tr-value" type="text" placeholder="name"></div>
|
|
||||||
<div style="flex:0"><label> </label><button class="btn" onclick="triggerCustom()">发送</button></div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</section>
|
|
||||||
|
|
||||||
<!-- 视频管理 -->
|
|
||||||
<section class="panel" id="panel-videos">
|
|
||||||
<div class="grid">
|
|
||||||
<div class="card">
|
|
||||||
<h2>上传视频</h2>
|
|
||||||
<input id="upload-file" type="file" accept="video/*" multiple>
|
|
||||||
<div class="btns"><button class="btn" onclick="uploadVideos()">上传</button></div>
|
|
||||||
</div>
|
|
||||||
<div class="card">
|
|
||||||
<h2>设备视频文件</h2>
|
|
||||||
<div id="video-list" class="list"><div class="item"><span class="name">加载中...</span></div></div>
|
|
||||||
<div class="btns"><button class="btn-s" onclick="loadVideoList()">刷新</button></div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</section>
|
|
||||||
|
|
||||||
<!-- 文件管理 -->
|
|
||||||
<section class="panel" id="panel-files">
|
|
||||||
<div class="card">
|
|
||||||
<h2>文件管理器</h2>
|
|
||||||
<div class="file-toolbar">
|
|
||||||
<select id="fm-dir" onchange="fmNavigate('')">
|
|
||||||
<option value="videos">视频目录</option>
|
|
||||||
<option value="configs">配置目录</option>
|
|
||||||
<option value="plugins">插件目录</option>
|
|
||||||
</select>
|
|
||||||
<button class="btn-s" onclick="fmRefresh()">刷新</button>
|
|
||||||
<button class="btn-s" onclick="fmMkdir()">新建文件夹</button>
|
|
||||||
<button class="btn" onclick="document.getElementById('fm-upload-input').click()">上传文件</button>
|
|
||||||
<input id="fm-upload-input" type="file" multiple style="display:none" onchange="fmUpload(this)">
|
|
||||||
</div>
|
|
||||||
<div id="fm-breadcrumb" class="file-breadcrumb"></div>
|
|
||||||
<div id="fm-list" class="list" style="max-height:400px"><div class="item"><span class="name">选择目录后加载...</span></div></div>
|
|
||||||
<div class="btns" style="margin-top:8px">
|
|
||||||
<button class="btn-d" id="fm-del-btn" onclick="fmDeleteSelected()" style="display:none">删除选中</button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</section>
|
|
||||||
|
|
||||||
<!-- 网络设置 -->
|
|
||||||
<section class="panel" id="panel-wifi">
|
|
||||||
<div class="grid">
|
|
||||||
<div class="card">
|
|
||||||
<h2>网络状态</h2>
|
|
||||||
<div class="stats">
|
|
||||||
<div class="stat"><span class="label">WiFi</span><span id="wifi-connected" class="val">--</span></div>
|
|
||||||
<div class="stat"><span class="label">SSID</span><span id="wifi-ssid" class="val">--</span></div>
|
|
||||||
<div class="stat"><span class="label">IP</span><span id="wifi-ip" class="val">--</span></div>
|
|
||||||
<div class="stat"><span class="label">BLE</span><span id="ble-status" class="val">--</span></div>
|
|
||||||
</div>
|
|
||||||
<div class="btns"><button class="btn-s" onclick="loadWifiStatus();loadBleStatus()">刷新状态</button></div>
|
|
||||||
</div>
|
|
||||||
<div class="card">
|
|
||||||
<h2>WiFi 扫描</h2>
|
|
||||||
<div id="wifi-list" class="list"><div class="item"><span class="name">点击扫描搜索附近网络</span></div></div>
|
|
||||||
<div class="btns"><button class="btn" onclick="scanWifi()">扫描网络</button></div>
|
|
||||||
</div>
|
|
||||||
<div class="card">
|
|
||||||
<h2>连接 WiFi</h2>
|
|
||||||
<label>SSID</label><input id="wifi-ssid-input" type="text" placeholder="网络名称">
|
|
||||||
<label>密码</label><input id="wifi-pass-input" type="password" placeholder="WiFi 密码">
|
|
||||||
<div class="btns"><button class="btn" onclick="connectWifi()">连接</button></div>
|
|
||||||
</div>
|
|
||||||
<div class="card">
|
|
||||||
<h2>热点 / BLE</h2>
|
|
||||||
<label>热点名称</label><input id="ap-ssid" type="text" value="Showen">
|
|
||||||
<label>热点密码</label><input id="ap-pass" type="text" value="12345678">
|
|
||||||
<div class="btns">
|
|
||||||
<button class="btn-g" onclick="startAP()">开启热点</button>
|
|
||||||
<button class="btn-d" onclick="stopAP()">关闭热点</button>
|
|
||||||
</div>
|
|
||||||
<label>BLE 设备名</label><input id="ble-name" type="text" value="Showen">
|
|
||||||
<div class="btns">
|
|
||||||
<button class="btn-s" onclick="startBLE()">启动 BLE</button>
|
|
||||||
<button class="btn-d" onclick="stopBLE()">停止 BLE</button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</section>
|
|
||||||
|
|
||||||
<!-- 系统配置 -->
|
|
||||||
<section class="panel" id="panel-settings">
|
|
||||||
<div class="grid">
|
|
||||||
<div class="card" style="grid-column:1/-1">
|
|
||||||
<h2>配置文件切换</h2>
|
|
||||||
<div class="row">
|
|
||||||
<div><label>当前配置</label><select id="cfg-select"><option>加载中...</option></select></div>
|
|
||||||
<div style="flex:0"><label> </label><button class="btn" onclick="switchConfig()">切换</button></div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="card">
|
|
||||||
<h2>显示设置</h2>
|
|
||||||
<div id="display-form"></div>
|
|
||||||
<div class="btns"><button class="btn" onclick="saveDisplay()">保存显示设置</button></div>
|
|
||||||
</div>
|
|
||||||
<div class="card">
|
|
||||||
<h2>配置编辑器</h2>
|
|
||||||
<textarea id="cfg-editor" placeholder="加载中..."></textarea>
|
|
||||||
<div class="btns">
|
|
||||||
<button class="btn-s" onclick="loadConfig()">重新加载</button>
|
|
||||||
<button class="btn-s" onclick="formatConfig()">格式化</button>
|
|
||||||
<button class="btn" onclick="saveConfig()">保存配置</button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</section>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<script>
|
|
||||||
var cachedConfig=null,ws=null,wsReady=false;
|
|
||||||
var fmCurrentDir='videos',fmCurrentPath='';
|
|
||||||
function $(id){return document.getElementById(id)}
|
|
||||||
function toast(msg,err){var el=$('toast');el.textContent=msg;el.className='toast '+(err?'err':'ok');el.style.display='block';clearTimeout(el._t);el._t=setTimeout(function(){el.style.display='none'},3000)}
|
|
||||||
function formatBytes(size){if(size===undefined||size===null||isNaN(size))return '--';if(size<1024)return size+' B';if(size<1048576)return(size/1024).toFixed(1)+' KB';if(size<1073741824)return(size/1048576).toFixed(1)+' MB';return(size/1073741824).toFixed(1)+' GB'}
|
|
||||||
function updateDownloadModal(info){
|
|
||||||
var meta=$('download-meta'),link=$('download-apk-link'),qr=$('download-qr-image'),desc=$('download-modal-desc');
|
|
||||||
if(!info||!info.apk_available){
|
|
||||||
meta.textContent='APK 尚未发布,请稍后再试';
|
|
||||||
meta.className='download-meta warn';
|
|
||||||
link.style.display='none';
|
|
||||||
qr.style.display='none';
|
|
||||||
qr.removeAttribute('src');
|
|
||||||
desc.textContent='当前暂未提供可下载的 APK 安装包';
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
var url=location.origin+(info.download_url||'/download/showen-app.apk');
|
|
||||||
meta.textContent='版本 '+(info.version||'0.1.0')+' · '+formatBytes(info.apk_size);
|
|
||||||
meta.className='download-meta';
|
|
||||||
link.style.display='inline-flex';
|
|
||||||
link.href=info.download_url||'/download/showen-app.apk';
|
|
||||||
qr.style.display='block';
|
|
||||||
qr.src='https://api.qrserver.com/v1/create-qr-code/?size=180x180&data='+encodeURIComponent(url);
|
|
||||||
desc.textContent='扫描二维码或点击下载,支持蓝牙配网和远程控制';
|
|
||||||
}
|
|
||||||
function openDownloadModal(){
|
|
||||||
var modal=$('download-modal');
|
|
||||||
$('download-meta').textContent='正在获取 App 信息...';
|
|
||||||
$('download-meta').className='download-meta';
|
|
||||||
$('download-apk-link').style.display='none';
|
|
||||||
$('download-qr-image').style.display='none';
|
|
||||||
$('download-qr-image').removeAttribute('src');
|
|
||||||
$('download-modal-desc').textContent='扫描二维码或点击下载,支持蓝牙配网和远程控制';
|
|
||||||
modal.classList.add('open');
|
|
||||||
fetch('/api/app/info').then(function(r){if(!r.ok)throw new Error('加载 App 信息失败');return r.json()}).then(updateDownloadModal).catch(function(){
|
|
||||||
$('download-meta').textContent='APK 信息加载失败,请稍后再试';
|
|
||||||
$('download-meta').className='download-meta warn';
|
|
||||||
$('download-apk-link').style.display='none';
|
|
||||||
$('download-qr-image').style.display='none';
|
|
||||||
})
|
|
||||||
}
|
|
||||||
function closeDownloadModal(ev){if(ev&&ev.target!==$('download-modal'))return;$('download-modal').classList.remove('open')}
|
|
||||||
document.addEventListener('keydown',function(ev){if(ev.key==='Escape')closeDownloadModal()})
|
|
||||||
|
|
||||||
// Tabs
|
|
||||||
document.querySelectorAll('.tab').forEach(function(t){t.onclick=function(){document.querySelectorAll('.tab').forEach(function(e){e.classList.remove('active')});document.querySelectorAll('.panel').forEach(function(e){e.classList.remove('active')});t.classList.add('active');$('panel-'+t.dataset.tab).classList.add('active');if(t.dataset.tab==='videos')loadVideoList();if(t.dataset.tab==='files')fmRefresh();if(t.dataset.tab==='wifi'){loadWifiStatus();loadBleStatus()}if(t.dataset.tab==='settings'&&!cachedConfig){loadConfig();loadAvailableConfigs()}}});
|
|
||||||
|
|
||||||
// WebSocket
|
|
||||||
function connectWS(){var proto=location.protocol==='https:'?'wss:':'ws:';ws=new WebSocket(proto+'//'+location.host+'/ws');ws.onopen=function(){wsReady=true;$('ws-badge').textContent='WS 已连接';$('ws-badge').style.borderColor='rgba(34,197,94,.4)';$('ws-badge').style.color='#22c55e';$('ws-badge').style.background='rgba(34,197,94,.1)'};ws.onclose=function(){wsReady=false;$('ws-badge').textContent='WS 断开';$('ws-badge').style.borderColor='rgba(239,68,68,.3)';$('ws-badge').style.color='#ef4444';$('ws-badge').style.background='rgba(239,68,68,.1)';setTimeout(connectWS,2000)};ws.onerror=function(){wsReady=false};ws.onmessage=function(ev){try{var msg=JSON.parse(ev.data);if(msg.type==='status_update')applyStatus(msg.data);else if(msg.type==='state_update')toast('场景: '+msg.data.old_state+' -> '+msg.data.new_state);else if(msg.type==='wifi_update')applyWifi(msg.data);else if(msg.type==='ble_update')applyBle(msg.data);else if(msg.type==='config_update')cachedConfig=msg.data}catch(e){}}}
|
|
||||||
function wsCmd(obj){if(wsReady)ws.send(JSON.stringify(obj));else toast('WebSocket 未连接',true)}
|
|
||||||
|
|
||||||
// API
|
|
||||||
function api(method,path,body){var opts={method:method,headers:{}};if(body!==undefined){if(typeof body==='string'){opts.headers['Content-Type']='application/json';opts.body=body}else if(body instanceof FormData){opts.body=body}else{opts.headers['Content-Type']='application/json';opts.body=JSON.stringify(body)}}return fetch(path,opts).then(function(r){return r.json().then(function(d){if(!r.ok)throw d;return d})}).then(function(d){if(d.message)toast(d.message,d.status==='error');return d}).catch(function(e){toast((e&&e.message)||'请求失败',true);throw e})}
|
|
||||||
|
|
||||||
// Status
|
|
||||||
function applyStatus(d){var el=$('st-state');if(!d.running){el.textContent='已停止';el.className='val warn'}else if(d.paused){el.textContent='已暂停';el.className='val warn'}else{el.textContent='播放中';el.className='val ok'}$('st-video').textContent=d.current_video||'无';$('st-index').textContent=d.current_index;$('st-len').textContent=d.playlist_length}
|
|
||||||
function refreshStatus(){fetch('/api/status').then(function(r){return r.json()}).then(applyStatus).catch(function(){})}
|
|
||||||
function applyWifi(d){if(d.connected!==undefined){$('wifi-connected').textContent=d.connected?'已连接':'未连接';$('wifi-connected').className=d.connected?'val ok':'val err';$('wifi-ssid').textContent=d.ssid||'--';$('wifi-ip').textContent=d.ip||'--'}}
|
|
||||||
function applyBle(d){if(d.ready!==undefined){var el=$('ble-status');el.textContent=d.ready?'运行中':'未就绪';el.className=d.ready?'val ok':'val warn'}}
|
|
||||||
|
|
||||||
// Controls
|
|
||||||
function gotoVideo(){var idx=$('goto-idx').value;if(idx===''){toast('请输入索引',true);return}if(wsReady)wsCmd({cmd:'goto',index:parseInt(idx,10)});else api('POST','/api/goto/'+idx)}
|
|
||||||
function triggerPreset(n,v){if(wsReady)wsCmd({cmd:'trigger',name:n,value:v||''});else api('POST','/api/trigger/'+encodeURIComponent(n)+'/'+encodeURIComponent(v||''))}
|
|
||||||
function triggerCustom(){var n=$('tr-name').value,v=$('tr-value').value;if(!n){toast('请输入触发器名',true);return}triggerPreset(n,v)}
|
|
||||||
|
|
||||||
// Videos
|
|
||||||
function loadVideoList(){fetch('/api/videos').then(function(r){return r.json()}).then(function(files){var el=$('video-list');if(!files.length){el.innerHTML='<div class="item"><span class="name">目录中没有视频文件</span></div>';return}el.innerHTML=files.map(function(f){var sz=f.size<1048576?(f.size/1024).toFixed(1)+' KB':(f.size/1048576).toFixed(1)+' MB';return '<div class="item"><span class="name">'+esc(f.name)+'</span><span class="meta">'+sz+'</span><button class="btn-d" onclick="deleteVideo(\''+js(f.name)+'\')">删除</button></div>'}).join('')}).catch(function(){toast('加载视频列表失败',true)})}
|
|
||||||
function uploadVideos(){var input=$('upload-file');if(!input.files.length){toast('请先选择文件',true);return}var fd=new FormData();for(var i=0;i<input.files.length;i++)fd.append('file',input.files[i],input.files[i].name);fetch('/api/videos/upload',{method:'POST',body:fd}).then(function(r){return r.json()}).then(function(d){toast(d.message,d.status==='error');input.value='';loadVideoList()}).catch(function(){toast('上传失败',true)})}
|
|
||||||
function deleteVideo(name){if(!confirm('确定删除 '+name+' ?'))return;fetch('/api/videos/'+encodeURIComponent(name),{method:'DELETE'}).then(function(r){return r.json()}).then(function(d){toast(d.message,d.status==='error');loadVideoList()}).catch(function(){toast('删除失败',true)})}
|
|
||||||
|
|
||||||
// File Manager
|
|
||||||
function fmRefresh(){fmNavigate(fmCurrentPath)}
|
|
||||||
function fmNavigate(subpath){
|
|
||||||
fmCurrentDir=$('fm-dir').value;fmCurrentPath=subpath||'';
|
|
||||||
var url='/api/files/'+fmCurrentDir;if(fmCurrentPath)url+='?path='+encodeURIComponent(fmCurrentPath);
|
|
||||||
// breadcrumb
|
|
||||||
var bc=$('fm-breadcrumb');var parts=fmCurrentPath?fmCurrentPath.split('/'):[];
|
|
||||||
var html='<span onclick="fmNavigate(\'\')">'+({'videos':'视频目录','configs':'配置目录','plugins':'插件目录'}[fmCurrentDir]||fmCurrentDir)+'</span>';
|
|
||||||
var acc='';
|
|
||||||
for(var i=0;i<parts.length;i++){if(parts[i]){acc+=(acc?'/':'')+parts[i];html+='<span class="sep">/</span><span onclick="fmNavigate(\''+js(acc)+'\')">'+esc(parts[i])+'</span>'}}
|
|
||||||
bc.innerHTML=html;
|
|
||||||
fetch(url).then(function(r){return r.json()}).then(function(entries){
|
|
||||||
var el=$('fm-list');
|
|
||||||
if(entries.status==='error'){el.innerHTML='<div class="item"><span class="name">'+esc(entries.message)+'</span></div>';return}
|
|
||||||
if(!entries.length){el.innerHTML='<div class="item"><span class="name">空目录</span></div>';$('fm-del-btn').style.display='none';return}
|
|
||||||
var html='';
|
|
||||||
for(var i=0;i<entries.length;i++){
|
|
||||||
var e=entries[i];var sz=e.is_dir?'':e.size<1048576?(e.size/1024).toFixed(1)+' KB':(e.size/1048576).toFixed(1)+' MB';
|
|
||||||
var fp=fmCurrentPath?(fmCurrentPath+'/'+e.name):e.name;
|
|
||||||
html+='<div class="item">';
|
|
||||||
html+='<label class="checkbox-label"><input type="checkbox" class="fm-check" data-path="'+esc(fp)+'" data-isdir="'+(e.is_dir?'1':'0')+'"></label>';
|
|
||||||
if(e.is_dir){html+='<span class="dir-icon">📁</span><span class="name" style="cursor:pointer;color:var(--amber)" onclick="fmNavigate(\''+js(fp)+'\')">'+esc(e.name)+'</span>'}
|
|
||||||
else{html+='<span class="name">'+esc(e.name)+'</span>'}
|
|
||||||
html+='<span class="meta">'+sz+'</span>';
|
|
||||||
if(!e.is_dir){html+='<button class="btn-s" onclick="fmDownload(\''+js(fp)+'\')">下载</button>'}
|
|
||||||
html+='</div>'
|
|
||||||
}
|
|
||||||
el.innerHTML=html;
|
|
||||||
// 监听 checkbox 变化
|
|
||||||
el.querySelectorAll('.fm-check').forEach(function(cb){cb.onchange=fmUpdateDelBtn});
|
|
||||||
fmUpdateDelBtn()
|
|
||||||
}).catch(function(){toast('加载文件列表失败',true)})
|
|
||||||
}
|
|
||||||
function fmUpdateDelBtn(){var cbs=document.querySelectorAll('.fm-check:checked');$('fm-del-btn').style.display=cbs.length?'':'none';$('fm-del-btn').textContent='删除选中 ('+cbs.length+')'}
|
|
||||||
function fmDeleteSelected(){
|
|
||||||
var cbs=document.querySelectorAll('.fm-check:checked');if(!cbs.length)return;
|
|
||||||
if(!confirm('确定删除 '+cbs.length+' 个项目?'))return;
|
|
||||||
var promises=[];
|
|
||||||
cbs.forEach(function(cb){
|
|
||||||
var p=cb.dataset.path;
|
|
||||||
promises.push(fetch('/api/files/'+fmCurrentDir+'/delete',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({path:p})}).then(function(r){return r.json()}))
|
|
||||||
});
|
|
||||||
Promise.all(promises).then(function(results){
|
|
||||||
var ok=0,fail=0;results.forEach(function(r){if(r.status==='ok')ok++;else fail++});
|
|
||||||
toast('删除完成: '+ok+' 成功'+(fail?' / '+fail+' 失败':''),fail>0);fmRefresh()
|
|
||||||
})
|
|
||||||
}
|
|
||||||
function fmDownload(path){window.open('/api/files/'+fmCurrentDir+'/download?path='+encodeURIComponent(path),'_blank')}
|
|
||||||
function fmUpload(input){
|
|
||||||
if(!input.files.length)return;
|
|
||||||
var fd=new FormData();for(var i=0;i<input.files.length;i++)fd.append('file',input.files[i],input.files[i].name);
|
|
||||||
var url='/api/files/'+fmCurrentDir+'/upload';if(fmCurrentPath)url+='?path='+encodeURIComponent(fmCurrentPath);
|
|
||||||
fetch(url,{method:'POST',body:fd}).then(function(r){return r.json()}).then(function(d){toast(d.message,d.status==='error');input.value='';fmRefresh()}).catch(function(){toast('上传失败',true)})
|
|
||||||
}
|
|
||||||
function fmMkdir(){
|
|
||||||
var name=prompt('输入新文件夹名称:');if(!name)return;
|
|
||||||
var path=fmCurrentPath?(fmCurrentPath+'/'+name):name;
|
|
||||||
fetch('/api/files/'+fmCurrentDir+'/mkdir',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({path:path})}).then(function(r){return r.json()}).then(function(d){toast(d.message,d.status==='error');fmRefresh()}).catch(function(){toast('创建失败',true)})
|
|
||||||
}
|
|
||||||
|
|
||||||
// WiFi
|
|
||||||
function loadWifiStatus(){fetch('/api/wifi/status').then(function(r){return r.json()}).then(applyWifi).catch(function(){})}
|
|
||||||
function scanWifi(){$('wifi-list').innerHTML='<div class="item"><span class="name">扫描中...</span></div>';fetch('/api/wifi/scan').then(function(r){return r.json()}).then(function(list){if(!list.length){$('wifi-list').innerHTML='<div class="item"><span class="name">未发现 WiFi</span></div>';return}$('wifi-list').innerHTML=list.map(function(n){return '<div class="item"><span class="name">'+esc(n.ssid||'隐藏网络')+'</span><span class="meta">'+esc(String(n.signal||0))+' / '+esc(n.security||'OPEN')+'</span><button class="btn-s" onclick="selectWifi(\''+js(n.ssid||'')+'\')">选择</button></div>'}).join('')}).catch(function(){toast('扫描失败',true)})}
|
|
||||||
function selectWifi(ssid){$('wifi-ssid-input').value=ssid}
|
|
||||||
function connectWifi(){var s=$('wifi-ssid-input').value,p=$('wifi-pass-input').value;if(!s){toast('请输入 WiFi 名称',true);return}if(wsReady)wsCmd({cmd:'connect',ssid:s,password:p});else api('POST','/api/wifi/connect',{ssid:s,password:p}).then(function(){setTimeout(loadWifiStatus,1500)})}
|
|
||||||
function startAP(){var s=$('ap-ssid').value||'showen',p=$('ap-pass').value||'12345678';if(p.length<8){toast('热点密码至少 8 位',true);return}if(wsReady)wsCmd({cmd:'ap_start',ssid:s,password:p});else api('POST','/api/wifi/ap/start',{ssid:s,password:p})}
|
|
||||||
function stopAP(){if(wsReady)wsCmd({cmd:'ap_stop'});else api('POST','/api/wifi/ap/stop')}
|
|
||||||
function loadBleStatus(){fetch('/api/ble/status').then(function(r){return r.json()}).then(function(d){var el=$('ble-status');if(d.running){el.textContent='运行中 / '+(d.device_name||'showen');el.className='val ok'}else{el.textContent='未就绪';el.className='val warn'}}).catch(function(){})}
|
|
||||||
function startBLE(){api('POST','/api/ble/start',{device_name:$('ble-name').value||'showen'}).then(loadBleStatus)}
|
|
||||||
function stopBLE(){api('POST','/api/ble/stop').then(loadBleStatus)}
|
|
||||||
|
|
||||||
// Config switch
|
|
||||||
function loadAvailableConfigs(){fetch('/api/config/available').then(function(r){return r.json()}).then(function(d){var sel=$('cfg-select');sel.innerHTML='';d.configs.forEach(function(f){var opt=document.createElement('option');opt.value=f;opt.textContent=f;if(f===d.active)opt.selected=true;sel.appendChild(opt)})}).catch(function(){})}
|
|
||||||
function switchConfig(){var f=$('cfg-select').value;if(!f){toast('请选择配置',true);return}if(!confirm('确定切换到 '+f+' ?'))return;api('POST','/api/config/switch',{filename:f}).then(function(){loadConfig();loadAvailableConfigs()})}
|
|
||||||
|
|
||||||
// Config
|
|
||||||
function loadConfig(){fetch('/api/config').then(function(r){return r.json()}).then(function(cfg){cachedConfig=cfg;$('cfg-editor').value=JSON.stringify(cfg,null,2);renderDisplay(cfg.display)}).catch(function(){toast('加载配置失败',true)})}
|
|
||||||
function formatConfig(){try{$('cfg-editor').value=JSON.stringify(JSON.parse($('cfg-editor').value),null,2)}catch(_){toast('JSON 格式错误',true)}}
|
|
||||||
function saveConfig(){var raw=$('cfg-editor').value;try{JSON.parse(raw)}catch(_){toast('JSON 格式错误',true);return}api('POST','/api/config',raw).then(loadConfig)}
|
|
||||||
function renderDisplay(d){if(!d)return;var h='';h+='<label class="checkbox-label"><input id="d-fullscreen" type="checkbox" '+(d.fullscreen?'checked':'')+'> 全屏模式</label>';h+='<label>窗口标题</label><input id="d-title" type="text" value="'+ea(d.window_title||'')+'">';h+='<label>旋转角度</label><input id="d-rotation" type="number" value="'+ea(String(d.rotation||0))+'">';h+='<label>渲染宽度</label><input id="d-render-width" type="number" value="'+ea(String(d.render_width||1024))+'">';h+='<label>渲染高度</label><input id="d-render-height" type="number" value="'+ea(String(d.render_height||1024))+'">';h+='<label>色键下限 (H,S,V)</label><input id="d-ck-min" type="text" value="'+ea((d.chroma_key&&d.chroma_key.hsv_min?d.chroma_key.hsv_min.join(','):'0,0,200'))+'">';h+='<label>色键上限 (H,S,V)</label><input id="d-ck-max" type="text" value="'+ea((d.chroma_key&&d.chroma_key.hsv_max?d.chroma_key.hsv_max.join(','):'180,30,255'))+'">';h+='<label>透视校正点 (JSON)</label><input id="d-points" type="text" value="'+ea(JSON.stringify((d.perspective_correction&&d.perspective_correction.points)||[]))+'">';$('display-form').innerHTML=h}
|
|
||||||
function saveDisplay(){if(!cachedConfig){loadConfig();return}var n=JSON.parse(JSON.stringify(cachedConfig));n.display.fullscreen=$('d-fullscreen').checked;n.display.window_title=$('d-title').value;n.display.rotation=parseInt($('d-rotation').value||'0',10);n.display.render_width=parseInt($('d-render-width').value||'1024',10);n.display.render_height=parseInt($('d-render-height').value||'1024',10);n.display.chroma_key=n.display.chroma_key||{};n.display.chroma_key.hsv_min=$('d-ck-min').value.split(',').map(function(v){return parseInt(v.trim()||'0',10)});n.display.chroma_key.hsv_max=$('d-ck-max').value.split(',').map(function(v){return parseInt(v.trim()||'0',10)});n.display.perspective_correction=n.display.perspective_correction||{};try{n.display.perspective_correction.points=JSON.parse($('d-points').value)}catch(_){toast('透视点 JSON 无效',true);return}cachedConfig=n;$('cfg-editor').value=JSON.stringify(n,null,2);saveConfig()}
|
|
||||||
|
|
||||||
// Utils
|
|
||||||
function esc(v){return String(v).replace(/[&<>"]/g,function(c){return({'&':'&','<':'<','>':'>','"':'"'})[c]})}
|
|
||||||
function ea(v){return esc(v).replace(/'/g,''')}
|
|
||||||
function js(v){return String(v).replace(/\\/g,'\\\\').replace(/'/g,"\\'")}
|
|
||||||
connectWS();refreshStatus();
|
|
||||||
</script>
|
|
||||||
</body>
|
|
||||||
</html>"##;
|
|
||||||
|
|||||||
148
src/plugins/live2d/animation.rs
Normal file
148
src/plugins/live2d/animation.rs
Normal file
@@ -0,0 +1,148 @@
|
|||||||
|
//! 动画系统:眨眼、嘴部动效、待机呼吸
|
||||||
|
|
||||||
|
use super::core_ffi::CubismCore;
|
||||||
|
use super::model::CubismModel;
|
||||||
|
use std::time::{Duration, Instant};
|
||||||
|
|
||||||
|
/// 动画状态
|
||||||
|
pub struct AnimationState {
|
||||||
|
/// 眨眼定时器
|
||||||
|
last_blink: Instant,
|
||||||
|
next_blink_interval: Duration,
|
||||||
|
blink_phase: BlinkPhase,
|
||||||
|
/// 嘴部状态
|
||||||
|
talking: bool,
|
||||||
|
mouth_open: f32,
|
||||||
|
mouth_target: f32,
|
||||||
|
last_mouth_update: Instant,
|
||||||
|
/// 呼吸
|
||||||
|
breath_phase: f32,
|
||||||
|
/// 身体摇摆
|
||||||
|
body_phase: f32,
|
||||||
|
/// 眼球跟随(简化为固定值)
|
||||||
|
eye_ball_x: f32,
|
||||||
|
eye_ball_y: f32,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Clone, Copy, Debug)]
|
||||||
|
enum BlinkPhase {
|
||||||
|
Idle,
|
||||||
|
Closing(f32), // 0→1
|
||||||
|
Opening(f32), // 1→0
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Default for AnimationState {
|
||||||
|
fn default() -> Self {
|
||||||
|
Self {
|
||||||
|
last_blink: Instant::now(),
|
||||||
|
next_blink_interval: Duration::from_secs(3),
|
||||||
|
blink_phase: BlinkPhase::Idle,
|
||||||
|
talking: false,
|
||||||
|
mouth_open: 0.0,
|
||||||
|
mouth_target: 0.0,
|
||||||
|
last_mouth_update: Instant::now(),
|
||||||
|
breath_phase: 0.0,
|
||||||
|
body_phase: 0.0,
|
||||||
|
eye_ball_x: 0.0,
|
||||||
|
eye_ball_y: 0.0,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl AnimationState {
|
||||||
|
pub fn set_talking(&mut self, talking: bool) {
|
||||||
|
self.talking = talking;
|
||||||
|
if !talking {
|
||||||
|
self.mouth_target = 0.0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 更新动画并应用到 model 参数
|
||||||
|
pub fn update(&mut self, core: &CubismCore, model: &CubismModel, now: Instant, dt: f32) {
|
||||||
|
// === 呼吸 ===
|
||||||
|
self.breath_phase += dt * 0.5; // 0.5 Hz
|
||||||
|
let breath = self.breath_phase.sin() * 0.5 + 0.5;
|
||||||
|
model.set_param(core, "ParamBreath", breath);
|
||||||
|
|
||||||
|
// === 身体摇摆 ===
|
||||||
|
self.body_phase += dt * 0.3;
|
||||||
|
let body_x = self.body_phase.sin() * 8.0;
|
||||||
|
let body_y = self.body_phase.sin() * 0.5;
|
||||||
|
model.set_param(core, "ParamBodyAngleX", body_x);
|
||||||
|
model.set_param(core, "ParamBodyAngleY", body_y);
|
||||||
|
|
||||||
|
// === 眨眼 ===
|
||||||
|
self.update_blink(now, core, model);
|
||||||
|
|
||||||
|
// === 嘴部 ===
|
||||||
|
self.update_mouth(now, dt, core, model);
|
||||||
|
|
||||||
|
// === 眼球(轻微随机移动)===
|
||||||
|
self.eye_ball_x = (now.elapsed().as_secs_f32() * 0.3).sin() * 0.3;
|
||||||
|
self.eye_ball_y = (now.elapsed().as_secs_f32() * 0.2).cos() * 0.2;
|
||||||
|
model.set_param(core, "ParamEyeBallX", self.eye_ball_x);
|
||||||
|
model.set_param(core, "ParamEyeBallY", self.eye_ball_y);
|
||||||
|
}
|
||||||
|
|
||||||
|
fn update_blink(&mut self, now: Instant, core: &CubismCore, model: &CubismModel) {
|
||||||
|
// 先计算新的眨眼状态和当前 eye_open 值,避免借用冲突
|
||||||
|
let (new_phase, eye_open) = match self.blink_phase {
|
||||||
|
BlinkPhase::Idle => {
|
||||||
|
if now.duration_since(self.last_blink) >= self.next_blink_interval {
|
||||||
|
(BlinkPhase::Closing(0.0), 1.0)
|
||||||
|
} else {
|
||||||
|
(BlinkPhase::Idle, 1.0)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
BlinkPhase::Closing(mut t) => {
|
||||||
|
t += 0.15;
|
||||||
|
if t >= 1.0 {
|
||||||
|
(BlinkPhase::Opening(1.0), 0.0)
|
||||||
|
} else {
|
||||||
|
(BlinkPhase::Closing(t), 1.0 - t)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
BlinkPhase::Opening(mut t) => {
|
||||||
|
t -= 0.1;
|
||||||
|
if t <= 0.0 {
|
||||||
|
self.last_blink = now;
|
||||||
|
self.next_blink_interval =
|
||||||
|
Duration::from_secs(2 + (now.elapsed().as_nanos() % 3) as u64);
|
||||||
|
(BlinkPhase::Idle, 1.0)
|
||||||
|
} else {
|
||||||
|
(BlinkPhase::Opening(t), 1.0 - t)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
|
self.blink_phase = new_phase;
|
||||||
|
model.set_param(core, "ParamEyeLOpen", eye_open);
|
||||||
|
model.set_param(core, "ParamEyeROpen", eye_open);
|
||||||
|
}
|
||||||
|
|
||||||
|
fn update_mouth(
|
||||||
|
&mut self,
|
||||||
|
now: Instant,
|
||||||
|
dt: f32,
|
||||||
|
core: &CubismCore,
|
||||||
|
model: &CubismModel,
|
||||||
|
) {
|
||||||
|
if self.talking {
|
||||||
|
// 说话时嘴部快速开合
|
||||||
|
let t = now.elapsed().as_secs_f32();
|
||||||
|
// 用多个正弦叠加产生自然的变化
|
||||||
|
let base = (t * 12.0).sin() * 0.4 + (t * 7.0).sin() * 0.3 + (t * 19.0).sin() * 0.2;
|
||||||
|
self.mouth_target = (base * 0.5 + 0.5).clamp(0.0, 1.0) * 0.9 + 0.1;
|
||||||
|
} else {
|
||||||
|
self.mouth_target = 0.0;
|
||||||
|
}
|
||||||
|
|
||||||
|
// 平滑过渡
|
||||||
|
let lerp_speed = 15.0 * dt;
|
||||||
|
self.mouth_open += (self.mouth_target - self.mouth_open) * lerp_speed.min(1.0);
|
||||||
|
model.set_param(core, "ParamMouthOpenY", self.mouth_open);
|
||||||
|
|
||||||
|
// 嘴部形态也轻微变化
|
||||||
|
let form = (now.elapsed().as_secs_f32() * 3.0).sin() * 0.3 * if self.talking { 1.0 } else { 0.0 };
|
||||||
|
model.set_param(core, "ParamMouthForm", form);
|
||||||
|
}
|
||||||
|
}
|
||||||
155
src/plugins/live2d/assets.rs
Normal file
155
src/plugins/live2d/assets.rs
Normal file
@@ -0,0 +1,155 @@
|
|||||||
|
//! 资源管理:model3.json 解析 + PNG 纹理加载
|
||||||
|
|
||||||
|
use anyhow::{anyhow, Context, Result};
|
||||||
|
use serde::Deserialize;
|
||||||
|
use std::path::{Path, PathBuf};
|
||||||
|
|
||||||
|
/// model3.json 中的 Groups 条目
|
||||||
|
#[derive(Deserialize, Clone, Debug)]
|
||||||
|
pub struct ModelGroup {
|
||||||
|
#[serde(rename = "Target")]
|
||||||
|
pub target: String,
|
||||||
|
#[serde(rename = "Name")]
|
||||||
|
pub name: String,
|
||||||
|
#[serde(rename = "Ids")]
|
||||||
|
pub ids: Vec<String>,
|
||||||
|
}
|
||||||
|
|
||||||
|
/// model3.json 文件引用
|
||||||
|
#[derive(Deserialize, Clone, Debug)]
|
||||||
|
pub struct FileReferences {
|
||||||
|
#[serde(rename = "Moc")]
|
||||||
|
pub moc: String,
|
||||||
|
#[serde(rename = "Textures", default)]
|
||||||
|
pub textures: Vec<String>,
|
||||||
|
#[serde(rename = "Physics", default)]
|
||||||
|
pub physics: Option<String>,
|
||||||
|
#[serde(rename = "Pose", default)]
|
||||||
|
pub pose: Option<String>,
|
||||||
|
#[serde(rename = "DisplayInfo", default)]
|
||||||
|
pub display_info: Option<String>,
|
||||||
|
}
|
||||||
|
|
||||||
|
/// model3.json 根结构
|
||||||
|
#[derive(Deserialize, Clone, Debug)]
|
||||||
|
pub struct Model3Json {
|
||||||
|
#[serde(rename = "Version")]
|
||||||
|
pub version: i32,
|
||||||
|
#[serde(rename = "FileReferences")]
|
||||||
|
pub file_references: FileReferences,
|
||||||
|
#[serde(rename = "Groups", default)]
|
||||||
|
pub groups: Vec<ModelGroup>,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Model3Json {
|
||||||
|
/// 从文件解析
|
||||||
|
pub fn from_path(path: &Path) -> Result<Self> {
|
||||||
|
let text = std::fs::read_to_string(path)
|
||||||
|
.with_context(|| format!("读取 model3.json 失败: {}", path.display()))?;
|
||||||
|
let json: Model3Json = serde_json::from_str(&text)
|
||||||
|
.with_context(|| format!("解析 model3.json 失败: {}", path.display()))?;
|
||||||
|
Ok(json)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 获取 LipSync 参数 ID 列表
|
||||||
|
pub fn lip_sync_ids(&self) -> Vec<String> {
|
||||||
|
self.groups
|
||||||
|
.iter()
|
||||||
|
.find(|g| g.target == "Parameter" && g.name == "LipSync")
|
||||||
|
.map(|g| g.ids.clone())
|
||||||
|
.unwrap_or_else(|| vec!["ParamMouthOpenY".to_string()])
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 获取 EyeBlink 参数 ID 列表
|
||||||
|
pub fn eye_blink_ids(&self) -> Vec<String> {
|
||||||
|
self.groups
|
||||||
|
.iter()
|
||||||
|
.find(|g| g.target == "Parameter" && g.name == "EyeBlink")
|
||||||
|
.map(|g| g.ids.clone())
|
||||||
|
.unwrap_or_else(|| {
|
||||||
|
vec!["ParamEyeLOpen".to_string(), "ParamEyeROpen".to_string()]
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 加载的纹理图像(RGBA)
|
||||||
|
pub struct TextureImage {
|
||||||
|
pub width: u32,
|
||||||
|
pub height: u32,
|
||||||
|
pub rgba: Vec<u8>,
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 加载 PNG 纹理(使用 image crate)
|
||||||
|
pub fn load_texture(path: &Path) -> Result<TextureImage> {
|
||||||
|
let img = image::open(path)
|
||||||
|
.with_context(|| format!("加载纹理失败: {}", path.display()))?
|
||||||
|
.to_rgba8();
|
||||||
|
let width = img.width();
|
||||||
|
let height = img.height();
|
||||||
|
let rgba = img.into_raw();
|
||||||
|
Ok(TextureImage {
|
||||||
|
width,
|
||||||
|
height,
|
||||||
|
rgba,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 加载 model3.json 引用的所有纹理(返回按 texture_00, texture_01 顺序的列表)
|
||||||
|
pub fn load_all_textures(
|
||||||
|
model3_dir: &Path,
|
||||||
|
file_refs: &FileReferences,
|
||||||
|
) -> Result<Vec<TextureImage>> {
|
||||||
|
let mut textures = Vec::new();
|
||||||
|
for tex_rel in &file_refs.textures {
|
||||||
|
let tex_path = model3_dir.join(tex_rel);
|
||||||
|
let img = load_texture(&tex_path)?;
|
||||||
|
println!(
|
||||||
|
"[Live2D] 纹理加载: {} ({}x{})",
|
||||||
|
tex_rel, img.width, img.height
|
||||||
|
);
|
||||||
|
textures.push(img);
|
||||||
|
}
|
||||||
|
Ok(textures)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 解析 model3.json 并返回完整路径集
|
||||||
|
pub struct ModelAssetPaths {
|
||||||
|
pub model3_json: PathBuf,
|
||||||
|
pub model3_dir: PathBuf,
|
||||||
|
pub moc3: PathBuf,
|
||||||
|
pub textures: Vec<PathBuf>,
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 从 model3.json 相对路径(如 "haru/Haru.model3.json")解析资源路径
|
||||||
|
pub fn resolve_asset_paths(
|
||||||
|
live2d_base_dir: &Path,
|
||||||
|
model3_json_rel: &str,
|
||||||
|
) -> Result<ModelAssetPaths> {
|
||||||
|
let model3_json = live2d_base_dir.join(model3_json_rel);
|
||||||
|
if !model3_json.exists() {
|
||||||
|
return Err(anyhow!(
|
||||||
|
"model3.json 不存在: {}",
|
||||||
|
model3_json.display()
|
||||||
|
));
|
||||||
|
}
|
||||||
|
let model3_dir = model3_json
|
||||||
|
.parent()
|
||||||
|
.ok_or_else(|| anyhow!("无法获取 model3.json 的父目录"))?
|
||||||
|
.to_path_buf();
|
||||||
|
|
||||||
|
let model3 = Model3Json::from_path(&model3_json)?;
|
||||||
|
let moc3 = model3_dir.join(&model3.file_references.moc);
|
||||||
|
let textures = model3
|
||||||
|
.file_references
|
||||||
|
.textures
|
||||||
|
.iter()
|
||||||
|
.map(|t| model3_dir.join(t))
|
||||||
|
.collect();
|
||||||
|
|
||||||
|
Ok(ModelAssetPaths {
|
||||||
|
model3_json,
|
||||||
|
model3_dir,
|
||||||
|
moc3,
|
||||||
|
textures,
|
||||||
|
})
|
||||||
|
}
|
||||||
273
src/plugins/live2d/core_ffi.rs
Normal file
273
src/plugins/live2d/core_ffi.rs
Normal file
@@ -0,0 +1,273 @@
|
|||||||
|
//! Cubism Core FFI 绑定
|
||||||
|
//!
|
||||||
|
//! 直接对应 `Live2DCubismCore.h` 的 C API。
|
||||||
|
//! 动态加载 libLive2DCubismCore.so(需 libm.so 预加载,因 Core 内部使用 powf)。
|
||||||
|
|
||||||
|
use libloading::Library;
|
||||||
|
use std::os::raw::{c_char, c_int, c_uchar, c_uint, c_void};
|
||||||
|
|
||||||
|
/// moc 对齐要求(字节)
|
||||||
|
pub const CSM_ALIGNOF_MOC: usize = 64;
|
||||||
|
/// model 对齐要求(字节)
|
||||||
|
pub const CSM_ALIGNOF_MODEL: usize = 16;
|
||||||
|
|
||||||
|
/// 可绘制常量标志位
|
||||||
|
pub mod constant_flags {
|
||||||
|
pub const BLEND_ADDITIVE: u8 = 1 << 0;
|
||||||
|
pub const BLEND_MULTIPLICATIVE: u8 = 1 << 1;
|
||||||
|
pub const IS_DOUBLE_SIDED: u8 = 1 << 2;
|
||||||
|
pub const IS_INVERTED_MASK: u8 = 1 << 3;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 可绘制动态标志位
|
||||||
|
pub mod dynamic_flags {
|
||||||
|
pub const IS_VISIBLE: u8 = 1 << 0;
|
||||||
|
pub const VISIBILITY_DID_CHANGE: u8 = 1 << 1;
|
||||||
|
pub const OPACITY_DID_CHANGE: u8 = 1 << 2;
|
||||||
|
pub const DRAW_ORDER_DID_CHANGE: u8 = 1 << 3;
|
||||||
|
pub const RENDER_ORDER_DID_CHANGE: u8 = 1 << 4;
|
||||||
|
pub const VERTEX_POSITIONS_DID_CHANGE: u8 = 1 << 5;
|
||||||
|
pub const BLEND_COLOR_DID_CHANGE: u8 = 1 << 6;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 混合模式
|
||||||
|
pub mod blend_mode {
|
||||||
|
use std::os::raw::c_int;
|
||||||
|
pub const NORMAL: c_int = 0;
|
||||||
|
pub const ADDITIVE: c_int = 1;
|
||||||
|
pub const MULTIPLICATIVE: c_int = 2;
|
||||||
|
}
|
||||||
|
|
||||||
|
#[repr(C)]
|
||||||
|
#[derive(Clone, Copy, Debug, Default)]
|
||||||
|
pub struct CsmVector2 {
|
||||||
|
pub x: f32,
|
||||||
|
pub y: f32,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[repr(C)]
|
||||||
|
#[derive(Clone, Copy, Debug, Default)]
|
||||||
|
pub struct CsmVector4 {
|
||||||
|
pub x: f32,
|
||||||
|
pub y: f32,
|
||||||
|
pub z: f32,
|
||||||
|
pub w: f32,
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Cubism Core 动态加载封装
|
||||||
|
pub struct CubismCore {
|
||||||
|
_libm: Library,
|
||||||
|
_lib: Library,
|
||||||
|
pub csm_get_version: unsafe extern "C" fn() -> c_uint,
|
||||||
|
pub csm_get_latest_moc_version: unsafe extern "C" fn() -> c_uint,
|
||||||
|
pub csm_get_moc_version:
|
||||||
|
unsafe extern "C" fn(address: *const c_void, size: c_uint) -> c_uint,
|
||||||
|
pub csm_has_moc_consistency:
|
||||||
|
unsafe extern "C" fn(address: *mut c_void, size: c_uint) -> c_int,
|
||||||
|
pub csm_revive_moc_in_place:
|
||||||
|
unsafe extern "C" fn(address: *mut c_void, size: c_uint) -> *mut c_void,
|
||||||
|
pub csm_get_sizeof_model: unsafe extern "C" fn(moc: *const c_void) -> c_uint,
|
||||||
|
pub csm_initialize_model_in_place: unsafe extern "C" fn(
|
||||||
|
moc: *const c_void,
|
||||||
|
address: *mut c_void,
|
||||||
|
size: c_uint,
|
||||||
|
) -> *mut c_void,
|
||||||
|
pub csm_update_model: unsafe extern "C" fn(model: *mut c_void),
|
||||||
|
pub csm_get_render_orders: unsafe extern "C" fn(model: *const c_void) -> *const c_int,
|
||||||
|
pub csm_read_canvas_info: unsafe extern "C" fn(
|
||||||
|
model: *const c_void,
|
||||||
|
out_size: *mut CsmVector2,
|
||||||
|
out_origin: *mut CsmVector2,
|
||||||
|
out_ppu: *mut f32,
|
||||||
|
),
|
||||||
|
pub csm_get_parameter_count: unsafe extern "C" fn(model: *const c_void) -> c_int,
|
||||||
|
pub csm_get_parameter_ids:
|
||||||
|
unsafe extern "C" fn(model: *const c_void) -> *const *const c_char,
|
||||||
|
pub csm_get_parameter_minimum_values:
|
||||||
|
unsafe extern "C" fn(model: *const c_void) -> *const f32,
|
||||||
|
pub csm_get_parameter_maximum_values:
|
||||||
|
unsafe extern "C" fn(model: *const c_void) -> *const f32,
|
||||||
|
pub csm_get_parameter_default_values:
|
||||||
|
unsafe extern "C" fn(model: *const c_void) -> *const f32,
|
||||||
|
pub csm_get_parameter_values: unsafe extern "C" fn(model: *mut c_void) -> *mut f32,
|
||||||
|
pub csm_get_part_count: unsafe extern "C" fn(model: *const c_void) -> c_int,
|
||||||
|
pub csm_get_part_ids:
|
||||||
|
unsafe extern "C" fn(model: *const c_void) -> *const *const c_char,
|
||||||
|
pub csm_get_part_opacities: unsafe extern "C" fn(model: *mut c_void) -> *mut f32,
|
||||||
|
pub csm_get_drawable_count: unsafe extern "C" fn(model: *const c_void) -> c_int,
|
||||||
|
pub csm_get_drawable_ids:
|
||||||
|
unsafe extern "C" fn(model: *const c_void) -> *const *const c_char,
|
||||||
|
pub csm_get_drawable_constant_flags:
|
||||||
|
unsafe extern "C" fn(model: *const c_void) -> *const c_uchar,
|
||||||
|
pub csm_get_drawable_dynamic_flags:
|
||||||
|
unsafe extern "C" fn(model: *const c_void) -> *const c_uchar,
|
||||||
|
pub csm_get_drawable_blend_modes:
|
||||||
|
unsafe extern "C" fn(model: *const c_void) -> *const c_int,
|
||||||
|
pub csm_get_drawable_texture_indices:
|
||||||
|
unsafe extern "C" fn(model: *const c_void) -> *const c_int,
|
||||||
|
pub csm_get_drawable_draw_orders:
|
||||||
|
unsafe extern "C" fn(model: *const c_void) -> *const c_int,
|
||||||
|
pub csm_get_drawable_opacities:
|
||||||
|
unsafe extern "C" fn(model: *const c_void) -> *const f32,
|
||||||
|
pub csm_get_drawable_mask_counts:
|
||||||
|
unsafe extern "C" fn(model: *const c_void) -> *const c_int,
|
||||||
|
pub csm_get_drawable_masks:
|
||||||
|
unsafe extern "C" fn(model: *const c_void) -> *const *const c_int,
|
||||||
|
pub csm_get_drawable_vertex_counts:
|
||||||
|
unsafe extern "C" fn(model: *const c_void) -> *const c_int,
|
||||||
|
pub csm_get_drawable_vertex_positions:
|
||||||
|
unsafe extern "C" fn(model: *const c_void) -> *const *const CsmVector2,
|
||||||
|
pub csm_get_drawable_vertex_uvs:
|
||||||
|
unsafe extern "C" fn(model: *const c_void) -> *const *const CsmVector2,
|
||||||
|
pub csm_get_drawable_index_counts:
|
||||||
|
unsafe extern "C" fn(model: *const c_void) -> *const c_int,
|
||||||
|
pub csm_get_drawable_indices:
|
||||||
|
unsafe extern "C" fn(model: *const c_void) -> *const *const u16,
|
||||||
|
pub csm_get_drawable_multiply_colors:
|
||||||
|
unsafe extern "C" fn(model: *const c_void) -> *const CsmVector4,
|
||||||
|
pub csm_get_drawable_screen_colors:
|
||||||
|
unsafe extern "C" fn(model: *const c_void) -> *const CsmVector4,
|
||||||
|
pub csm_reset_drawable_dynamic_flags: unsafe extern "C" fn(model: *mut c_void),
|
||||||
|
}
|
||||||
|
|
||||||
|
impl CubismCore {
|
||||||
|
/// 加载 Cubism Core 动态库
|
||||||
|
///
|
||||||
|
/// `so_path` 为 libLive2DCubismCore.so 的路径。
|
||||||
|
/// 内部会先 dlopen libm.so(Core 依赖 powf 但 NEEDED 未声明)。
|
||||||
|
pub fn load(so_path: &str) -> anyhow::Result<Self> {
|
||||||
|
// 预加载 libm,RTLD_GLOBAL 让后续 .so 能解析到 powf
|
||||||
|
let libm = unsafe {
|
||||||
|
Library::new("libm.so.6").or_else(|_| Library::new("libm.so.6.1"))?
|
||||||
|
};
|
||||||
|
|
||||||
|
let lib = unsafe { Library::new(so_path)? };
|
||||||
|
|
||||||
|
unsafe {
|
||||||
|
Ok(Self {
|
||||||
|
csm_get_version: *lib.get(b"csmGetVersion\0")?,
|
||||||
|
csm_get_latest_moc_version: *lib.get(b"csmGetLatestMocVersion\0")?,
|
||||||
|
csm_get_moc_version: *lib.get(b"csmGetMocVersion\0")?,
|
||||||
|
csm_has_moc_consistency: *lib.get(b"csmHasMocConsistency\0")?,
|
||||||
|
csm_revive_moc_in_place: *lib.get(b"csmReviveMocInPlace\0")?,
|
||||||
|
csm_get_sizeof_model: *lib.get(b"csmGetSizeofModel\0")?,
|
||||||
|
csm_initialize_model_in_place: *lib.get(b"csmInitializeModelInPlace\0")?,
|
||||||
|
csm_update_model: *lib.get(b"csmUpdateModel\0")?,
|
||||||
|
csm_get_render_orders: *lib.get(b"csmGetRenderOrders\0")?,
|
||||||
|
csm_read_canvas_info: *lib.get(b"csmReadCanvasInfo\0")?,
|
||||||
|
csm_get_parameter_count: *lib.get(b"csmGetParameterCount\0")?,
|
||||||
|
csm_get_parameter_ids: *lib.get(b"csmGetParameterIds\0")?,
|
||||||
|
csm_get_parameter_minimum_values: *lib
|
||||||
|
.get(b"csmGetParameterMinimumValues\0")?,
|
||||||
|
csm_get_parameter_maximum_values: *lib
|
||||||
|
.get(b"csmGetParameterMaximumValues\0")?,
|
||||||
|
csm_get_parameter_default_values: *lib
|
||||||
|
.get(b"csmGetParameterDefaultValues\0")?,
|
||||||
|
csm_get_parameter_values: *lib.get(b"csmGetParameterValues\0")?,
|
||||||
|
csm_get_part_count: *lib.get(b"csmGetPartCount\0")?,
|
||||||
|
csm_get_part_ids: *lib.get(b"csmGetPartIds\0")?,
|
||||||
|
csm_get_part_opacities: *lib.get(b"csmGetPartOpacities\0")?,
|
||||||
|
csm_get_drawable_count: *lib.get(b"csmGetDrawableCount\0")?,
|
||||||
|
csm_get_drawable_ids: *lib.get(b"csmGetDrawableIds\0")?,
|
||||||
|
csm_get_drawable_constant_flags: *lib
|
||||||
|
.get(b"csmGetDrawableConstantFlags\0")?,
|
||||||
|
csm_get_drawable_dynamic_flags: *lib
|
||||||
|
.get(b"csmGetDrawableDynamicFlags\0")?,
|
||||||
|
csm_get_drawable_blend_modes: *lib.get(b"csmGetDrawableBlendModes\0")?,
|
||||||
|
csm_get_drawable_texture_indices: *lib
|
||||||
|
.get(b"csmGetDrawableTextureIndices\0")?,
|
||||||
|
csm_get_drawable_draw_orders: *lib.get(b"csmGetDrawableDrawOrders\0")?,
|
||||||
|
csm_get_drawable_opacities: *lib.get(b"csmGetDrawableOpacities\0")?,
|
||||||
|
csm_get_drawable_mask_counts: *lib.get(b"csmGetDrawableMaskCounts\0")?,
|
||||||
|
csm_get_drawable_masks: *lib.get(b"csmGetDrawableMasks\0")?,
|
||||||
|
csm_get_drawable_vertex_counts: *lib
|
||||||
|
.get(b"csmGetDrawableVertexCounts\0")?,
|
||||||
|
csm_get_drawable_vertex_positions: *lib
|
||||||
|
.get(b"csmGetDrawableVertexPositions\0")?,
|
||||||
|
csm_get_drawable_vertex_uvs: *lib.get(b"csmGetDrawableVertexUvs\0")?,
|
||||||
|
csm_get_drawable_index_counts: *lib.get(b"csmGetDrawableIndexCounts\0")?,
|
||||||
|
csm_get_drawable_indices: *lib.get(b"csmGetDrawableIndices\0")?,
|
||||||
|
csm_get_drawable_multiply_colors: *lib
|
||||||
|
.get(b"csmGetDrawableMultiplyColors\0")?,
|
||||||
|
csm_get_drawable_screen_colors: *lib
|
||||||
|
.get(b"csmGetDrawableScreenColors\0")?,
|
||||||
|
csm_reset_drawable_dynamic_flags: *lib
|
||||||
|
.get(b"csmResetDrawableDynamicFlags\0")?,
|
||||||
|
_libm: libm,
|
||||||
|
_lib: lib,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 查询 Core 版本(返回原始 u32,格式 0xMMmmpppp)
|
||||||
|
pub fn version(&self) -> u32 {
|
||||||
|
unsafe { (self.csm_get_version)() }
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 格式化版本号为 "major.minor.patch"
|
||||||
|
pub fn version_string(&self) -> String {
|
||||||
|
let v = self.version();
|
||||||
|
format!(
|
||||||
|
"{}.{}.{}",
|
||||||
|
(v >> 24) & 0xFF,
|
||||||
|
(v >> 16) & 0xFF,
|
||||||
|
v & 0xFFFF
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 分配对齐内存(返回对齐指针和底层分配,底层分配需保持存活)
|
||||||
|
pub fn alloc_aligned(size: usize, align: usize) -> anyhow::Result<AlignedBuffer> {
|
||||||
|
let layout = std::alloc::Layout::from_size_align(size, align)?;
|
||||||
|
let ptr = unsafe { std::alloc::alloc(layout) };
|
||||||
|
if ptr.is_null() {
|
||||||
|
anyhow::bail!("aligned alloc failed for size={size} align={align}");
|
||||||
|
}
|
||||||
|
Ok(AlignedBuffer { ptr, layout })
|
||||||
|
}
|
||||||
|
|
||||||
|
pub struct AlignedBuffer {
|
||||||
|
ptr: *mut u8,
|
||||||
|
layout: std::alloc::Layout,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl AlignedBuffer {
|
||||||
|
pub fn as_ptr(&self) -> *mut u8 {
|
||||||
|
self.ptr
|
||||||
|
}
|
||||||
|
pub fn as_mut_void(&mut self) -> *mut c_void {
|
||||||
|
self.ptr as *mut c_void
|
||||||
|
}
|
||||||
|
pub fn as_void(&self) -> *const c_void {
|
||||||
|
self.ptr as *const c_void
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Drop for AlignedBuffer {
|
||||||
|
fn drop(&mut self) {
|
||||||
|
unsafe { std::alloc::dealloc(self.ptr, self.layout) }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
unsafe impl Send for AlignedBuffer {}
|
||||||
|
unsafe impl Sync for AlignedBuffer {}
|
||||||
|
|
||||||
|
/// 将 C 字符串指针转换为 Rust String(空指针返回 None)
|
||||||
|
pub unsafe fn cstr_ptr_to_string(ptr: *const c_char) -> Option<String> {
|
||||||
|
if ptr.is_null() {
|
||||||
|
return None;
|
||||||
|
}
|
||||||
|
let raw = std::slice::from_raw_parts(ptr as *const u8, libc_strlen(ptr));
|
||||||
|
Some(String::from_utf8_lossy(raw).into_owned())
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 简易 strlen(避免依赖 libc crate)
|
||||||
|
unsafe fn libc_strlen(ptr: *const c_char) -> usize {
|
||||||
|
let mut p = ptr as *const u8;
|
||||||
|
let mut n = 0;
|
||||||
|
while *p != 0 {
|
||||||
|
p = p.add(1);
|
||||||
|
n += 1;
|
||||||
|
}
|
||||||
|
n
|
||||||
|
}
|
||||||
1083
src/plugins/live2d/gl.rs
Normal file
1083
src/plugins/live2d/gl.rs
Normal file
File diff suppressed because it is too large
Load Diff
22
src/plugins/live2d/mod.rs
Normal file
22
src/plugins/live2d/mod.rs
Normal file
@@ -0,0 +1,22 @@
|
|||||||
|
//! Live2D 原生渲染插件(Rust + Cubism Core FFI + OpenGL ES 2.0)
|
||||||
|
//!
|
||||||
|
//! 架构:
|
||||||
|
//! - `core_ffi`:FFI 绑定 Cubism Core C API(libLive2DCubismCore.so)
|
||||||
|
//! - `model`:moc3 加载、model 管理、参数/drawable 数据提取
|
||||||
|
//! - `assets`:model3.json 解析、PNG 纹理加载
|
||||||
|
//! - `gl`:EGL 上下文 + OpenGL ES 2.0 着色器/渲染
|
||||||
|
//! - `animation`:参数动画(眨眼、嘴部、待机呼吸)
|
||||||
|
//! - `pose`:Pose PartOpacity 切换(避免互斥手臂/服装同时显示)
|
||||||
|
//! - `renderer`:整合渲染循环
|
||||||
|
|
||||||
|
pub mod animation;
|
||||||
|
pub mod assets;
|
||||||
|
pub mod core_ffi;
|
||||||
|
pub mod gl;
|
||||||
|
pub mod model;
|
||||||
|
pub mod pose;
|
||||||
|
pub mod renderer;
|
||||||
|
pub mod text;
|
||||||
|
|
||||||
|
mod plugin;
|
||||||
|
pub use plugin::Live2DPlugin;
|
||||||
394
src/plugins/live2d/model.rs
Normal file
394
src/plugins/live2d/model.rs
Normal file
@@ -0,0 +1,394 @@
|
|||||||
|
//! Cubism Model 加载与管理
|
||||||
|
//!
|
||||||
|
//! 封装 moc3 读取 → revive → model 初始化 → 参数更新 → drawable 数据提取。
|
||||||
|
|
||||||
|
use super::core_ffi::{
|
||||||
|
alloc_aligned, AlignedBuffer, CubismCore, CsmVector2, CSM_ALIGNOF_MOC, CSM_ALIGNOF_MODEL,
|
||||||
|
};
|
||||||
|
use anyhow::{anyhow, Context, Result};
|
||||||
|
use std::path::Path;
|
||||||
|
|
||||||
|
/// 一个 drawable 的渲染所需数据快照
|
||||||
|
#[derive(Clone)]
|
||||||
|
pub struct DrawableSnapshot {
|
||||||
|
/// 在 Core drawable 数组中的原始索引(用于查 mask 引用)
|
||||||
|
pub index: usize,
|
||||||
|
pub texture_index: i32,
|
||||||
|
pub draw_order: i32,
|
||||||
|
pub render_order: i32,
|
||||||
|
pub opacity: f32,
|
||||||
|
pub blend_mode: i32,
|
||||||
|
pub constant_flags: u8,
|
||||||
|
pub dynamic_flags: u8,
|
||||||
|
pub vertex_positions: Vec<[f32; 2]>,
|
||||||
|
pub vertex_uvs: Vec<[f32; 2]>,
|
||||||
|
pub indices: Vec<u16>,
|
||||||
|
pub multiply_color: [f32; 4],
|
||||||
|
pub screen_color: [f32; 4],
|
||||||
|
/// 本 drawable 依赖的 mask drawable 索引(空表示无遮罩)
|
||||||
|
pub mask_indices: Vec<i32>,
|
||||||
|
pub mask_counts: i32,
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Canvas 信息
|
||||||
|
#[derive(Clone, Copy, Debug, Default)]
|
||||||
|
pub struct CanvasInfo {
|
||||||
|
pub size: [f32; 2],
|
||||||
|
pub origin: [f32; 2],
|
||||||
|
pub pixels_per_unit: f32,
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 参数信息
|
||||||
|
pub struct ParameterInfo {
|
||||||
|
pub id: String,
|
||||||
|
pub min_value: f32,
|
||||||
|
pub max_value: f32,
|
||||||
|
pub default_value: f32,
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 活跃的 Cubism Model
|
||||||
|
pub struct CubismModel {
|
||||||
|
/// Core 句柄(保持引用防止 .so 卸载)
|
||||||
|
_core: std::sync::Arc<CubismCore>,
|
||||||
|
/// moc3 原始数据(对齐 64)
|
||||||
|
_moc_buf: AlignedBuffer,
|
||||||
|
/// moc 指针
|
||||||
|
moc: *mut std::ffi::c_void,
|
||||||
|
/// model 内存(对齐 16)
|
||||||
|
_model_buf: AlignedBuffer,
|
||||||
|
/// model 指针
|
||||||
|
model: *mut std::ffi::c_void,
|
||||||
|
/// 参数数量
|
||||||
|
pub param_count: usize,
|
||||||
|
/// 参数 ID 列表(与 Core 内部顺序一致)
|
||||||
|
pub param_ids: Vec<String>,
|
||||||
|
/// 参数索引映射(id → index)
|
||||||
|
pub param_index: std::collections::HashMap<String, usize>,
|
||||||
|
/// Part 数量
|
||||||
|
pub part_count: usize,
|
||||||
|
/// Part ID 列表(与 Core 内部顺序一致)
|
||||||
|
pub part_ids: Vec<String>,
|
||||||
|
/// Part 索引映射(id → index)
|
||||||
|
pub part_index: std::collections::HashMap<String, usize>,
|
||||||
|
/// drawable 数量
|
||||||
|
pub drawable_count: usize,
|
||||||
|
/// canvas 信息
|
||||||
|
pub canvas: CanvasInfo,
|
||||||
|
}
|
||||||
|
|
||||||
|
// model 指针可跨线程发送(渲染线程独占使用)
|
||||||
|
unsafe impl Send for CubismModel {}
|
||||||
|
|
||||||
|
impl CubismModel {
|
||||||
|
/// 从 moc3 文件加载 model
|
||||||
|
pub fn load(core: std::sync::Arc<CubismCore>, moc3_path: &Path) -> Result<Self> {
|
||||||
|
let moc_data = std::fs::read(moc3_path)
|
||||||
|
.with_context(|| format!("读取 moc3 失败: {}", moc3_path.display()))?;
|
||||||
|
|
||||||
|
// 分配 64 对齐内存
|
||||||
|
let mut moc_buf = alloc_aligned(moc_data.len(), CSM_ALIGNOF_MOC)?;
|
||||||
|
unsafe {
|
||||||
|
std::ptr::copy_nonoverlapping(moc_data.as_ptr(), moc_buf.as_ptr(), moc_data.len());
|
||||||
|
}
|
||||||
|
|
||||||
|
// 检查一致性
|
||||||
|
let valid = unsafe {
|
||||||
|
(core.csm_has_moc_consistency)(moc_buf.as_mut_void(), moc_data.len() as u32)
|
||||||
|
};
|
||||||
|
if valid != 1 {
|
||||||
|
return Err(anyhow!("moc3 一致性检查失败(文件损坏或版本不支持)"));
|
||||||
|
}
|
||||||
|
|
||||||
|
// Revive moc
|
||||||
|
let moc = unsafe {
|
||||||
|
(core.csm_revive_moc_in_place)(moc_buf.as_mut_void(), moc_data.len() as u32)
|
||||||
|
};
|
||||||
|
if moc.is_null() {
|
||||||
|
return Err(anyhow!("csmReviveMocInPlace 返回空指针"));
|
||||||
|
}
|
||||||
|
|
||||||
|
// 获取 model 所需大小
|
||||||
|
let model_size = unsafe { (core.csm_get_sizeof_model)(moc) };
|
||||||
|
if model_size == 0 {
|
||||||
|
return Err(anyhow!("csmGetSizeofModel 返回 0"));
|
||||||
|
}
|
||||||
|
|
||||||
|
// 分配 16 对齐内存
|
||||||
|
let mut model_buf = alloc_aligned(model_size as usize, CSM_ALIGNOF_MODEL)?;
|
||||||
|
let model = unsafe {
|
||||||
|
(core.csm_initialize_model_in_place)(
|
||||||
|
moc,
|
||||||
|
model_buf.as_mut_void(),
|
||||||
|
model_size,
|
||||||
|
)
|
||||||
|
};
|
||||||
|
if model.is_null() {
|
||||||
|
return Err(anyhow!("csmInitializeModelInPlace 返回空指针"));
|
||||||
|
}
|
||||||
|
|
||||||
|
// 读取参数信息
|
||||||
|
let param_count = unsafe { (core.csm_get_parameter_count)(model) } as usize;
|
||||||
|
let param_ids_ptr = unsafe { (core.csm_get_parameter_ids)(model) };
|
||||||
|
let mut param_ids = Vec::with_capacity(param_count);
|
||||||
|
let mut param_index = std::collections::HashMap::new();
|
||||||
|
for i in 0..param_count {
|
||||||
|
let id = unsafe {
|
||||||
|
super::core_ffi::cstr_ptr_to_string(*param_ids_ptr.add(i))
|
||||||
|
.unwrap_or_default()
|
||||||
|
};
|
||||||
|
param_index.insert(id.clone(), i);
|
||||||
|
param_ids.push(id);
|
||||||
|
}
|
||||||
|
|
||||||
|
// 读取 part 信息(Pose 会按 PartOpacity 切换互斥部件,如 Haru 的两组手臂)
|
||||||
|
let part_count = unsafe { (core.csm_get_part_count)(model) } as usize;
|
||||||
|
let part_ids_ptr = unsafe { (core.csm_get_part_ids)(model) };
|
||||||
|
let mut part_ids = Vec::with_capacity(part_count);
|
||||||
|
let mut part_index = std::collections::HashMap::new();
|
||||||
|
for i in 0..part_count {
|
||||||
|
let id = unsafe {
|
||||||
|
super::core_ffi::cstr_ptr_to_string(*part_ids_ptr.add(i))
|
||||||
|
.unwrap_or_default()
|
||||||
|
};
|
||||||
|
part_index.insert(id.clone(), i);
|
||||||
|
part_ids.push(id);
|
||||||
|
}
|
||||||
|
|
||||||
|
// 读取 drawable 数量
|
||||||
|
let drawable_count = unsafe { (core.csm_get_drawable_count)(model) } as usize;
|
||||||
|
|
||||||
|
// 读取 canvas 信息
|
||||||
|
let mut size = CsmVector2::default();
|
||||||
|
let mut origin = CsmVector2::default();
|
||||||
|
let mut ppu = 0.0f32;
|
||||||
|
unsafe {
|
||||||
|
(core.csm_read_canvas_info)(model, &mut size, &mut origin, &mut ppu);
|
||||||
|
}
|
||||||
|
|
||||||
|
let canvas = CanvasInfo {
|
||||||
|
size: [size.x, size.y],
|
||||||
|
origin: [origin.x, origin.y],
|
||||||
|
pixels_per_unit: ppu,
|
||||||
|
};
|
||||||
|
|
||||||
|
println!(
|
||||||
|
"[Live2D] 模型加载成功: 参数={} part={} drawable={} canvas={:?} origin=({:.1},{:.1})x{:.0}ppu",
|
||||||
|
param_count, part_count, drawable_count, canvas.size, canvas.origin[0], canvas.origin[1], canvas.pixels_per_unit
|
||||||
|
);
|
||||||
|
|
||||||
|
Ok(Self {
|
||||||
|
_core: core,
|
||||||
|
_moc_buf: moc_buf,
|
||||||
|
moc,
|
||||||
|
_model_buf: model_buf,
|
||||||
|
model,
|
||||||
|
param_count,
|
||||||
|
param_ids,
|
||||||
|
param_index,
|
||||||
|
part_count,
|
||||||
|
part_ids,
|
||||||
|
part_index,
|
||||||
|
drawable_count,
|
||||||
|
canvas,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 获取参数最小值
|
||||||
|
pub fn param_min_values(&self, core: &CubismCore) -> Vec<f32> {
|
||||||
|
unsafe {
|
||||||
|
let p = (core.csm_get_parameter_minimum_values)(self.model);
|
||||||
|
std::slice::from_raw_parts(p, self.param_count).to_vec()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 获取参数最大值
|
||||||
|
pub fn param_max_values(&self, core: &CubismCore) -> Vec<f32> {
|
||||||
|
unsafe {
|
||||||
|
let p = (core.csm_get_parameter_maximum_values)(self.model);
|
||||||
|
std::slice::from_raw_parts(p, self.param_count).to_vec()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 获取参数默认值
|
||||||
|
pub fn param_default_values(&self, core: &CubismCore) -> Vec<f32> {
|
||||||
|
unsafe {
|
||||||
|
let p = (core.csm_get_parameter_default_values)(self.model);
|
||||||
|
std::slice::from_raw_parts(p, self.param_count).to_vec()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 获取参数值缓冲区(可读写)
|
||||||
|
pub fn param_values_mut(&self, core: &CubismCore) -> &mut [f32] {
|
||||||
|
unsafe {
|
||||||
|
let p = (core.csm_get_parameter_values)(self.model);
|
||||||
|
std::slice::from_raw_parts_mut(p, self.param_count)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 按参数 ID 设置值
|
||||||
|
pub fn set_param(&self, core: &CubismCore, id: &str, value: f32) -> bool {
|
||||||
|
if let Some(&idx) = self.param_index.get(id) {
|
||||||
|
self.set_param_by_index(core, idx, value);
|
||||||
|
true
|
||||||
|
} else {
|
||||||
|
false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 按参数索引设置值
|
||||||
|
pub fn set_param_by_index(&self, core: &CubismCore, index: usize, value: f32) {
|
||||||
|
if index < self.param_count {
|
||||||
|
let slice = self.param_values_mut(core);
|
||||||
|
slice[index] = value;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 按参数 ID 获取值
|
||||||
|
pub fn get_param(&self, core: &CubismCore, id: &str) -> Option<f32> {
|
||||||
|
let idx = *self.param_index.get(id)?;
|
||||||
|
self.get_param_by_index(core, idx)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 按参数索引获取值
|
||||||
|
pub fn get_param_by_index(&self, core: &CubismCore, index: usize) -> Option<f32> {
|
||||||
|
if index >= self.param_count {
|
||||||
|
return None;
|
||||||
|
}
|
||||||
|
let slice = self.param_values_mut(core);
|
||||||
|
Some(slice[index])
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 将所有参数重置为默认值
|
||||||
|
pub fn reset_to_default(&self, core: &CubismCore) {
|
||||||
|
let defaults = self.param_default_values(core);
|
||||||
|
let slice = self.param_values_mut(core);
|
||||||
|
for (i, v) in defaults.into_iter().enumerate() {
|
||||||
|
slice[i] = v;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 获取 PartOpacity 缓冲区(可读写)
|
||||||
|
pub fn part_opacities_mut(&self, core: &CubismCore) -> &mut [f32] {
|
||||||
|
unsafe {
|
||||||
|
let p = (core.csm_get_part_opacities)(self.model);
|
||||||
|
std::slice::from_raw_parts_mut(p, self.part_count)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 按 Part ID 获取索引
|
||||||
|
pub fn part_index(&self, id: &str) -> Option<usize> {
|
||||||
|
self.part_index.get(id).copied()
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 按 Part 索引设置 opacity
|
||||||
|
pub fn set_part_opacity_by_index(&self, core: &CubismCore, index: usize, opacity: f32) {
|
||||||
|
if index < self.part_count {
|
||||||
|
let slice = self.part_opacities_mut(core);
|
||||||
|
slice[index] = opacity.clamp(0.0, 1.0);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 按 Part 索引获取 opacity
|
||||||
|
pub fn get_part_opacity_by_index(&self, core: &CubismCore, index: usize) -> Option<f32> {
|
||||||
|
if index >= self.part_count {
|
||||||
|
return None;
|
||||||
|
}
|
||||||
|
let slice = self.part_opacities_mut(core);
|
||||||
|
Some(slice[index])
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 更新 model(应用参数变化,重新计算顶点/不透明度等)
|
||||||
|
pub fn update(&self, core: &CubismCore) {
|
||||||
|
unsafe { (core.csm_update_model)(self.model) };
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 重置动态标志
|
||||||
|
pub fn reset_dynamic_flags(&self, core: &CubismCore) {
|
||||||
|
unsafe { (core.csm_reset_drawable_dynamic_flags)(self.model) };
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 获取所有 drawable 的渲染数据快照(按 render order 排序)
|
||||||
|
pub fn drawable_snapshots(&self, core: &CubismCore) -> Vec<DrawableSnapshot> {
|
||||||
|
let count = self.drawable_count;
|
||||||
|
unsafe {
|
||||||
|
let render_orders = (core.csm_get_render_orders)(self.model);
|
||||||
|
let texture_indices = (core.csm_get_drawable_texture_indices)(self.model);
|
||||||
|
let draw_orders = (core.csm_get_drawable_draw_orders)(self.model);
|
||||||
|
let opacities = (core.csm_get_drawable_opacities)(self.model);
|
||||||
|
let blend_modes = (core.csm_get_drawable_blend_modes)(self.model);
|
||||||
|
let const_flags = (core.csm_get_drawable_constant_flags)(self.model);
|
||||||
|
let dyn_flags = (core.csm_get_drawable_dynamic_flags)(self.model);
|
||||||
|
let mask_counts = (core.csm_get_drawable_mask_counts)(self.model);
|
||||||
|
let vertex_counts = (core.csm_get_drawable_vertex_counts)(self.model);
|
||||||
|
let vertex_positions = (core.csm_get_drawable_vertex_positions)(self.model);
|
||||||
|
let vertex_uvs = (core.csm_get_drawable_vertex_uvs)(self.model);
|
||||||
|
let index_counts = (core.csm_get_drawable_index_counts)(self.model);
|
||||||
|
let indices = (core.csm_get_drawable_indices)(self.model);
|
||||||
|
let multiply_colors = (core.csm_get_drawable_multiply_colors)(self.model);
|
||||||
|
let screen_colors = (core.csm_get_drawable_screen_colors)(self.model);
|
||||||
|
let masks = (core.csm_get_drawable_masks)(self.model);
|
||||||
|
|
||||||
|
// 先收集每个 drawable 的原始索引
|
||||||
|
let mut items: Vec<(usize, i32)> = (0..count)
|
||||||
|
.map(|i| (i, *render_orders.add(i)))
|
||||||
|
.collect();
|
||||||
|
// 按 render_order 升序排列
|
||||||
|
items.sort_by_key(|&(_, ro)| ro);
|
||||||
|
|
||||||
|
items
|
||||||
|
.into_iter()
|
||||||
|
.map(|(i, ro)| {
|
||||||
|
let vc = *vertex_counts.add(i) as usize;
|
||||||
|
let ic = *index_counts.add(i) as usize;
|
||||||
|
let vp = *vertex_positions.add(i);
|
||||||
|
let vu = *vertex_uvs.add(i);
|
||||||
|
let idx = *indices.add(i);
|
||||||
|
|
||||||
|
let mut verts = Vec::with_capacity(vc);
|
||||||
|
let mut uvs = Vec::with_capacity(vc);
|
||||||
|
for v in 0..vc {
|
||||||
|
let p = *vp.add(v);
|
||||||
|
let u = *vu.add(v);
|
||||||
|
verts.push([p.x, p.y]);
|
||||||
|
uvs.push([u.x, u.y]);
|
||||||
|
}
|
||||||
|
let mut idx_vec = Vec::with_capacity(ic);
|
||||||
|
for k in 0..ic {
|
||||||
|
idx_vec.push(*idx.add(k));
|
||||||
|
}
|
||||||
|
|
||||||
|
let mc = *multiply_colors.add(i);
|
||||||
|
let sc = *screen_colors.add(i);
|
||||||
|
|
||||||
|
// 取出本 drawable 的 mask 索引列表
|
||||||
|
let mk = *mask_counts.add(i) as usize;
|
||||||
|
let mut mask_indices: Vec<i32> = Vec::with_capacity(mk);
|
||||||
|
if mk > 0 {
|
||||||
|
let mptr = *masks.add(i);
|
||||||
|
for k in 0..mk {
|
||||||
|
mask_indices.push(*mptr.add(k));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
DrawableSnapshot {
|
||||||
|
index: i,
|
||||||
|
texture_index: *texture_indices.add(i),
|
||||||
|
draw_order: *draw_orders.add(i),
|
||||||
|
render_order: ro,
|
||||||
|
opacity: *opacities.add(i),
|
||||||
|
blend_mode: *blend_modes.add(i),
|
||||||
|
constant_flags: *const_flags.add(i),
|
||||||
|
dynamic_flags: *dyn_flags.add(i),
|
||||||
|
vertex_positions: verts,
|
||||||
|
vertex_uvs: uvs,
|
||||||
|
indices: idx_vec,
|
||||||
|
multiply_color: [mc.x, mc.y, mc.z, mc.w],
|
||||||
|
screen_color: [sc.x, sc.y, sc.z, sc.w],
|
||||||
|
mask_indices,
|
||||||
|
mask_counts: mk as i32,
|
||||||
|
}
|
||||||
|
})
|
||||||
|
.collect()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
264
src/plugins/live2d/plugin.rs
Normal file
264
src/plugins/live2d/plugin.rs
Normal file
@@ -0,0 +1,264 @@
|
|||||||
|
//! Live2DPlugin — Live2D 原生渲染插件
|
||||||
|
//!
|
||||||
|
//! 接管 Live2D 模式下的设备端渲染,替代 Firefox kiosk 方案。
|
||||||
|
//! 监听 ConfigReloaded 消息,当 render_type=Live2d 时启动原生渲染循环。
|
||||||
|
|
||||||
|
use crate::core::config::RenderType;
|
||||||
|
use crate::core::message::{Destination, Envelope, Message};
|
||||||
|
use crate::core::plugin::{Platform, Plugin, PluginContext, PluginInfo};
|
||||||
|
use anyhow::{Context, Result};
|
||||||
|
use std::path::PathBuf;
|
||||||
|
use std::sync::atomic::{AtomicBool, Ordering};
|
||||||
|
use std::sync::{Arc, Mutex};
|
||||||
|
use std::thread::JoinHandle;
|
||||||
|
use std::time::{Duration, Instant};
|
||||||
|
|
||||||
|
use super::renderer::{Live2DRenderer, Subtitle, SubtitleState};
|
||||||
|
|
||||||
|
pub struct Live2DPlugin {
|
||||||
|
ctx: Option<PluginContext>,
|
||||||
|
/// 渲染器句柄(运行在独立线程)
|
||||||
|
renderer: Option<Arc<std::sync::Mutex<Live2DRenderer>>>,
|
||||||
|
worker: Option<JoinHandle<()>>,
|
||||||
|
/// 渲染停止信号
|
||||||
|
stop_flag: Arc<AtomicBool>,
|
||||||
|
/// 字幕共享状态(http 插件写入,渲染线程读取)
|
||||||
|
subtitle: SubtitleState,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Live2DPlugin {
|
||||||
|
pub fn new() -> Self {
|
||||||
|
Self {
|
||||||
|
ctx: None,
|
||||||
|
renderer: None,
|
||||||
|
worker: None,
|
||||||
|
stop_flag: Arc::new(AtomicBool::new(false)),
|
||||||
|
subtitle: Arc::new(Mutex::new(None)),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Default for Live2DPlugin {
|
||||||
|
fn default() -> Self {
|
||||||
|
Self::new()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Plugin for Live2DPlugin {
|
||||||
|
fn id(&self) -> &str {
|
||||||
|
"live2d"
|
||||||
|
}
|
||||||
|
|
||||||
|
fn info(&self) -> PluginInfo {
|
||||||
|
PluginInfo {
|
||||||
|
name: "Live2D Renderer".to_string(),
|
||||||
|
version: "0.1.0".to_string(),
|
||||||
|
description: "Live2D 原生渲染(Cubism Core FFI + OpenGL ES 2.0)".to_string(),
|
||||||
|
platform: Platform::Linux,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn dependencies(&self) -> Vec<String> {
|
||||||
|
vec![]
|
||||||
|
}
|
||||||
|
|
||||||
|
fn init(&mut self, ctx: PluginContext) -> Result<()> {
|
||||||
|
self.ctx = Some(ctx);
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
fn start(&mut self) -> Result<()> {
|
||||||
|
let ctx = self
|
||||||
|
.ctx
|
||||||
|
.as_ref()
|
||||||
|
.context("live2d plugin context is not initialized")?;
|
||||||
|
|
||||||
|
ctx.tx.send(Envelope {
|
||||||
|
from: self.id().to_string(),
|
||||||
|
to: Destination::Manager,
|
||||||
|
message: Message::PluginReady(self.id().to_string()),
|
||||||
|
})?;
|
||||||
|
|
||||||
|
// 如果初始配置就是 Live2D 模式,立即启动渲染
|
||||||
|
let config = (*ctx.config).clone();
|
||||||
|
if config.character.render_type == RenderType::Live2d {
|
||||||
|
println!("[Live2DPlugin] 检测到初始配置为 Live2D 模式,启动渲染");
|
||||||
|
self.start_live2d(&config)?;
|
||||||
|
}
|
||||||
|
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
fn handle_message(&mut self, msg: Message) -> Result<()> {
|
||||||
|
match msg {
|
||||||
|
Message::ConfigReloaded(config) => {
|
||||||
|
if config.character.render_type == RenderType::Live2d {
|
||||||
|
self.start_live2d(&config)?;
|
||||||
|
} else {
|
||||||
|
self.stop_live2d();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Message::Shutdown => {
|
||||||
|
self.stop_live2d();
|
||||||
|
}
|
||||||
|
Message::Subtitle { text } => {
|
||||||
|
// 设备端字幕:写入共享状态,渲染线程每帧读取,超时自动消失
|
||||||
|
let ttl = Duration::from_millis(
|
||||||
|
(text.chars().count().max(1) as u64)
|
||||||
|
.saturating_mul(220)
|
||||||
|
.saturating_add(2500),
|
||||||
|
);
|
||||||
|
*self.subtitle.lock().unwrap() =
|
||||||
|
Some(Subtitle { text, expires_at: Instant::now() + ttl });
|
||||||
|
}
|
||||||
|
_ => {}
|
||||||
|
}
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
fn stop(&mut self) -> Result<()> {
|
||||||
|
self.stop_live2d();
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Live2DPlugin {
|
||||||
|
fn start_live2d(&mut self, config: &crate::core::config::AppConfig) -> Result<()> {
|
||||||
|
// 先停止旧的渲染
|
||||||
|
self.stop_live2d();
|
||||||
|
|
||||||
|
let model_rel = config
|
||||||
|
.character
|
||||||
|
.live2d_model
|
||||||
|
.clone()
|
||||||
|
.context("未配置 live2d_model")?;
|
||||||
|
|
||||||
|
// Core .so 路径(相对项目根目录或绝对路径)
|
||||||
|
let core_so = find_core_so()?;
|
||||||
|
|
||||||
|
// live2d 资源根目录
|
||||||
|
let live2d_base = find_live2d_base(config)?;
|
||||||
|
|
||||||
|
let width = config.display.render_width as i32;
|
||||||
|
let height = config.display.render_height as i32;
|
||||||
|
|
||||||
|
let stop_flag = Arc::clone(&self.stop_flag);
|
||||||
|
stop_flag.store(false, Ordering::SeqCst);
|
||||||
|
|
||||||
|
let tx = self
|
||||||
|
.ctx
|
||||||
|
.as_ref()
|
||||||
|
.context("no ctx")?
|
||||||
|
.tx
|
||||||
|
.clone();
|
||||||
|
|
||||||
|
let renderer = Arc::new(std::sync::Mutex::new(
|
||||||
|
Live2DRenderer::new(
|
||||||
|
&core_so,
|
||||||
|
&live2d_base,
|
||||||
|
&model_rel,
|
||||||
|
width,
|
||||||
|
height,
|
||||||
|
Arc::clone(&self.subtitle),
|
||||||
|
)?,
|
||||||
|
));
|
||||||
|
self.renderer = Some(Arc::clone(&renderer));
|
||||||
|
|
||||||
|
// 渲染器初始化(含 texture 上传)已完成,释放主线程的 EGL 上下文绑定
|
||||||
|
// 让渲染子线程能重新绑定(同一个 EGL context 不能同时在两个线程 current)
|
||||||
|
{
|
||||||
|
let r = renderer.lock().unwrap();
|
||||||
|
r.gl_ctx.release_current();
|
||||||
|
}
|
||||||
|
|
||||||
|
let handle = std::thread::spawn(move || {
|
||||||
|
// EGL 上下文是线程绑定的,需在渲染线程重新绑定
|
||||||
|
{
|
||||||
|
let r = renderer.lock().unwrap();
|
||||||
|
if let Err(e) = r.gl_ctx.make_current() {
|
||||||
|
eprintln!("[Live2DPlugin] eglMakeCurrent 失败: {e}");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// 渲染循环
|
||||||
|
loop {
|
||||||
|
if stop_flag.load(Ordering::SeqCst) {
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
// 检查 talking 状态(从 HTTP 插件共享的状态读取,这里通过轮询 config 实现)
|
||||||
|
// 简化:直接渲染
|
||||||
|
let render_result = {
|
||||||
|
let mut r = renderer.lock().unwrap();
|
||||||
|
r.render_frame()
|
||||||
|
};
|
||||||
|
if let Err(e) = render_result {
|
||||||
|
eprintln!("[Live2DPlugin] 渲染失败: {e}");
|
||||||
|
let _ = tx.send(Envelope {
|
||||||
|
from: "live2d".to_string(),
|
||||||
|
to: Destination::Manager,
|
||||||
|
message: Message::StateChanged {
|
||||||
|
old_state: "live2d_running".into(),
|
||||||
|
new_state: "live2d_error".into(),
|
||||||
|
},
|
||||||
|
});
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
std::thread::sleep(std::time::Duration::from_millis(16));
|
||||||
|
}
|
||||||
|
});
|
||||||
|
self.worker = Some(handle);
|
||||||
|
|
||||||
|
println!("[Live2DPlugin] Live2D 原生渲染已启动: {model_rel}");
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
fn stop_live2d(&mut self) {
|
||||||
|
self.stop_flag.store(true, Ordering::SeqCst);
|
||||||
|
if let Some(handle) = self.worker.take() {
|
||||||
|
let _ = handle.join();
|
||||||
|
}
|
||||||
|
self.renderer = None;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 查找 libLive2DCubismCore.so
|
||||||
|
fn find_core_so() -> Result<String> {
|
||||||
|
// 候选路径优先级:
|
||||||
|
// 1. 环境变量 SHOWEN_LIVE2D_CORE_SO
|
||||||
|
// 2. 项目根 extern/libLive2DCubismCore.so(运行时随二进制一起部署)
|
||||||
|
// 3. /usr/lib/libLive2DCubismCore.so
|
||||||
|
// 4. /home/showen/Showen/ShowenV2/extern/libLive2DCubismCore.so
|
||||||
|
if let Ok(p) = std::env::var("SHOWEN_LIVE2D_CORE_SO") {
|
||||||
|
if std::path::Path::new(&p).exists() {
|
||||||
|
return Ok(p);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
let candidates = [
|
||||||
|
"extern/libLive2DCubismCore.so",
|
||||||
|
"/usr/lib/libLive2DCubismCore.so",
|
||||||
|
"/usr/local/lib/libLive2DCubismCore.so",
|
||||||
|
"/home/showen/Showen/ShowenV2/extern/libLive2DCubismCore.so",
|
||||||
|
];
|
||||||
|
for c in &candidates {
|
||||||
|
if std::path::Path::new(c).exists() {
|
||||||
|
return Ok(c.to_string());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
anyhow::bail!("找不到 libLive2DCubismCore.so,请设置环境变量 SHOWEN_LIVE2D_CORE_SO 或部署到 extern/")
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 查找 live2d 资源根目录
|
||||||
|
fn find_live2d_base(config: &crate::core::config::AppConfig) -> Result<PathBuf> {
|
||||||
|
let candidates = [
|
||||||
|
PathBuf::from("configs/live2d"),
|
||||||
|
PathBuf::from("/home/showen/Showen/ShowenV2/configs/live2d"),
|
||||||
|
std::env::current_dir()?.join("configs/live2d"),
|
||||||
|
];
|
||||||
|
for c in &candidates {
|
||||||
|
if c.exists() {
|
||||||
|
return Ok(c.clone());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
anyhow::bail!("找不到 configs/live2d 目录")
|
||||||
|
}
|
||||||
233
src/plugins/live2d/pose.rs
Normal file
233
src/plugins/live2d/pose.rs
Normal file
@@ -0,0 +1,233 @@
|
|||||||
|
//! Pose 处理:根据 `.pose3.json` 管理互斥 Part 的显示状态。
|
||||||
|
//!
|
||||||
|
//! Haru 这类模型会把“手臂伸开”和“手臂抱胸”做成不同 Part。
|
||||||
|
//! 如果不执行 Pose,多个 Part 会同时可见,画面上就会出现四只手臂。
|
||||||
|
|
||||||
|
use super::core_ffi::CubismCore;
|
||||||
|
use super::model::CubismModel;
|
||||||
|
use anyhow::{Context, Result};
|
||||||
|
use serde::Deserialize;
|
||||||
|
use std::path::Path;
|
||||||
|
|
||||||
|
const DEFAULT_FADE_IN_SECONDS: f32 = 0.5;
|
||||||
|
const EPSILON: f32 = 0.001;
|
||||||
|
const PHI: f32 = 0.5;
|
||||||
|
const BACK_OPACITY_THRESHOLD: f32 = 0.15;
|
||||||
|
|
||||||
|
#[derive(Deserialize)]
|
||||||
|
struct PoseJson {
|
||||||
|
#[serde(rename = "FadeInTime")]
|
||||||
|
fade_in_time: Option<f32>,
|
||||||
|
#[serde(rename = "Groups", default)]
|
||||||
|
groups: Vec<Vec<PosePartJson>>,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Deserialize)]
|
||||||
|
struct PosePartJson {
|
||||||
|
#[serde(rename = "Id")]
|
||||||
|
id: String,
|
||||||
|
#[serde(rename = "Link", default)]
|
||||||
|
link: Vec<String>,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Clone, Debug)]
|
||||||
|
struct PosePart {
|
||||||
|
part_index: Option<usize>,
|
||||||
|
param_index: Option<usize>,
|
||||||
|
link_part_indices: Vec<usize>,
|
||||||
|
virtual_param_value: f32,
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Live2D Pose 状态。
|
||||||
|
pub struct PoseState {
|
||||||
|
fade_time_seconds: f32,
|
||||||
|
groups: Vec<Vec<PosePart>>,
|
||||||
|
initialized: bool,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl PoseState {
|
||||||
|
pub fn from_path(path: &Path, model: &CubismModel) -> Result<Self> {
|
||||||
|
let text = std::fs::read_to_string(path)
|
||||||
|
.with_context(|| format!("读取 pose3.json 失败: {}", path.display()))?;
|
||||||
|
let json: PoseJson = serde_json::from_str(&text)
|
||||||
|
.with_context(|| format!("解析 pose3.json 失败: {}", path.display()))?;
|
||||||
|
|
||||||
|
let fade_time_seconds = json
|
||||||
|
.fade_in_time
|
||||||
|
.filter(|v| *v >= 0.0)
|
||||||
|
.unwrap_or(DEFAULT_FADE_IN_SECONDS);
|
||||||
|
|
||||||
|
let groups: Vec<Vec<PosePart>> = json
|
||||||
|
.groups
|
||||||
|
.into_iter()
|
||||||
|
.map(|group| {
|
||||||
|
group
|
||||||
|
.into_iter()
|
||||||
|
.map(|part| PosePart {
|
||||||
|
param_index: model.param_index.get(&part.id).copied(),
|
||||||
|
part_index: model.part_index(&part.id),
|
||||||
|
link_part_indices: part
|
||||||
|
.link
|
||||||
|
.iter()
|
||||||
|
.filter_map(|id| model.part_index(id))
|
||||||
|
.collect(),
|
||||||
|
virtual_param_value: 0.0,
|
||||||
|
})
|
||||||
|
.collect()
|
||||||
|
})
|
||||||
|
.collect();
|
||||||
|
|
||||||
|
println!(
|
||||||
|
"[Live2D] Pose 加载: {} groups={} fade={:.3}s",
|
||||||
|
path.display(),
|
||||||
|
groups.len(),
|
||||||
|
fade_time_seconds
|
||||||
|
);
|
||||||
|
|
||||||
|
Ok(Self {
|
||||||
|
fade_time_seconds,
|
||||||
|
groups,
|
||||||
|
initialized: false,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 初始化 Pose:每个互斥组保留当前最可见的 Part,隐藏其余 Part。
|
||||||
|
pub fn reset(&mut self, core: &CubismCore, model: &CubismModel) {
|
||||||
|
for group in &mut self.groups {
|
||||||
|
let mut visible_index = 0;
|
||||||
|
let mut max_opacity = -1.0;
|
||||||
|
for (index, part) in group.iter().enumerate() {
|
||||||
|
let opacity = part
|
||||||
|
.part_index
|
||||||
|
.and_then(|idx| model.get_part_opacity_by_index(core, idx))
|
||||||
|
.unwrap_or(0.0);
|
||||||
|
if opacity >= max_opacity {
|
||||||
|
max_opacity = opacity;
|
||||||
|
visible_index = index;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
for (index, part) in group.iter_mut().enumerate() {
|
||||||
|
let opacity = if index == visible_index { 1.0 } else { 0.0 };
|
||||||
|
part.virtual_param_value = opacity;
|
||||||
|
if let Some(param_index) = part.param_index {
|
||||||
|
model.set_param_by_index(core, param_index, opacity);
|
||||||
|
}
|
||||||
|
if let Some(part_index) = part.part_index {
|
||||||
|
model.set_part_opacity_by_index(core, part_index, opacity);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
self.copy_part_opacities(core, model);
|
||||||
|
self.initialized = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 按官方 CubismPose 的互斥淡入规则更新 PartOpacity。
|
||||||
|
pub fn update_parameters(&mut self, core: &CubismCore, model: &CubismModel, dt: f32) {
|
||||||
|
if !self.initialized {
|
||||||
|
self.reset(core, model);
|
||||||
|
}
|
||||||
|
|
||||||
|
let dt = dt.max(0.0);
|
||||||
|
let fade_time_seconds = self.fade_time_seconds;
|
||||||
|
for group in &mut self.groups {
|
||||||
|
Self::do_fade(core, model, fade_time_seconds, dt, group);
|
||||||
|
}
|
||||||
|
self.copy_part_opacities(core, model);
|
||||||
|
}
|
||||||
|
|
||||||
|
fn do_fade(
|
||||||
|
core: &CubismCore,
|
||||||
|
model: &CubismModel,
|
||||||
|
fade_time_seconds: f32,
|
||||||
|
dt: f32,
|
||||||
|
group: &mut [PosePart],
|
||||||
|
) {
|
||||||
|
if group.is_empty() {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
let mut visible_part_index = None;
|
||||||
|
let mut new_opacity = 1.0;
|
||||||
|
|
||||||
|
for (index, part) in group.iter().enumerate() {
|
||||||
|
if part.pose_value(core, model) <= EPSILON {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
visible_part_index = Some(index);
|
||||||
|
if fade_time_seconds == 0.0 {
|
||||||
|
new_opacity = 1.0;
|
||||||
|
} else {
|
||||||
|
new_opacity = part
|
||||||
|
.part_index
|
||||||
|
.and_then(|idx| model.get_part_opacity_by_index(core, idx))
|
||||||
|
.unwrap_or(0.0);
|
||||||
|
new_opacity = (new_opacity + dt / fade_time_seconds).min(1.0);
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
let visible_part_index = visible_part_index.unwrap_or(0);
|
||||||
|
if visible_part_index == 0 && group[0].pose_value(core, model) <= EPSILON {
|
||||||
|
group[0].virtual_param_value = 1.0;
|
||||||
|
if let Some(param_index) = group[0].param_index {
|
||||||
|
model.set_param_by_index(core, param_index, 1.0);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
for (index, part) in group.iter().enumerate() {
|
||||||
|
let Some(part_index) = part.part_index else {
|
||||||
|
continue;
|
||||||
|
};
|
||||||
|
|
||||||
|
if index == visible_part_index {
|
||||||
|
model.set_part_opacity_by_index(core, part_index, new_opacity);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
let mut opacity = model
|
||||||
|
.get_part_opacity_by_index(core, part_index)
|
||||||
|
.unwrap_or(0.0);
|
||||||
|
let mut target_opacity = if new_opacity < PHI {
|
||||||
|
new_opacity * (PHI - 1.0) / PHI + 1.0
|
||||||
|
} else {
|
||||||
|
(1.0 - new_opacity) * PHI / (1.0 - PHI)
|
||||||
|
};
|
||||||
|
|
||||||
|
let back_opacity = (1.0 - target_opacity) * (1.0 - new_opacity);
|
||||||
|
if back_opacity > BACK_OPACITY_THRESHOLD {
|
||||||
|
target_opacity = 1.0 - BACK_OPACITY_THRESHOLD / (1.0 - new_opacity);
|
||||||
|
}
|
||||||
|
|
||||||
|
if opacity > target_opacity {
|
||||||
|
opacity = target_opacity;
|
||||||
|
}
|
||||||
|
model.set_part_opacity_by_index(core, part_index, opacity);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn copy_part_opacities(&self, core: &CubismCore, model: &CubismModel) {
|
||||||
|
for group in &self.groups {
|
||||||
|
for part in group {
|
||||||
|
let Some(part_index) = part.part_index else {
|
||||||
|
continue;
|
||||||
|
};
|
||||||
|
let Some(opacity) = model.get_part_opacity_by_index(core, part_index) else {
|
||||||
|
continue;
|
||||||
|
};
|
||||||
|
for &link_part_index in &part.link_part_indices {
|
||||||
|
model.set_part_opacity_by_index(core, link_part_index, opacity);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl PosePart {
|
||||||
|
fn pose_value(&self, core: &CubismCore, model: &CubismModel) -> f32 {
|
||||||
|
self.param_index
|
||||||
|
.and_then(|idx| model.get_param_by_index(core, idx))
|
||||||
|
.unwrap_or(self.virtual_param_value)
|
||||||
|
}
|
||||||
|
}
|
||||||
708
src/plugins/live2d/renderer.rs
Normal file
708
src/plugins/live2d/renderer.rs
Normal file
@@ -0,0 +1,708 @@
|
|||||||
|
//! Live2D Renderer: Core + Model + GL + Animation integration
|
||||||
|
|
||||||
|
use super::animation::AnimationState;
|
||||||
|
use super::assets::{self, Model3Json, TextureImage};
|
||||||
|
use super::core_ffi::{self, CubismCore};
|
||||||
|
use super::gl::{self as gl_api, RenderContext};
|
||||||
|
use gl_api::gl as gl_const;
|
||||||
|
use super::model::{CubismModel, DrawableSnapshot};
|
||||||
|
use super::pose::PoseState;
|
||||||
|
use super::text::TextRenderer;
|
||||||
|
use anyhow::Result;
|
||||||
|
use std::path::{Path, PathBuf};
|
||||||
|
use std::sync::Arc;
|
||||||
|
use std::sync::Mutex;
|
||||||
|
use std::sync::atomic::{AtomicU32, Ordering};
|
||||||
|
use std::time::{Duration, Instant};
|
||||||
|
|
||||||
|
/// 前几帧打印被遮罩 drawable 的 mask 引用关系,便于排查遮罩错误(如后臂整只伸开)。
|
||||||
|
static LIVE2D_MASK_DEBUG: AtomicU32 = AtomicU32::new(0);
|
||||||
|
|
||||||
|
/// 设备端字幕:AI 回复文字 + 自动消失时间。
|
||||||
|
pub struct Subtitle {
|
||||||
|
pub text: String,
|
||||||
|
pub expires_at: Instant,
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 字幕共享状态(http 插件写入,live2d 渲染线程读取)。
|
||||||
|
pub type SubtitleState = Arc<Mutex<Option<Subtitle>>>;
|
||||||
|
|
||||||
|
pub struct Live2DRenderer {
|
||||||
|
pub core: Arc<CubismCore>,
|
||||||
|
pub model: CubismModel,
|
||||||
|
pub model3: Model3Json,
|
||||||
|
pub textures: Vec<TextureImage>,
|
||||||
|
pub gl_ctx: RenderContext,
|
||||||
|
pub texture_ids: Vec<u32>,
|
||||||
|
pub animation: AnimationState,
|
||||||
|
pub pose: Option<PoseState>,
|
||||||
|
pub model_matrix: [f32; 16],
|
||||||
|
pub running: bool,
|
||||||
|
/// 字幕共享状态(由 live2d 插件从 http 插件接收并传入)
|
||||||
|
pub subtitle: SubtitleState,
|
||||||
|
/// 中文字幕渲染器(无可用字体时为 None)
|
||||||
|
pub text: Option<TextRenderer>,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Live2DRenderer {
|
||||||
|
pub fn new(
|
||||||
|
core_so_path: &str,
|
||||||
|
live2d_base_dir: &Path,
|
||||||
|
model3_json_rel: &str,
|
||||||
|
width: i32,
|
||||||
|
height: i32,
|
||||||
|
subtitle: SubtitleState,
|
||||||
|
) -> Result<Self> {
|
||||||
|
let core = Arc::new(CubismCore::load(core_so_path)?);
|
||||||
|
println!("[Live2D] Core version: {}", core.version_string());
|
||||||
|
|
||||||
|
let paths = assets::resolve_asset_paths(live2d_base_dir, model3_json_rel)?;
|
||||||
|
let model3 = Model3Json::from_path(&paths.model3_json)?;
|
||||||
|
println!(
|
||||||
|
"[Live2D] model3.json: ver={} moc={} textures={}",
|
||||||
|
model3.version,
|
||||||
|
model3.file_references.moc,
|
||||||
|
model3.file_references.textures.len()
|
||||||
|
);
|
||||||
|
|
||||||
|
let model = CubismModel::load(Arc::clone(&core), &paths.moc3)?;
|
||||||
|
let textures = assets::load_all_textures(&paths.model3_dir, &model3.file_references)?;
|
||||||
|
|
||||||
|
let gl_ctx = RenderContext::new_fullscreen(width, height)?;
|
||||||
|
|
||||||
|
let texture_ids: Vec<u32> = textures.iter().map(|t| gl_ctx.create_texture(t)).collect();
|
||||||
|
println!("[Live2D] Uploaded {} textures", texture_ids.len());
|
||||||
|
|
||||||
|
let canvas = model.canvas;
|
||||||
|
// 用真实窗口尺寸(已被 gl_ctx 修正为显示器实际分辨率)计算矩阵
|
||||||
|
let model_matrix = compute_model_matrix(canvas, gl_ctx.width, gl_ctx.height);
|
||||||
|
|
||||||
|
model.reset_to_default(&core);
|
||||||
|
let mut pose = if let Some(pose_rel) = model3.file_references.pose.as_deref() {
|
||||||
|
let pose_path = paths.model3_dir.join(pose_rel);
|
||||||
|
Some(PoseState::from_path(&pose_path, &model)?)
|
||||||
|
} else {
|
||||||
|
None
|
||||||
|
};
|
||||||
|
if let Some(pose) = pose.as_mut() {
|
||||||
|
pose.reset(&core, &model);
|
||||||
|
}
|
||||||
|
|
||||||
|
// 初始化中文字幕渲染器(找不到字体则降级为无字幕)
|
||||||
|
let text = match find_cjk_font() {
|
||||||
|
Some(p) => match TextRenderer::new(p.as_path(), 44) {
|
||||||
|
Ok(t) => Some(t),
|
||||||
|
Err(e) => {
|
||||||
|
eprintln!("[Live2D] 字幕渲染器初始化失败,字幕功能禁用: {e}");
|
||||||
|
None
|
||||||
|
}
|
||||||
|
},
|
||||||
|
None => {
|
||||||
|
eprintln!("[Live2D] 未找到中文字体,字幕功能禁用");
|
||||||
|
None
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
Ok(Self {
|
||||||
|
core,
|
||||||
|
model,
|
||||||
|
model3,
|
||||||
|
textures,
|
||||||
|
gl_ctx,
|
||||||
|
texture_ids,
|
||||||
|
animation: AnimationState::default(),
|
||||||
|
pose,
|
||||||
|
model_matrix,
|
||||||
|
running: false,
|
||||||
|
subtitle,
|
||||||
|
text,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn set_talking(&mut self, talking: bool) {
|
||||||
|
self.animation.set_talking(talking);
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn render_frame(&mut self) -> Result<()> {
|
||||||
|
let now = Instant::now();
|
||||||
|
let dt = 1.0 / 60.0;
|
||||||
|
|
||||||
|
self.animation.update(&self.core, &self.model, now, dt);
|
||||||
|
if let Some(pose) = self.pose.as_mut() {
|
||||||
|
pose.update_parameters(&self.core, &self.model, dt);
|
||||||
|
}
|
||||||
|
self.model.update(&self.core);
|
||||||
|
|
||||||
|
let snapshots = self.model.drawable_snapshots(&self.core);
|
||||||
|
|
||||||
|
// 前 1 帧打印全部 drawable 的概要 + 顶点包围盒,用于排查遮罩([Live2D][maskdbg])
|
||||||
|
let dbg = LIVE2D_MASK_DEBUG.fetch_add(1, Ordering::SeqCst);
|
||||||
|
if dbg < 1 {
|
||||||
|
eprintln!("[Live2D][maskdbg] total={}", snapshots.len());
|
||||||
|
for s in &snapshots {
|
||||||
|
let (mut minx, mut miny, mut maxx, mut maxy) =
|
||||||
|
(f32::MAX, f32::MAX, f32::MIN, f32::MIN);
|
||||||
|
for v in &s.vertex_positions {
|
||||||
|
minx = minx.min(v[0]);
|
||||||
|
miny = miny.min(v[1]);
|
||||||
|
maxx = maxx.max(v[0]);
|
||||||
|
maxy = maxy.max(v[1]);
|
||||||
|
}
|
||||||
|
let inv = (s.constant_flags & super::core_ffi::constant_flags::IS_INVERTED_MASK)
|
||||||
|
!= 0;
|
||||||
|
eprintln!(
|
||||||
|
"[Live2D][maskdbg] i={} ro={} op={:.2} fl={:#04x} masked={} masks={:?} inv={} bbox=({:.0},{:.0})-({:.0},{:.0}) tex={}",
|
||||||
|
s.index,
|
||||||
|
s.render_order,
|
||||||
|
s.opacity,
|
||||||
|
s.constant_flags,
|
||||||
|
!s.mask_indices.is_empty(),
|
||||||
|
s.mask_indices,
|
||||||
|
inv,
|
||||||
|
minx,
|
||||||
|
miny,
|
||||||
|
maxx,
|
||||||
|
maxy,
|
||||||
|
s.texture_index
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
unsafe {
|
||||||
|
let gl = &self.gl_ctx.gl;
|
||||||
|
// 每帧校正 viewport 为窗口实际尺寸,避免窗口被 WM 调整大小后
|
||||||
|
// 仍用旧的小尺寸(如 800x800)绘制,导致模型只出现在左下角。
|
||||||
|
(gl.gl_viewport)(0, 0, self.gl_ctx.width, self.gl_ctx.height);
|
||||||
|
(gl.gl_clear_color)(0.0, 0.0, 0.0, 1.0);
|
||||||
|
(gl.gl_clear)(gl_const::GL_COLOR_BUFFER_BIT);
|
||||||
|
// 先画渐变背景,再画模型(draw_background 内部会恢复 BLEND)
|
||||||
|
self.gl_ctx.draw_background(
|
||||||
|
[0.05, 0.09, 0.17], // 顶部:深蓝(全息风)
|
||||||
|
[0.01, 0.02, 0.04], // 底部:近黑
|
||||||
|
);
|
||||||
|
(gl.gl_enable)(gl_const::GL_BLEND);
|
||||||
|
(gl.gl_use_program)(self.gl_ctx.program);
|
||||||
|
(gl.gl_uniform_matrix4fv)(
|
||||||
|
self.gl_ctx.uniform_matrix,
|
||||||
|
1,
|
||||||
|
gl_const::GL_FALSE,
|
||||||
|
self.model_matrix.as_ptr(),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
// 建立 原始索引 -> 快照 的查找表,供被遮罩 drawable 引用其 mask
|
||||||
|
let snap_by_index: std::collections::HashMap<usize, &DrawableSnapshot> =
|
||||||
|
snapshots.iter().map(|s| (s.index, s)).collect();
|
||||||
|
|
||||||
|
for snap in &snapshots {
|
||||||
|
if snap.opacity <= 0.001 {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
if snap.mask_indices.is_empty() {
|
||||||
|
self.draw_drawable(snap);
|
||||||
|
} else {
|
||||||
|
self.draw_masked_drawable(snap, &snap_by_index);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// 设备端字幕 overlay(AI 回复文字)
|
||||||
|
self.draw_subtitle();
|
||||||
|
|
||||||
|
self.model.reset_dynamic_flags(&self.core);
|
||||||
|
|
||||||
|
unsafe {
|
||||||
|
(self.gl_ctx.gl.egl_swap_buffers)(self.gl_ctx.display, self.gl_ctx.surface);
|
||||||
|
}
|
||||||
|
|
||||||
|
// 每帧提升窗口到最顶层,防止桌面/其他窗口遮挡
|
||||||
|
self.gl_ctx.raise_window();
|
||||||
|
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
fn draw_drawable(&self, snap: &DrawableSnapshot) {
|
||||||
|
let gl = &self.gl_ctx.gl;
|
||||||
|
unsafe {
|
||||||
|
let tex_idx = snap.texture_index as usize;
|
||||||
|
if tex_idx < self.texture_ids.len() {
|
||||||
|
(gl.gl_active_texture)(gl_const::GL_TEXTURE0);
|
||||||
|
(gl.gl_bind_texture)(gl_const::GL_TEXTURE_2D, self.texture_ids[tex_idx]);
|
||||||
|
(gl.gl_uniform1i)(self.gl_ctx.uniform_texture, 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
(gl.gl_uniform4f)(self.gl_ctx.uniform_base_color, 1.0, 1.0, 1.0, snap.opacity);
|
||||||
|
let mc = snap.multiply_color;
|
||||||
|
(gl.gl_uniform4f)(self.gl_ctx.uniform_multiply_color, mc[0], mc[1], mc[2], mc[3]);
|
||||||
|
let sc = snap.screen_color;
|
||||||
|
(gl.gl_uniform4f)(self.gl_ctx.uniform_screen_color, sc[0], sc[1], sc[2], sc[3]);
|
||||||
|
|
||||||
|
match snap.blend_mode {
|
||||||
|
core_ffi::blend_mode::NORMAL => {
|
||||||
|
(gl.gl_blend_func)(gl_const::GL_SRC_ALPHA, gl_const::GL_ONE_MINUS_SRC_ALPHA);
|
||||||
|
}
|
||||||
|
core_ffi::blend_mode::ADDITIVE => {
|
||||||
|
(gl.gl_blend_func)(gl_const::GL_SRC_ALPHA, gl_const::GL_ONE);
|
||||||
|
}
|
||||||
|
core_ffi::blend_mode::MULTIPLICATIVE => {
|
||||||
|
(gl.gl_blend_func)(gl_const::GL_ZERO, gl_const::GL_SRC_COLOR);
|
||||||
|
}
|
||||||
|
_ => {
|
||||||
|
(gl.gl_blend_func)(gl_const::GL_SRC_ALPHA, gl_const::GL_ONE_MINUS_SRC_ALPHA);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
let vc = snap.vertex_positions.len();
|
||||||
|
let mut vertex_data: Vec<f32> = Vec::with_capacity(vc * 4);
|
||||||
|
for i in 0..vc {
|
||||||
|
vertex_data.push(snap.vertex_positions[i][0]);
|
||||||
|
vertex_data.push(snap.vertex_positions[i][1]);
|
||||||
|
vertex_data.push(snap.vertex_uvs[i][0]);
|
||||||
|
vertex_data.push(snap.vertex_uvs[i][1]);
|
||||||
|
}
|
||||||
|
|
||||||
|
let mut vbo = 0u32;
|
||||||
|
(gl.gl_gen_buffers)(1, &mut vbo);
|
||||||
|
(gl.gl_bind_buffer)(gl_const::GL_ARRAY_BUFFER, vbo);
|
||||||
|
(gl.gl_buffer_data)(
|
||||||
|
gl_const::GL_ARRAY_BUFFER,
|
||||||
|
(vertex_data.len() * 4) as isize,
|
||||||
|
vertex_data.as_ptr() as *const std::ffi::c_void,
|
||||||
|
gl_const::GL_STATIC_DRAW,
|
||||||
|
);
|
||||||
|
|
||||||
|
let mut ibo = 0u32;
|
||||||
|
(gl.gl_gen_buffers)(1, &mut ibo);
|
||||||
|
(gl.gl_bind_buffer)(gl_const::GL_ELEMENT_ARRAY_BUFFER, ibo);
|
||||||
|
(gl.gl_buffer_data)(
|
||||||
|
gl_const::GL_ELEMENT_ARRAY_BUFFER,
|
||||||
|
(snap.indices.len() * 2) as isize,
|
||||||
|
snap.indices.as_ptr() as *const std::ffi::c_void,
|
||||||
|
gl_const::GL_STATIC_DRAW,
|
||||||
|
);
|
||||||
|
|
||||||
|
let stride = 4 * 4;
|
||||||
|
if self.gl_ctx.attrib_position >= 0 {
|
||||||
|
(gl.gl_enable_vertex_attrib_array)(self.gl_ctx.attrib_position as u32);
|
||||||
|
(gl.gl_vertex_attrib_pointer)(
|
||||||
|
self.gl_ctx.attrib_position as u32,
|
||||||
|
2,
|
||||||
|
gl_const::GL_FLOAT,
|
||||||
|
gl_const::GL_FALSE,
|
||||||
|
stride,
|
||||||
|
std::ptr::null(),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
if self.gl_ctx.attrib_tex_coord >= 0 {
|
||||||
|
(gl.gl_enable_vertex_attrib_array)(self.gl_ctx.attrib_tex_coord as u32);
|
||||||
|
(gl.gl_vertex_attrib_pointer)(
|
||||||
|
self.gl_ctx.attrib_tex_coord as u32,
|
||||||
|
2,
|
||||||
|
gl_const::GL_FLOAT,
|
||||||
|
gl_const::GL_FALSE,
|
||||||
|
stride,
|
||||||
|
(2 * 4) as *const std::ffi::c_void,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
(gl.gl_draw_elements)(
|
||||||
|
gl_const::GL_TRIANGLES,
|
||||||
|
snap.indices.len() as i32,
|
||||||
|
gl_const::GL_UNSIGNED_SHORT,
|
||||||
|
std::ptr::null(),
|
||||||
|
);
|
||||||
|
|
||||||
|
(gl.gl_delete_buffers)(1, &vbo);
|
||||||
|
(gl.gl_delete_buffers)(1, &ibo);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 绘制一个被遮罩(masked)的 drawable:
|
||||||
|
/// 先用 mask 着色器把所有 mask drawable 写入 stencil 缓冲,再以 stencil 裁切
|
||||||
|
/// 实际 drawable,从而把后臂/头发等限制在 mask 形状内、不再整块溢出。
|
||||||
|
fn draw_masked_drawable(
|
||||||
|
&self,
|
||||||
|
snap: &DrawableSnapshot,
|
||||||
|
snap_by_index: &std::collections::HashMap<usize, &DrawableSnapshot>,
|
||||||
|
) {
|
||||||
|
let gl = &self.gl_ctx.gl;
|
||||||
|
unsafe {
|
||||||
|
// 1) 用 mask 程序把 mask drawable 形状写入 stencil(颜色关闭)
|
||||||
|
(gl.gl_enable)(gl_const::GL_STENCIL_TEST);
|
||||||
|
(gl.gl_stencil_mask)(0xFF);
|
||||||
|
(gl.gl_clear)(gl_const::GL_STENCIL_BUFFER_BIT);
|
||||||
|
(gl.gl_color_mask)(0, 0, 0, 0);
|
||||||
|
(gl.gl_stencil_func)(gl_const::GL_ALWAYS, 1, 0xFF);
|
||||||
|
(gl.gl_stencil_op)(gl_const::GL_KEEP, gl_const::GL_KEEP, gl_const::GL_INCR);
|
||||||
|
|
||||||
|
(gl.gl_use_program)(self.gl_ctx.mask_program);
|
||||||
|
(gl.gl_uniform_matrix4fv)(
|
||||||
|
self.gl_ctx.mask_uniform_matrix,
|
||||||
|
1,
|
||||||
|
gl_const::GL_FALSE,
|
||||||
|
self.model_matrix.as_ptr(),
|
||||||
|
);
|
||||||
|
for &mi in &snap.mask_indices {
|
||||||
|
if let Some(m) = snap_by_index.get(&(mi as usize)) {
|
||||||
|
self.draw_mask_drawable(m);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// 2) 用 stencil 裁切实际 drawable
|
||||||
|
(gl.gl_color_mask)(1, 1, 1, 1);
|
||||||
|
(gl.gl_stencil_op)(gl_const::GL_KEEP, gl_const::GL_KEEP, gl_const::GL_KEEP);
|
||||||
|
let inverted =
|
||||||
|
(snap.constant_flags & super::core_ffi::constant_flags::IS_INVERTED_MASK) != 0;
|
||||||
|
if inverted {
|
||||||
|
(gl.gl_stencil_func)(gl_const::GL_EQUAL, 0, 0xFF);
|
||||||
|
} else {
|
||||||
|
(gl.gl_stencil_func)(gl_const::GL_NOTEQUAL, 0, 0xFF);
|
||||||
|
}
|
||||||
|
|
||||||
|
(gl.gl_use_program)(self.gl_ctx.program);
|
||||||
|
self.draw_drawable(snap);
|
||||||
|
|
||||||
|
// 复位,避免影响后续无遮罩 drawable
|
||||||
|
(gl.gl_disable)(gl_const::GL_STENCIL_TEST);
|
||||||
|
(gl.gl_stencil_mask)(0xFF);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 用 mask 着色器把一个 drawable 画进 stencil(颜色关闭,仅 alpha 形状)。
|
||||||
|
fn draw_mask_drawable(&self, snap: &DrawableSnapshot) {
|
||||||
|
let gl = &self.gl_ctx.gl;
|
||||||
|
unsafe {
|
||||||
|
let tex_idx = snap.texture_index as usize;
|
||||||
|
if tex_idx < self.texture_ids.len() {
|
||||||
|
(gl.gl_active_texture)(gl_const::GL_TEXTURE0);
|
||||||
|
(gl.gl_bind_texture)(gl_const::GL_TEXTURE_2D, self.texture_ids[tex_idx]);
|
||||||
|
(gl.gl_uniform1i)(self.gl_ctx.mask_uniform_texture, 0);
|
||||||
|
}
|
||||||
|
(gl.gl_uniform4f)(
|
||||||
|
self.gl_ctx.mask_uniform_multiply_color,
|
||||||
|
snap.multiply_color[0],
|
||||||
|
snap.multiply_color[1],
|
||||||
|
snap.multiply_color[2],
|
||||||
|
snap.multiply_color[3],
|
||||||
|
);
|
||||||
|
(gl.gl_uniform4f)(
|
||||||
|
self.gl_ctx.mask_uniform_screen_color,
|
||||||
|
snap.screen_color[0],
|
||||||
|
snap.screen_color[1],
|
||||||
|
snap.screen_color[2],
|
||||||
|
snap.screen_color[3],
|
||||||
|
);
|
||||||
|
|
||||||
|
let vc = snap.vertex_positions.len();
|
||||||
|
let mut vertex_data: Vec<f32> = Vec::with_capacity(vc * 4);
|
||||||
|
for i in 0..vc {
|
||||||
|
vertex_data.push(snap.vertex_positions[i][0]);
|
||||||
|
vertex_data.push(snap.vertex_positions[i][1]);
|
||||||
|
vertex_data.push(snap.vertex_uvs[i][0]);
|
||||||
|
vertex_data.push(snap.vertex_uvs[i][1]);
|
||||||
|
}
|
||||||
|
|
||||||
|
let mut vbo = 0u32;
|
||||||
|
(gl.gl_gen_buffers)(1, &mut vbo);
|
||||||
|
(gl.gl_bind_buffer)(gl_const::GL_ARRAY_BUFFER, vbo);
|
||||||
|
(gl.gl_buffer_data)(
|
||||||
|
gl_const::GL_ARRAY_BUFFER,
|
||||||
|
(vertex_data.len() * 4) as isize,
|
||||||
|
vertex_data.as_ptr() as *const std::ffi::c_void,
|
||||||
|
gl_const::GL_STATIC_DRAW,
|
||||||
|
);
|
||||||
|
|
||||||
|
let mut ibo = 0u32;
|
||||||
|
(gl.gl_gen_buffers)(1, &mut ibo);
|
||||||
|
(gl.gl_bind_buffer)(gl_const::GL_ELEMENT_ARRAY_BUFFER, ibo);
|
||||||
|
(gl.gl_buffer_data)(
|
||||||
|
gl_const::GL_ELEMENT_ARRAY_BUFFER,
|
||||||
|
(snap.indices.len() * 2) as isize,
|
||||||
|
snap.indices.as_ptr() as *const std::ffi::c_void,
|
||||||
|
gl_const::GL_STATIC_DRAW,
|
||||||
|
);
|
||||||
|
|
||||||
|
let stride = 4 * 4;
|
||||||
|
if self.gl_ctx.mask_attrib_position >= 0 {
|
||||||
|
(gl.gl_enable_vertex_attrib_array)(self.gl_ctx.mask_attrib_position as u32);
|
||||||
|
(gl.gl_vertex_attrib_pointer)(
|
||||||
|
self.gl_ctx.mask_attrib_position as u32,
|
||||||
|
2,
|
||||||
|
gl_const::GL_FLOAT,
|
||||||
|
gl_const::GL_FALSE,
|
||||||
|
stride,
|
||||||
|
std::ptr::null(),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
if self.gl_ctx.mask_attrib_tex_coord >= 0 {
|
||||||
|
(gl.gl_enable_vertex_attrib_array)(self.gl_ctx.mask_attrib_tex_coord as u32);
|
||||||
|
(gl.gl_vertex_attrib_pointer)(
|
||||||
|
self.gl_ctx.mask_attrib_tex_coord as u32,
|
||||||
|
2,
|
||||||
|
gl_const::GL_FLOAT,
|
||||||
|
gl_const::GL_FALSE,
|
||||||
|
stride,
|
||||||
|
(2 * 4) as *const std::ffi::c_void,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
(gl.gl_draw_elements)(
|
||||||
|
gl_const::GL_TRIANGLES,
|
||||||
|
snap.indices.len() as i32,
|
||||||
|
gl_const::GL_UNSIGNED_SHORT,
|
||||||
|
std::ptr::null(),
|
||||||
|
);
|
||||||
|
|
||||||
|
(gl.gl_delete_buffers)(1, &vbo);
|
||||||
|
(gl.gl_delete_buffers)(1, &ibo);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 绘制设备端字幕:屏幕底部半透明背景框 + 白色中文(AI 回复文字)。
|
||||||
|
fn draw_subtitle(&mut self) {
|
||||||
|
let (text, expired) = {
|
||||||
|
let guard = self.subtitle.lock().unwrap();
|
||||||
|
match guard.as_ref() {
|
||||||
|
Some(s) => (s.text.clone(), s.expires_at <= Instant::now()),
|
||||||
|
None => return,
|
||||||
|
}
|
||||||
|
};
|
||||||
|
if expired || text.trim().is_empty() {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
let text_renderer = match self.text.as_mut() {
|
||||||
|
Some(t) => t,
|
||||||
|
None => return,
|
||||||
|
};
|
||||||
|
|
||||||
|
let gl = &self.gl_ctx.gl;
|
||||||
|
// 复制 text program 的 uniform/attrib 位置到局部,避免与 &mut text_renderer 借位冲突
|
||||||
|
let prog = self.gl_ctx.text_program;
|
||||||
|
let u_mat = self.gl_ctx.text_uniform_matrix;
|
||||||
|
let u_col = self.gl_ctx.text_uniform_color;
|
||||||
|
let u_tex = self.gl_ctx.text_uniform_texture;
|
||||||
|
let a_pos = self.gl_ctx.text_attrib_position;
|
||||||
|
let a_tco = self.gl_ctx.text_attrib_tex_coord;
|
||||||
|
|
||||||
|
unsafe {
|
||||||
|
(gl.gl_enable)(gl_const::GL_BLEND);
|
||||||
|
(gl.gl_blend_func)(gl_const::GL_SRC_ALPHA, gl_const::GL_ONE_MINUS_SRC_ALPHA);
|
||||||
|
(gl.gl_use_program)(prog);
|
||||||
|
let w = self.gl_ctx.width as f32;
|
||||||
|
let h = self.gl_ctx.height as f32;
|
||||||
|
// 像素坐标(原点左上,y 向下)-> 裁剪空间
|
||||||
|
let ortho: [f32; 16] = [
|
||||||
|
2.0 / w, 0.0, 0.0, 0.0,
|
||||||
|
0.0, -2.0 / h, 0.0, 0.0,
|
||||||
|
0.0, 0.0, 1.0, 0.0,
|
||||||
|
-1.0, 1.0, 0.0, 1.0,
|
||||||
|
];
|
||||||
|
(gl.gl_uniform_matrix4fv)(u_mat, 1, gl_const::GL_FALSE, ortho.as_ptr());
|
||||||
|
}
|
||||||
|
|
||||||
|
let font_px = text_renderer.font_size() as f32;
|
||||||
|
let line_height = (font_px * 1.35) as i32;
|
||||||
|
let margin = 40i32;
|
||||||
|
let max_width = self.gl_ctx.width - margin * 2;
|
||||||
|
let padding = 18i32;
|
||||||
|
|
||||||
|
// 按宽度换行(CJK 任意位置可断,遇 \n 强制断)
|
||||||
|
let mut lines: Vec<String> = Vec::new();
|
||||||
|
let mut cur = String::new();
|
||||||
|
let mut cur_w = 0i32;
|
||||||
|
for ch in text.chars() {
|
||||||
|
if ch == '\n' {
|
||||||
|
lines.push(std::mem::take(&mut cur));
|
||||||
|
cur_w = 0;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
let aw = text_renderer.measure_advance(ch);
|
||||||
|
if cur_w + aw > max_width && !cur.is_empty() {
|
||||||
|
lines.push(std::mem::take(&mut cur));
|
||||||
|
cur_w = 0;
|
||||||
|
}
|
||||||
|
cur.push(ch);
|
||||||
|
cur_w += aw;
|
||||||
|
}
|
||||||
|
if !cur.is_empty() {
|
||||||
|
lines.push(cur);
|
||||||
|
}
|
||||||
|
if lines.is_empty() {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
let total_text_h = lines.len() as i32 * line_height;
|
||||||
|
let box_h = total_text_h + padding * 2;
|
||||||
|
let box_y = self.gl_ctx.height - margin - box_h;
|
||||||
|
let box_x = margin;
|
||||||
|
let box_w = self.gl_ctx.width - margin * 2;
|
||||||
|
|
||||||
|
// 背景框
|
||||||
|
let white = text_renderer.white_texture(gl);
|
||||||
|
draw_text_quad(
|
||||||
|
gl, white, box_x as f32, box_y as f32, box_w as f32, box_h as f32, [0.0, 0.0, 0.0, 0.55],
|
||||||
|
u_tex, u_col, a_pos, a_tco,
|
||||||
|
);
|
||||||
|
|
||||||
|
// 逐行绘制文字(居中)
|
||||||
|
for (li, line) in lines.iter().enumerate() {
|
||||||
|
let line_w: i32 = line.chars().map(|c| text_renderer.measure_advance(c)).sum();
|
||||||
|
let start_x = ((self.gl_ctx.width - line_w) / 2) as f32;
|
||||||
|
let baseline_y =
|
||||||
|
(box_y + padding + li as i32 * line_height + (line_height as f32 * 0.78) as i32) as f32;
|
||||||
|
let mut pen_x = start_x;
|
||||||
|
for ch in line.chars() {
|
||||||
|
if let Some(g) = text_renderer.glyph(gl, ch) {
|
||||||
|
if g.tex != 0 && g.w > 0 && g.h > 0 {
|
||||||
|
let gx = pen_x + g.left as f32;
|
||||||
|
let gy = baseline_y - g.top as f32;
|
||||||
|
draw_text_quad(
|
||||||
|
gl, g.tex, gx, gy, g.w as f32, g.h as f32, [1.0, 1.0, 1.0, 1.0],
|
||||||
|
u_tex, u_col, a_pos, a_tco,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
pen_x += (g.advance >> 6) as f32;
|
||||||
|
} else {
|
||||||
|
pen_x += font_px * 0.5;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn run_loop(&mut self) -> Result<()> {
|
||||||
|
self.running = true;
|
||||||
|
let frame_duration = Duration::from_millis(16);
|
||||||
|
|
||||||
|
while self.running {
|
||||||
|
let start = Instant::now();
|
||||||
|
if let Err(e) = self.render_frame() {
|
||||||
|
eprintln!("[Live2D] render frame failed: {e}");
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
let elapsed = start.elapsed();
|
||||||
|
if elapsed < frame_duration {
|
||||||
|
std::thread::sleep(frame_duration - elapsed);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn stop(&mut self) {
|
||||||
|
self.running = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Compute model -> NDC transform matrix (column-major 4x4).
|
||||||
|
///
|
||||||
|
/// `csmGetDrawableVertexPositions` 返回的顶点位于**模型单位**坐标系,范围约为
|
||||||
|
/// ±(canvas_w/2 / ppu)。`pixels_per_unit`(ppu) 指明 1 模型单位 = ppu 个画布像素。
|
||||||
|
/// 因此顶点必须先乘 `ppu` 回到画布像素,再映射到 [-1,1] 裁剪空间。
|
||||||
|
///
|
||||||
|
/// 实测 Haru 的 `origin = (canvas_w/2, canvas_h/2)`,即模型坐标原点本身就位于
|
||||||
|
/// 画布中心,所以**无需再做原点平移**(平移反而会把模型推出屏幕)。Cubism 顶点
|
||||||
|
/// 以画布中心为原点、Y 轴向上,与裁剪空间一致,故无需平移或翻转。
|
||||||
|
///
|
||||||
|
/// 适配策略:**contain(整只角色恰好放入视口)**,单一均匀缩放即可。
|
||||||
|
/// NDC 立方体由视口自动拉伸到窗口,因此**绝对不能**对 x/y 轴分别乘不同系数,
|
||||||
|
/// 否则会破坏长宽比(手臂被拉变形)。这里只按画布较长边归一,使整只角色完整
|
||||||
|
/// 可见、不裁切、不拉伸;窗口为横屏时角色会填满高度、两侧留渐变背景。
|
||||||
|
fn compute_model_matrix(
|
||||||
|
canvas: super::model::CanvasInfo,
|
||||||
|
_width: i32,
|
||||||
|
_height: i32,
|
||||||
|
) -> [f32; 16] {
|
||||||
|
let cw = canvas.size[0].max(1.0);
|
||||||
|
let ch = canvas.size[1].max(1.0);
|
||||||
|
let ppu = canvas.pixels_per_unit.max(1.0);
|
||||||
|
|
||||||
|
// 均匀缩放:按画布较长边把整只角色映射到裁剪空间(margin=1.0 即恰好贴满,
|
||||||
|
// 若想留一点边距可改小,如 0.95)。
|
||||||
|
let margin = 1.0;
|
||||||
|
let u = 2.0 * ppu * margin / cw.max(ch);
|
||||||
|
|
||||||
|
[
|
||||||
|
u, 0.0, 0.0, 0.0,
|
||||||
|
0.0, u, 0.0, 0.0,
|
||||||
|
0.0, 0.0, 1.0, 0.0,
|
||||||
|
0.0, 0.0, 0.0, 1.0,
|
||||||
|
]
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 用 text program 画一个带纹理的四边形(TRIANGLE_STRIP)。
|
||||||
|
///
|
||||||
|
/// `color` 为 RGBA;着色器输出 = u_color.rgb 配合字形纹理的 alpha,因此背景框可传
|
||||||
|
/// 纯色 + alpha,字形可传白色 + alpha=1(字形纹理本身含 alpha 覆盖)。
|
||||||
|
fn draw_text_quad(
|
||||||
|
gl: &gl_api::Gl,
|
||||||
|
tex: gl_const::GLuint,
|
||||||
|
x: f32,
|
||||||
|
y: f32,
|
||||||
|
w: f32,
|
||||||
|
h: f32,
|
||||||
|
color: [f32; 4],
|
||||||
|
uniform_texture: gl_const::GLint,
|
||||||
|
uniform_color: gl_const::GLint,
|
||||||
|
attrib_position: gl_const::GLint,
|
||||||
|
attrib_tex_coord: gl_const::GLint,
|
||||||
|
) {
|
||||||
|
unsafe {
|
||||||
|
(gl.gl_active_texture)(gl_const::GL_TEXTURE0);
|
||||||
|
(gl.gl_bind_texture)(gl_const::GL_TEXTURE_2D, tex);
|
||||||
|
(gl.gl_uniform1i)(uniform_texture, 0);
|
||||||
|
(gl.gl_uniform4f)(uniform_color, color[0], color[1], color[2], color[3]);
|
||||||
|
let verts: [f32; 16] = [
|
||||||
|
x, y, 0.0, 0.0,
|
||||||
|
x + w, y, 1.0, 0.0,
|
||||||
|
x, y + h, 0.0, 1.0,
|
||||||
|
x + w, y + h, 1.0, 1.0,
|
||||||
|
];
|
||||||
|
let mut vbo = 0u32;
|
||||||
|
(gl.gl_gen_buffers)(1, &mut vbo);
|
||||||
|
(gl.gl_bind_buffer)(gl_const::GL_ARRAY_BUFFER, vbo);
|
||||||
|
(gl.gl_buffer_data)(
|
||||||
|
gl_const::GL_ARRAY_BUFFER,
|
||||||
|
(verts.len() * 4) as isize,
|
||||||
|
verts.as_ptr() as *const std::ffi::c_void,
|
||||||
|
gl_const::GL_STATIC_DRAW,
|
||||||
|
);
|
||||||
|
let stride = 4 * 4;
|
||||||
|
if attrib_position >= 0 {
|
||||||
|
(gl.gl_enable_vertex_attrib_array)(attrib_position as u32);
|
||||||
|
(gl.gl_vertex_attrib_pointer)(
|
||||||
|
attrib_position as u32,
|
||||||
|
2,
|
||||||
|
gl_const::GL_FLOAT,
|
||||||
|
gl_const::GL_FALSE,
|
||||||
|
stride,
|
||||||
|
std::ptr::null(),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
if attrib_tex_coord >= 0 {
|
||||||
|
(gl.gl_enable_vertex_attrib_array)(attrib_tex_coord as u32);
|
||||||
|
(gl.gl_vertex_attrib_pointer)(
|
||||||
|
attrib_tex_coord as u32,
|
||||||
|
2,
|
||||||
|
gl_const::GL_FLOAT,
|
||||||
|
gl_const::GL_FALSE,
|
||||||
|
stride,
|
||||||
|
(2 * 4) as *const std::ffi::c_void,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
(gl.gl_draw_arrays)(gl_const::GL_TRIANGLE_STRIP, 0, 4);
|
||||||
|
(gl.gl_delete_buffers)(1, &vbo);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 在设备中查找可用的中文字体(优先 Noto Sans/Serif CJK)。
|
||||||
|
fn find_cjk_font() -> Option<PathBuf> {
|
||||||
|
let candidates = [
|
||||||
|
"/usr/share/fonts/opentype/noto/NotoSansCJK-Regular.ttc",
|
||||||
|
"/usr/share/fonts/opentype/noto/NotoSerifCJK-Regular.ttc",
|
||||||
|
"/usr/share/fonts/opentype/noto/NotoSansCJK-Bold.ttc",
|
||||||
|
"/usr/share/fonts/truetype/noto/NotoSansCJK-Regular.ttc",
|
||||||
|
];
|
||||||
|
candidates
|
||||||
|
.iter()
|
||||||
|
.map(Path::new)
|
||||||
|
.find(|p| p.exists())
|
||||||
|
.map(|p| p.to_path_buf())
|
||||||
|
}
|
||||||
239
src/plugins/live2d/text.rs
Normal file
239
src/plugins/live2d/text.rs
Normal file
@@ -0,0 +1,239 @@
|
|||||||
|
//! 基于 FreeType 的中文文字光栅化 + OpenGL 纹理渲染(设备端 Live2D 字幕 overlay)。
|
||||||
|
//!
|
||||||
|
//! 设计:每个字符首次出现时用 FreeType 渲染为灰度位图(经 `render_glyph` 拿到位图),转成
|
||||||
|
//! 白色字形(alpha=灰度)的 RGBA 纹理并缓存;绘制时按 pen 位置贴纹理即可。纹理创建需要
|
||||||
|
//! `Gl` 函数指针(与渲染器共用同一 EGL 上下文)。
|
||||||
|
|
||||||
|
use super::gl::gl as gl_const;
|
||||||
|
use super::gl::Gl;
|
||||||
|
use freetype::face::LoadFlag;
|
||||||
|
use freetype::Face;
|
||||||
|
use freetype::Library;
|
||||||
|
use freetype::RenderMode;
|
||||||
|
use std::collections::HashMap;
|
||||||
|
use std::path::Path;
|
||||||
|
|
||||||
|
use anyhow::Result;
|
||||||
|
|
||||||
|
/// 单个字符的缓存字形
|
||||||
|
#[derive(Clone)]
|
||||||
|
pub struct CachedGlyph {
|
||||||
|
/// 字形纹理(0 表示该字符无可见像素,仅用于步进)
|
||||||
|
pub tex: gl_const::GLuint,
|
||||||
|
pub w: i32,
|
||||||
|
pub h: i32,
|
||||||
|
/// 字形位图相对 pen 原点的偏移
|
||||||
|
pub left: i32,
|
||||||
|
pub top: i32,
|
||||||
|
/// 26.6 定点像素步进(渲染端需 >> 6 转为像素)
|
||||||
|
pub advance: i32,
|
||||||
|
}
|
||||||
|
|
||||||
|
pub struct TextRenderer {
|
||||||
|
face: Face<'static>,
|
||||||
|
font_px: u32,
|
||||||
|
glyphs: HashMap<char, CachedGlyph>,
|
||||||
|
white_tex: Option<gl_const::GLuint>,
|
||||||
|
}
|
||||||
|
|
||||||
|
// FreeType 的 Face 包裹裸指针,仅在本插件单一渲染线程使用。
|
||||||
|
unsafe impl Send for TextRenderer {}
|
||||||
|
|
||||||
|
/// FT_LOAD_RENDER 标志位(0x4):加载字符的同时渲染为位图
|
||||||
|
const FT_LOAD_RENDER: i32 = 0x4;
|
||||||
|
|
||||||
|
impl TextRenderer {
|
||||||
|
pub fn new(font_path: &Path, font_px: u32) -> Result<Self> {
|
||||||
|
let library = Library::init()?;
|
||||||
|
// 让 Library 成为 'static(程序级单例),从而 Face<'static> 可长期持有而不会悬垂
|
||||||
|
let library: &'static Library = Box::leak(Box::new(library));
|
||||||
|
let face = library.new_face(font_path, 0)?;
|
||||||
|
let tr = Self {
|
||||||
|
face,
|
||||||
|
font_px,
|
||||||
|
glyphs: HashMap::new(),
|
||||||
|
white_tex: None,
|
||||||
|
};
|
||||||
|
tr.face.set_pixel_sizes(0, font_px)?;
|
||||||
|
println!("[Live2D] 字幕字体就绪: {:?} ({}px)", font_path, font_px);
|
||||||
|
Ok(tr)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 当前字号(像素)
|
||||||
|
pub fn font_size(&self) -> u32 {
|
||||||
|
self.font_px
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 1x1 白色纹理(用于纯色背景框,alpha 恒为 1)。
|
||||||
|
fn white_tex(&mut self, gl: &Gl) -> gl_const::GLuint {
|
||||||
|
if let Some(t) = self.white_tex {
|
||||||
|
return t;
|
||||||
|
}
|
||||||
|
let mut tex = 0u32;
|
||||||
|
unsafe {
|
||||||
|
(gl.gl_gen_textures)(1, &mut tex);
|
||||||
|
(gl.gl_bind_texture)(gl_const::GL_TEXTURE_2D, tex);
|
||||||
|
(gl.gl_tex_parameteri)(
|
||||||
|
gl_const::GL_TEXTURE_2D,
|
||||||
|
gl_const::GL_TEXTURE_MIN_FILTER,
|
||||||
|
gl_const::GL_LINEAR as i32,
|
||||||
|
);
|
||||||
|
(gl.gl_tex_parameteri)(
|
||||||
|
gl_const::GL_TEXTURE_2D,
|
||||||
|
gl_const::GL_TEXTURE_MAG_FILTER,
|
||||||
|
gl_const::GL_LINEAR as i32,
|
||||||
|
);
|
||||||
|
(gl.gl_tex_parameteri)(
|
||||||
|
gl_const::GL_TEXTURE_2D,
|
||||||
|
gl_const::GL_TEXTURE_WRAP_S,
|
||||||
|
gl_const::GL_CLAMP_TO_EDGE as i32,
|
||||||
|
);
|
||||||
|
(gl.gl_tex_parameteri)(
|
||||||
|
gl_const::GL_TEXTURE_2D,
|
||||||
|
gl_const::GL_TEXTURE_WRAP_T,
|
||||||
|
gl_const::GL_CLAMP_TO_EDGE as i32,
|
||||||
|
);
|
||||||
|
let px: [u8; 4] = [255, 255, 255, 255];
|
||||||
|
(gl.gl_tex_image_2d)(
|
||||||
|
gl_const::GL_TEXTURE_2D,
|
||||||
|
0,
|
||||||
|
gl_const::GL_RGBA as i32,
|
||||||
|
1,
|
||||||
|
1,
|
||||||
|
0,
|
||||||
|
gl_const::GL_RGBA,
|
||||||
|
gl_const::GL_UNSIGNED_BYTE,
|
||||||
|
px.as_ptr() as *const std::ffi::c_void,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
self.white_tex = Some(tex);
|
||||||
|
tex
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 取 1x1 白纹理(供外部画背景框)。
|
||||||
|
pub fn white_texture(&mut self, gl: &Gl) -> gl_const::GLuint {
|
||||||
|
self.white_tex(gl)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 估算字符像素宽度(用于换行布局,不创建纹理)。返回像素值。
|
||||||
|
pub fn measure_advance(&mut self, ch: char) -> i32 {
|
||||||
|
if self
|
||||||
|
.face
|
||||||
|
.load_char(ch as usize, LoadFlag::from_bits_truncate(FT_LOAD_RENDER))
|
||||||
|
.is_ok()
|
||||||
|
{
|
||||||
|
(self.face.glyph().advance().x >> 6) as i32
|
||||||
|
} else {
|
||||||
|
(self.font_px as f32 * 0.5) as i32
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn rasterize(&mut self, gl: &Gl, ch: char) -> Option<CachedGlyph> {
|
||||||
|
let half_advance_26_6 = (self.font_px as i32) << 5; // 半字宽,26.6 定点
|
||||||
|
if self
|
||||||
|
.face
|
||||||
|
.load_char(ch as usize, LoadFlag::from_bits_truncate(FT_LOAD_RENDER))
|
||||||
|
.is_err()
|
||||||
|
{
|
||||||
|
return Some(CachedGlyph {
|
||||||
|
tex: 0,
|
||||||
|
w: 0,
|
||||||
|
h: 0,
|
||||||
|
left: 0,
|
||||||
|
top: 0,
|
||||||
|
advance: half_advance_26_6,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
let glyph = self.face.glyph();
|
||||||
|
if glyph.render_glyph(RenderMode::Normal).is_err() {
|
||||||
|
let adv = glyph.advance().x as i32; // 26.6 定点
|
||||||
|
return Some(CachedGlyph {
|
||||||
|
tex: 0,
|
||||||
|
w: 0,
|
||||||
|
h: 0,
|
||||||
|
left: 0,
|
||||||
|
top: 0,
|
||||||
|
advance: adv,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
let bitmap = glyph.bitmap();
|
||||||
|
let w = bitmap.width();
|
||||||
|
let h = bitmap.rows();
|
||||||
|
let left = glyph.bitmap_left();
|
||||||
|
let top = glyph.bitmap_top();
|
||||||
|
let advance = glyph.advance().x as i32; // 26.6 定点
|
||||||
|
if w == 0 || h == 0 {
|
||||||
|
return Some(CachedGlyph {
|
||||||
|
tex: 0,
|
||||||
|
w: 0,
|
||||||
|
h: 0,
|
||||||
|
left,
|
||||||
|
top,
|
||||||
|
advance,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
// 灰度 -> RGBA:白色字形,alpha=灰度
|
||||||
|
let buf = bitmap.buffer();
|
||||||
|
let mut rgba: Vec<u8> = Vec::with_capacity((w * h * 4) as usize);
|
||||||
|
for &g in buf {
|
||||||
|
rgba.push(255);
|
||||||
|
rgba.push(255);
|
||||||
|
rgba.push(255);
|
||||||
|
rgba.push(g);
|
||||||
|
}
|
||||||
|
let mut tex = 0u32;
|
||||||
|
unsafe {
|
||||||
|
(gl.gl_gen_textures)(1, &mut tex);
|
||||||
|
(gl.gl_bind_texture)(gl_const::GL_TEXTURE_2D, tex);
|
||||||
|
(gl.gl_tex_parameteri)(
|
||||||
|
gl_const::GL_TEXTURE_2D,
|
||||||
|
gl_const::GL_TEXTURE_MIN_FILTER,
|
||||||
|
gl_const::GL_LINEAR as i32,
|
||||||
|
);
|
||||||
|
(gl.gl_tex_parameteri)(
|
||||||
|
gl_const::GL_TEXTURE_2D,
|
||||||
|
gl_const::GL_TEXTURE_MAG_FILTER,
|
||||||
|
gl_const::GL_LINEAR as i32,
|
||||||
|
);
|
||||||
|
(gl.gl_tex_parameteri)(
|
||||||
|
gl_const::GL_TEXTURE_2D,
|
||||||
|
gl_const::GL_TEXTURE_WRAP_S,
|
||||||
|
gl_const::GL_CLAMP_TO_EDGE as i32,
|
||||||
|
);
|
||||||
|
(gl.gl_tex_parameteri)(
|
||||||
|
gl_const::GL_TEXTURE_2D,
|
||||||
|
gl_const::GL_TEXTURE_WRAP_T,
|
||||||
|
gl_const::GL_CLAMP_TO_EDGE as i32,
|
||||||
|
);
|
||||||
|
(gl.gl_tex_image_2d)(
|
||||||
|
gl_const::GL_TEXTURE_2D,
|
||||||
|
0,
|
||||||
|
gl_const::GL_RGBA as i32,
|
||||||
|
w,
|
||||||
|
h,
|
||||||
|
0,
|
||||||
|
gl_const::GL_RGBA,
|
||||||
|
gl_const::GL_UNSIGNED_BYTE,
|
||||||
|
rgba.as_ptr() as *const std::ffi::c_void,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
Some(CachedGlyph {
|
||||||
|
tex,
|
||||||
|
w,
|
||||||
|
h,
|
||||||
|
left,
|
||||||
|
top,
|
||||||
|
advance,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 获取(必要时光栅化并缓存)字符字形。
|
||||||
|
pub fn glyph(&mut self, gl: &Gl, ch: char) -> Option<CachedGlyph> {
|
||||||
|
if !self.glyphs.contains_key(&ch) {
|
||||||
|
if let Some(g) = self.rasterize(gl, ch) {
|
||||||
|
self.glyphs.insert(ch, g);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
self.glyphs.get(&ch).cloned()
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -2,6 +2,7 @@ pub mod ai;
|
|||||||
pub mod ble;
|
pub mod ble;
|
||||||
pub mod device;
|
pub mod device;
|
||||||
pub mod http;
|
pub mod http;
|
||||||
|
pub mod live2d;
|
||||||
pub mod screen;
|
pub mod screen;
|
||||||
pub mod video;
|
pub mod video;
|
||||||
pub mod wifi;
|
pub mod wifi;
|
||||||
|
|||||||
@@ -118,6 +118,17 @@ impl Plugin for VideoPlugin {
|
|||||||
.as_ref()
|
.as_ref()
|
||||||
.context("video plugin context is not initialized")?;
|
.context("video plugin context is not initialized")?;
|
||||||
|
|
||||||
|
// 如果是 Live2D 模式,不启动视频播放
|
||||||
|
if ctx.config.character.render_type == crate::core::config::RenderType::Live2d {
|
||||||
|
println!("[VideoPlugin] Live2D 模式,跳过视频播放启动");
|
||||||
|
ctx.tx.send(Envelope {
|
||||||
|
from: self.id().to_string(),
|
||||||
|
to: Destination::Manager,
|
||||||
|
message: Message::PluginReady(self.id().to_string()),
|
||||||
|
})?;
|
||||||
|
return Ok(());
|
||||||
|
}
|
||||||
|
|
||||||
let processor = Arc::new(Mutex::new(VideoProcessor::new((*ctx.config).clone())?));
|
let processor = Arc::new(Mutex::new(VideoProcessor::new((*ctx.config).clone())?));
|
||||||
let worker_processor = Arc::clone(&processor);
|
let worker_processor = Arc::clone(&processor);
|
||||||
let tx = ctx.tx.clone();
|
let tx = ctx.tx.clone();
|
||||||
@@ -195,6 +206,33 @@ impl Plugin for VideoPlugin {
|
|||||||
self.publish_status();
|
self.publish_status();
|
||||||
}
|
}
|
||||||
Message::ConfigReloaded(config) => {
|
Message::ConfigReloaded(config) => {
|
||||||
|
// Live2D 模式:停止视频播放,由 Live2DPlugin 接管原生渲染
|
||||||
|
if config.character.render_type == crate::core::config::RenderType::Live2d {
|
||||||
|
// 停止视频播放
|
||||||
|
if let Some(old) = self.processor.take() {
|
||||||
|
if let Ok(mut old) = old.lock() {
|
||||||
|
let _ = old.stop();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if let Some(handle) = self.worker.take() {
|
||||||
|
let _ = handle.join();
|
||||||
|
}
|
||||||
|
// 杀掉残留的 Firefox(如旧方案遗留)
|
||||||
|
let _ = std::process::Command::new("/bin/bash")
|
||||||
|
.arg("-c")
|
||||||
|
.arg("kill -9 $(pgrep firefox-esr) 2>/dev/null")
|
||||||
|
.output();
|
||||||
|
println!("[VideoPlugin] Live2D 模式:视频已停止,由 Live2DPlugin 接管渲染");
|
||||||
|
self.publish_status();
|
||||||
|
return Ok(());
|
||||||
|
}
|
||||||
|
|
||||||
|
// 切回视频模式:杀掉残留 Firefox
|
||||||
|
let _ = std::process::Command::new("/bin/bash")
|
||||||
|
.arg("-c")
|
||||||
|
.arg("kill -9 $(pgrep firefox-esr) 2>/dev/null")
|
||||||
|
.output();
|
||||||
|
|
||||||
let processor = Arc::new(Mutex::new(VideoProcessor::new(config)?));
|
let processor = Arc::new(Mutex::new(VideoProcessor::new(config)?));
|
||||||
if let Some(old) = self.processor.replace(Arc::clone(&processor)) {
|
if let Some(old) = self.processor.replace(Arc::clone(&processor)) {
|
||||||
if let Ok(mut old) = old.lock() {
|
if let Ok(mut old) = old.lock() {
|
||||||
@@ -240,6 +278,12 @@ impl Plugin for VideoPlugin {
|
|||||||
let _ = handle.join();
|
let _ = handle.join();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// 清理残留 Firefox(兼容旧方案)
|
||||||
|
let _ = std::process::Command::new("/bin/bash")
|
||||||
|
.arg("-c")
|
||||||
|
.arg("kill -9 $(pgrep firefox-esr) 2>/dev/null")
|
||||||
|
.output();
|
||||||
|
|
||||||
self.publish_status();
|
self.publish_status();
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user