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 |
|
|
|
0e39913d44
|
修复搜索框
|
2025-12-23 12:39:14 +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
|
99bdd6b5dd
|
Android: runtime server switching + fix createRoom endpoint
|
2025-12-22 19:38:44 +08:00 |
|
|
|
d3854e20c8
|
修复了界面中的样式一些问题，还有内存泄漏等问题
|
2025-12-22 18:11:21 +08:00 |
|
|
|
7b6bfbc935
|
修改了界面中各个细节中的问题
|
2025-12-22 17:13:42 +08:00 |
|
|
|
a6b56bceb1
|
修改了界面中各个细节中的问题
|
2025-12-22 16:31:46 +08:00 |
|
xiao12feng8
|
0ac89bb4df
|
fix: exclude ijkplayer exoplayer transitive dep and resolve manifest merger conflict
|
2025-12-22 11:51:35 +08:00 |
|
xiao12feng8
|
4ec1f20734
|
chore(android): make api client/response backward compatible
|
2025-12-22 10:37:58 +08:00 |
|
xiao12feng8
|
214479e0ab
|
WIP: unify live room api + android client updates
|
2025-12-21 18:55:17 +08:00 |
|
xiao12feng@outlook.com
|
9cf2beef40
|
feat(android): add IjkPlayer flv playback with hls fallback
|
2025-12-21 17:35:06 +08:00 |
|
|
|
ffb175ff78
|
UI界面的编写
|
2025-12-19 17:54:33 +08:00 |
|
|
|
8e58ca7d66
|
UI界面的编写
|
2025-12-19 15:12:34 +08:00 |
|
|
|
8802e066f1
|
UI界面的编写
|
2025-12-19 15:11:49 +08:00 |
|
|
|
e91dbf43d3
|
UI界面的样式的修改
|
2025-12-19 10:50:44 +08:00 |
|
|
|
0a3836a0cb
|
UI界面的样式的修改
|
2025-12-19 10:50:13 +08:00 |
|
|
|
6fa39c9bec
|
UI updates: profile, wish tree, fish pond, placeholders
|
2025-12-18 17:33:36 +08:00 |
|
|
|
e234adf929
|
Merge branch 'modify-back' of https://gitee.com/xiao12feng/zhibo_1 into Added-a-button
# Conflicts:
# android-app/app/src/main/java/com/example/livestreaming/ChatAdapter.java
# android-app/app/src/main/java/com/example/livestreaming/ChatMessage.java
# android-app/app/src/main/res/drawable/ic_arrow_back_24.xml
# android-app/app/src/main/res/layout/activity_room_detail_new.xml
# android-app/app/src/main/res/layout/dialog_stream_info.xml
# android-app/app/src/main/res/layout/item_chat_message.xml
|
2025-12-18 16:10:15 +08:00 |
|
xiao12feng@outlook.com
|
d1fc3b0df5
|
将项目改成java程序
|
2025-12-18 14:52:20 +08:00 |
|
|
|
07900a85ae
|
安卓界面的修改
|
2025-12-18 14:20:41 +08:00 |
|
xiao12feng@outlook.com
|
65d92ce0ac
|
将项目改成java程序
|
2025-12-17 19:06:57 +08:00 |
|
|
|
000b3e6607
|
修改了一些样式
|
2025-12-17 17:45:39 +08:00 |
|
xiao12feng@outlook.com
|
b92c1dc325
|
增加了一个 + 按钮
|
2025-12-17 17:29:44 +08:00 |
|
xiao12feng@outlook.com
|
0289dafd1c
|
添加直播按钮
|
2025-12-17 17:23:54 +08:00 |
|
|
|
d8f84c5ba1
|
安卓界面样式
|
2025-12-17 16:33:59 +08:00 |
|
|
|
ed9d9ceb9c
|
安卓界面
|
2025-12-17 15:43:41 +08:00 |
|
