ShiQi
|
4e2366ce49
|
安卓端的代码编写
|
2025-12-30 16:22:47 +08:00 |
|
ShiQi
|
8f8a3ef03d
|
安卓端的代码编写
|
2025-12-30 16:19:12 +08:00 |
|
ShiQi
|
86709109a5
|
文档的上传
|
2025-12-30 15:28:07 +08:00 |
|
ShiQi
|
3535009dba
|
Merge branch 'master' of http://115.190.64.57:8000/xiaozhang/zhibo into IM-gift
|
2025-12-30 15:24:47 +08:00 |
|
ShiQi
|
b804f9d2d9
|
还剩余模块文档中的11和18没有对接
|
2025-12-30 15:23:16 +08:00 |
|
ShiQi
|
05b23b7a3b
|
修复编译报错
|
2025-12-30 11:22:07 +08:00 |
|
xiao12feng8
|
b97c82899f
|
Merge branch 'master' of http://115.190.64.57:8000/xiaozhang/zhibo
|
2025-12-30 11:13:09 +08:00 |
|
ShiQi
|
f6a6a59a32
|
新的文档的编写
|
2025-12-30 11:11:11 +08:00 |
|
xiao12feng8
|
e83568f5fb
|
bug：修复消息不能撤回
|
2025-12-30 11:11:07 +08:00 |
|
xiao12feng8
|
7d1896d9d2
|
bug：修复消息不能正确判断位置
|
2025-12-30 10:10:35 +08:00 |
|
xiao12feng8
|
72e90f4e0e
|
Merge remote-tracking branch 'origin/master' - resolve ApiService conflict
|
2025-12-30 09:42:28 +08:00 |
|
xiao12feng8
|
5b0c786f1f
|
修复app的bug
|
2025-12-30 09:31:15 +08:00 |
|
ShiQi
|
d8f9cc8959
|
接口的对接
|
2025-12-30 09:29:30 +08:00 |
|
ShiQi
|
e3df41657a
|
接口的对接和一些前端页面的修改
|
2025-12-29 18:02:28 +08:00 |
|
ShiQi
|
5c4faae97b
|
bug的修改
|
2025-12-29 15:42:13 +08:00 |
|
ShiQi
|
db1b8d8f90
|
Merge branch 'master' of http://115.190.64.57:8000/xiaozhang/zhibo into IM-gift
# Conflicts:
# Zhibo/zhibo-h/crmeb-common/src/main/java/com/zbkj/common/annotation/RateLimit.java
# Zhibo/zhibo-h/crmeb-common/src/main/java/com/zbkj/common/model/call/CallRecord.java
# Zhibo/zhibo-h/crmeb-common/src/main/java/com/zbkj/common/model/gift/GiftRecord.java
# Zhibo/zhibo-h/crmeb-common/src/main/java/com/zbkj/common/page/CommonPage.java
# Zhibo/zhibo-h/crmeb-front/src/main/java/com/zbkj/front/controller/CategoryController.java
# Zhibo/zhibo-h/crmeb-service/src/main/java/com/zbkj/service/aspect/RateLimitAspect.java
# Zhibo/zhibo-h/crmeb-service/src/main/java/com/zbkj/service/service/RateLimitService.java
# Zhibo/zhibo-h/crmeb-service/src/main/java/com/zbkj/service/service/impl/RateLimitServiceImpl.java
# Zhibo/zhibo-h/开发进度总结.md
# Zhibo/zhibo-h/直播IM系统开发指南.md
|
2025-12-29 15:23:19 +08:00 |
|
ShiQi
|
721d588971
|
前后端接口对接
|
2025-12-29 15:12:12 +08:00 |
|
cxytw
|
892b84e070
|
管理端界面优化
|
2025-12-29 14:56:26 +08:00 |
|
ShiQi
|
0de2709339
|
业务模块编写完成
|
2025-12-29 11:57:36 +08:00 |
|
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 |
|
cxytw
|
0049afbf5c
|
管理端界面优化
|
2025-12-29 10:20:34 +08:00 |
|
ShiQi
|
fb3204b0bb
|
Merge branch 'master' of http://115.190.64.57:8000/xiaozhang/zhibo into IM-gift
# Conflicts:
# Zhibo/zhibo-h/crmeb-front/src/main/java/com/zbkj/front/controller/CallController.java
|
2025-12-29 08:43:35 +08:00 |
|
userName
|
ca9789ba72
|
修改后台管理界面
|
2025-12-27 18:32:29 +08:00 |
|
userName
|
e8bfa466e4
|
Merge branch 'master' of http://115.190.64.57:8000/xiaozhang/zhibo
|
2025-12-26 18:37:57 +08:00 |
|
userName
|
8d96082064
|
feat: Android端接口对接完成，新增42个API接口
|
2025-12-26 18:37:36 +08:00 |
|
userName
|
7ad3de704a
|
Merge branch 'master' of http://115.190.64.57:8000/xiaozhang/zhibo
|
2025-12-26 18:35:20 +08:00 |
|
xiao12feng8
|
0778e5c3ba
|
feat: 完善通话信令功能 - 修复主叫方和被叫方通话状态同步问题
|
2025-12-26 18:18:36 +08:00 |
|
userName
|
b30f07b15a
|
feat: Android端接口对接完成，新增42个API接口
|
2025-12-26 18:18:28 +08:00 |
|
xiao12feng8
|
488329c2fa
|
语音和视频通话实现+不能传输媒体需要集成webrtc
|
2025-12-26 18:16:33 +08:00 |
|
ShiQi
|
9e39317600
|
修复了bug
|
2025-12-26 18:07:55 +08:00 |
|
cxytw
|
bb4bf666f4
|
管理端界面优化
|
2025-12-26 18:06:34 +08:00 |
|
ShiQi
|
ebbc343a07
|
作品管理模块和社交功能模块，这两个业务模块的接口的编写
|
2025-12-26 18:02:04 +08:00 |
|
cxytw
|
40a95ee5da
|
管理端界面优化
|
2025-12-26 17:58:59 +08:00 |
|
cxytw
|
148297e8d2
|
管理端界面优化
|
2025-12-26 17:55:01 +08:00 |
|
xiao12feng8
|
c63bc8fe88
|
实现Android端语音/视频通话功能
- 添加通话API接口 (CallApiService)
- 实现WebSocket信令客户端 (CallSignalingClient)
- 添加通话管理器 (CallManager)
- 实现通话界面 (CallActivity)
- 实现来电界面 (IncomingCallActivity)
- 实现通话记录列表 (CallHistoryActivity)
- 添加相关UI资源和图标
|
2025-12-26 16:38:06 +08:00 |
|
xiao12feng8
|
ecaed42912
|
添加Log文档目录：后端接口分析报告
|
2025-12-26 16:17:47 +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 |
|
xiao12feng8
|
bc0713b447
|
好友聊天功能实现
|
2025-12-25 17:20:34 +08:00 |
|
ShiQi
|
e56b32131d
|
IM需求文档的开发，送礼物的功能的实现
|
2025-12-25 17:09:41 +08:00 |
|
xiao12feng8
|
4bc5b6767d
|
merge: 解决 RoomDetailActivity 冲突，合并 WebSocket 和礼物功能
|
2025-12-24 18:37:39 +08:00 |
|
xiao12feng8
|
673ab55599
|
feat: 修复搜索用户功能和会话列表功能 - 添加 CircleImageView 依赖 - 修复 AuthHelper.getToken 改为 AuthStore.getToken - 添加 AddFriendActivity 调试日志 - 修改 MessagesActivity 从后端 API 获取会话列表 - 添加好友管理相关的 Controller 和 Service
|
2025-12-24 18:11:39 +08:00 |
|