版本合并 #12

Closed
emilia-t wants to merge 0 commits from emilia-t into main
Collaborator

1.语音发送支持
2.繁体中文支持
3.通知音效支持
4.修复部分多语言翻译错误

1.语音发送支持 2.繁体中文支持 3.通知音效支持 4.修复部分多语言翻译错误
alimu was assigned by emilia-t 1 week ago
emilia-t added 4 commits 1 week ago
Poster
Collaborator

注意!ChatSessionManager.kt文件中的很多函数头部注释需要尽可能保留main提交,我的提交中不小心删除了这些头部注释,请注意。

注意!ChatSessionManager.kt文件中的很多函数头部注释需要尽可能保留main提交,我的提交中不小心删除了这些头部注释,请注意。
emilia-t changed title from 版本合并 to WIP: 版本合并 1 week ago
emilia-t started working 1 week ago
emilia-t requested review from alimu 1 week ago
alimu commented 1 week ago
Owner

已在 main 直接吸收本 PR 仍然有效的增量,并保留主线后续实现:

  • 新增 Android 通知音效选择,并按音效创建独立通知 channel
  • 新增繁体中文入口,缺失词条回退到 zh
  • 补充音效资源与授权说明

对应提交:02046bd feat(android): add notification sounds and zh-Hant support

未直接 merge 的原因:当前 PR 基于较旧的 main,直接合并会把主线后续已经进入的 Android 语音优化、Web 语音支持、应用图标以及服务端同步等改动一起回退。已按主线手工摘取有效增量并完成编译验证,然后关闭此 PR。

已在 `main` 直接吸收本 PR 仍然有效的增量,并保留主线后续实现: - 新增 Android 通知音效选择,并按音效创建独立通知 channel - 新增繁体中文入口,缺失词条回退到 `zh` - 补充音效资源与授权说明 对应提交:`02046bd` `feat(android): add notification sounds and zh-Hant support` 未直接 merge 的原因:当前 PR 基于较旧的 `main`,直接合并会把主线后续已经进入的 Android 语音优化、Web 语音支持、应用图标以及服务端同步等改动一起回退。已按主线手工摘取有效增量并完成编译验证,然后关闭此 PR。
alimu closed this pull request 1 week ago
emilia-t stopped working 1 week ago
14 minutes 25 seconds
linran changed title from WIP: 版本合并 to 版本合并 1 week ago

Reviewers

alimu was requested for review 1 week ago
Please reopen this pull request to perform a merge.
You can also view command line instructions.

Step 1:

From your project repository, check out a new branch and test the changes.
git checkout -b emilia-t main
git pull origin emilia-t

Step 2:

Merge the changes and update on Gitea.
git checkout main
git merge --no-ff emilia-t
git push origin main
Sign in to join this conversation.
No reviewers
No Label
No Milestone
No project
No Assignees
2 Participants
Notifications
Total Time Spent: 14 minutes 25 seconds
emilia-t
14 minutes 25 seconds
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: alimu/OnlineMsgServer#12
Loading…
There is no content yet.