xiao12feng8
32984df36b
功能：关注+手机端开播功能
2026-01-03 15:32:31 +08:00
xiao12feng8
f3169b2eba
更新：添加用户和主播切换功能
2026-01-03 12:24:05 +08:00
cxytw
7042137e5b
移动端，首页、缘池、许愿树、我的，页面优化，功能完善。
2026-01-02 20:39:14 +08:00
xiao12feng8
6e8f5c4011
整合代码+群组聊天+直播和语音通话修复完成
2025-12-31 20:06:17 +08:00
xiao12feng8
3209a6b1bc
feat: 添加主播管理、群组管理功能及Android端相关页面
2025-12-31 19:41:22 +08:00
xiao12feng8
8345dca1a1
解决合并冲突：许愿树对话框布局文件
2025-12-31 14:47:07 +08:00
xiao12feng8
750f4c8c1e
更新：许愿树对话框、通话功能、环境配置等多项优化
2025-12-31 14:44:51 +08:00
cxytw
3c9b31185f
12月31号许愿树优化
2025-12-31 14:24:51 +08:00
xiao12feng8
e7649df1af
Merge branch 'master' of http://115.190.64.57:8000/xiaozhang/zhibo
2025-12-30 19:21:00 +08:00
xiao12feng8
b3726557e5
question：未修复好直播功能+未部署
2025-12-30 19:20:52 +08:00
userName
dbd9a04c9b
美化界面
2025-12-30 19:15:23 +08:00
xiao12feng8
184bbcbf6e
Merge remote-tracking branch 'origin/IM-gift'
...
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2025-12-30 18:31:37 +08:00
xiao12feng8
91a58d090b
Merge conflict resolved
2025-12-30 18:26:21 +08:00
userName
eb5daad9de
缘池，和许愿树的内容
2025-12-30 17:57:42 +08:00
userName
e2b4d04420
Merge branch 'master' of http://115.190.64.57:8000/xiaozhang/zhibo
2025-12-30 17:42:43 +08:00
userName
3e90031acf
缘池，和许愿树的内容
2025-12-30 17:33:27 +08:00
cxytw
ce0e27f9e7
管理端前端页面修复完善
2025-12-30 16:22:27 +08:00
ShiQi
8f8a3ef03d
安卓端的代码编写
2025-12-30 16:19:12 +08:00
xiao12feng8
c37cf4884b
功能：增加语音和视频通话的功能
2025-12-30 16:08:43 +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
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
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
userName
e8bfa466e4
Merge branch 'master' of http://115.190.64.57:8000/xiaozhang/zhibo
2025-12-26 18:37:57 +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
xiao12feng8
c63bc8fe88
实现Android端语音/视频通话功能
...
- 添加通话API接口 (CallApiService)
- 实现WebSocket信令客户端 (CallSignalingClient)
- 添加通话管理器 (CallManager)
- 实现通话界面 (CallActivity)
- 实现来电界面 (IncomingCallActivity)
- 实现通话记录列表 (CallHistoryActivity)
- 添加相关UI资源和图标
2025-12-26 16:38:06 +08:00
xiao12feng8
e85f9c42ad
消息引用+撤回+敏感词接口
2025-12-26 15:16:40 +08:00
xiao12feng8
f4c9a42974
修复问题
2025-12-25 19:02:07 +08:00
xiao12feng8
bc0713b447
好友聊天功能实现
2025-12-25 17:20:34 +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
ShiQi
f87fc5cf47
发布作品，送礼物，充值界面的编写
2025-12-24 17:43:14 +08:00
xiao12feng8
bc53b6c482
Merge branch 'master' of https://gitee.com/xiao12feng/zhibo_1 into merge/unify-all
...
# Conflicts:
# android-app/app/src/main/java/com/example/livestreaming/RoomDetailActivity.java
# android-app/app/src/main/java/com/example/livestreaming/RoomsAdapter.java
# android-app/app/src/main/java/com/example/livestreaming/net/ApiService.java
2025-12-23 18:32:51 +08:00
xiao12feng8
f321f198f6
修复基本问题
2025-12-23 18:31:57 +08:00
ShiQi
171054efbb
修复了一些bug和添加了TODO
2025-12-23 18:09:56 +08:00
xiao12feng8
8c4c8ef4b1
Merge branch 'master' of https://gitee.com/xiao12feng/zhibo_1 into merge/unify-all
...
# Conflicts:
# android-app/app/src/main/java/com/example/livestreaming/MainActivity.java
# android-app/app/src/main/java/com/example/livestreaming/RoomDetailActivity.java
2025-12-23 15:40:28 +08:00
xiao12feng8
9160e6e1a9
连接直播
2025-12-23 15:38:35 +08:00
ShiQi
484c17a4d3
在对应的地方添加了todo，表示需要哪些接口
2025-12-23 15:37:37 +08:00
c5314d6309
Merge remote-tracking branch 'origin/merge/unify-all'
2025-12-23 12:48:22 +08:00
