cxytw
|
7d151996c0
|
Merge branch 'master' of http://115.190.64.57:8000/xiaozhang/zhibo
# Conflicts:
# Zhibo/admin/src/theme/app.scss
# Zhibo/zhibo-h/crmeb-front/src/main/java/com/zbkj/front/config/WebSocketConfig.java
# Zhibo/zhibo-h/crmeb-front/src/main/java/com/zbkj/front/controller/CallController.java
# Zhibo/zhibo-h/crmeb-front/src/main/java/com/zbkj/front/websocket/CallSignalingHandler.java
# Zhibo/zhibo-h/crmeb-service/src/main/java/com/zbkj/service/service/impl/CallServiceImpl.java
# Zhibo/zhibo-h/crmeb-service/src/main/java/com/zbkj/service/service/impl/ConversationServiceImpl.java
|
2025-12-29 10:43:09 +08:00 |
|
userName
|
ca9789ba72
|
修改后台管理界面
|
2025-12-27 18:32:29 +08:00 |
|
xiao12feng8
|
0778e5c3ba
|
feat: 完善通话信令功能 - 修复主叫方和被叫方通话状态同步问题
|
2025-12-26 18:18:36 +08:00 |
|
cxytw
|
bb4bf666f4
|
管理端界面优化
|
2025-12-26 18:06:34 +08:00 |
|
cxytw
|
40a95ee5da
|
管理端界面优化
|
2025-12-26 17:58:59 +08:00 |
|
cxytw
|
148297e8d2
|
管理端界面优化
|
2025-12-26 17:55:01 +08:00 |
|
xiao12feng8
|
827ef40900
|
合并远程master分支，解决冲突
|
2025-12-26 16:11:03 +08:00 |
|
xiao12feng8
|
714143264a
|
修复语音+视频通话bug
|
2025-12-26 15:59:19 +08:00 |
|
xiao12feng8
|
bae216261a
|
通信
|
2025-12-26 15:43:37 +08:00 |
|
xiao12feng8
|
e85f9c42ad
|
消息引用+撤回+敏感词接口
|
2025-12-26 15:16:40 +08:00 |
|
ShiQi
|
c8aaa31212
|
各个模块的开发、接口的实现、表的创建
|
2025-12-26 15:06:37 +08:00 |
|
ShiQi
|
e7746a5bbb
|
Merge branch 'merge/unify-all' of http://115.190.64.57:8000/xiaozhang/zhibo into IM-gift
|
2025-12-26 08:48:16 +08:00 |
|
ShiQi
|
888ed8eb9e
|
11
|
2025-12-26 08:46:24 +08:00 |
|
xiao12feng8
|
f4c9a42974
|
修复问题
|
2025-12-25 19:02:07 +08:00 |
|
xiao12feng8
|
c7e75a912a
|
Merge branch 'IM-gift' of https://gitee.com/xiao12feng/zhibo_1 into merge/unify-all
|
2025-12-25 17:24:23 +08:00 |
|
xiao12feng8
|
cd29161705
|
添加WebSocket心跳检测和断线重连机制
|
2025-12-25 17:22:51 +08:00 |
|
ShiQi
|
e56b32131d
|
IM需求文档的开发，送礼物的功能的实现
|
2025-12-25 17:09:41 +08:00 |
|
xiao12feng8
|
673ab55599
|
feat: 修复搜索用户功能和会话列表功能 - 添加 CircleImageView 依赖 - 修复 AuthHelper.getToken 改为 AuthStore.getToken - 添加 AddFriendActivity 调试日志 - 修改 MessagesActivity 从后端 API 获取会话列表 - 添加好友管理相关的 Controller 和 Service
|
2025-12-24 18:11:39 +08:00 |
|
xiao12feng8
|
f321f198f6
|
修复基本问题
|
2025-12-23 18:31:57 +08:00 |
|
xiao12feng8
|
9160e6e1a9
|
连接直播
|
2025-12-23 15:38:35 +08:00 |
|
xiao12feng8
|
7094cbccbc
|
live: admin live room list + url host fix + app use backend urls
|
2025-12-23 11:39:57 +08:00 |
|
xiao12feng8
|
214479e0ab
|
WIP: unify live room api + android client updates
|
2025-12-21 18:55:17 +08:00 |
|
xiao12feng@outlook.com
|
d6577ad99b
|
feat(live): embed room api and SRS hooks into crmeb-front
|
2025-12-21 18:07:19 +08:00 |
|
xiao12feng@outlook.com
|
087e1feae6
|
chore: avoid committing per-developer live config
|
2025-12-21 17:32:12 +08:00 |
|
xiao12feng@outlook.com
|
a1c6996fdc
|
chore: import Zhibo into monorepo
|
2025-12-21 16:08:52 +08:00 |
|