xiao12feng8
|
cc667a7643
|
功能：作品编辑和删除
|
2026-01-07 18:34:31 +08:00 |
|
xiao12feng8
|
c8e22d497e
|
功能：作品点赞+关注+收藏+作品搜索+作品标签
|
2026-01-07 17:36:08 +08:00 |
|
xiao12feng8
|
d2fa9a1055
|
合并IM-gift分支：作品发布、点赞收藏评论等功能
|
2026-01-06 18:59:23 +08:00 |
|
xiao12feng8
|
b2f848c918
|
修复全屏播放和退出登录功能：1.添加退出登录按钮 2.修复全屏播放黑屏问题 3.添加退出全屏按钮 4.修复退出全屏后布局恢复
|
2026-01-06 18:42:23 +08:00 |
|
ShiQi
|
ad0c4ea5b3
|
作品发布，点赞收藏评论等功能的编写
|
2026-01-06 18:23:15 +08:00 |
|
xiao12feng8
|
202c8452c5
|
优化：App整体主题优化
|
2026-01-06 14:24:42 +08:00 |
|
xiao12feng8
|
1124ce7d82
|
清理：移动冗余文件
|
2026-01-06 10:25:40 +08:00 |
|
xiao12feng8
|
a2287bccd1
|
清理：移动冗余文件
|
2026-01-06 10:25:22 +08:00 |
|
ShiQi
|
2ce760ba9d
|
Revert "发布作品界面代码的编写提交"
This reverts commit dbcd9fce42.
|
2026-01-05 18:11:43 +08:00 |
|
ShiQi
|
78447bd093
|
Merge branch 'master' of http://115.190.64.57:8000/xiaozhang/zhibo into IM-gift
# Conflicts:
# android-app/app/src/main/java/com/example/livestreaming/net/ApiService.java
|
2026-01-05 17:27:18 +08:00 |
|
xiao12feng8
|
1995a37f2f
|
Merge remote master: 合并封禁系统、粉丝团消息等功能
|
2026-01-05 17:27:05 +08:00 |
|
ShiQi
|
dbcd9fce42
|
发布作品界面代码的编写提交
|
2026-01-05 17:23:58 +08:00 |
|
xiao12feng8
|
0a29095649
|
优化：缘池界面
|
2026-01-05 17:20:54 +08:00 |
|
ShiQi
|
b5fdbf1319
|
附近地址的代码编写
|
2026-01-05 17:11:35 +08:00 |
|
cxytw
|
37a4184f55
|
粉丝团，封禁完善
|
2026-01-05 16:58:39 +08:00 |
|
xiao12feng8
|
a619bb1750
|
修复：首页标签分类+我的挚友处理+历史记录
优化：缘池界面+消息搜索界面
|
2026-01-05 16:47:07 +08:00 |
|
xiao12feng8
|
1be8f14f07
|
修复：：手机无法正常开播
|
2026-01-05 10:13:59 +08:00 |
|
xiao12feng8
|
18719d752b
|
整理：移动冗余sql/md/sh/bat文件到归档文件夹，添加Log文件夹
|
2026-01-05 09:00:00 +08:00 |
|
xiao12feng8
|
fd27958b9d
|
合并丢失的提交：部署、清理、分类、支付粉丝团功能
|
2026-01-05 08:52:57 +08:00 |
|
xiao12feng8
|
69cfc3624f
|
部署：部署远程
|
2026-01-04 20:50:37 +08:00 |
|
cxytw
|
25274c523b
|
历史记录与用户拉黑，用户封禁功能完善。
|
2026-01-04 19:40:45 +08:00 |
|
cxytw
|
86c37cd688
|
Resolve stash conflicts: merge local changes with IM-gift branch
|
2026-01-04 19:24:42 +08:00 |
|
cxytw
|
d234b91836
|
Merge IM-gift branch: add virtual currency and recharge features
|
2026-01-04 19:16:46 +08:00 |
|
ShiQi
|
6f47e01e97
|
管理端礼物接口的接入，安卓端的礼物特效和赠送礼物的编写
|
2026-01-04 19:03:43 +08:00 |
|
ShiQi
|
b4a0eee625
|
feat: update gift system and IM features
|
2026-01-04 19:00:02 +08:00 |
|
xiao12feng8
|
6d811689a6
|
清理：优化后端和介绍的文档
|
2026-01-04 17:17:02 +08:00 |
|
xiao12feng8
|
23ce0923c5
|
清理：优化不需要的文档
|
2026-01-04 17:14:29 +08:00 |
|
xiao12feng8
|
b6a838acaa
|
功能：分类从后台获取
|
2026-01-04 17:07:07 +08:00 |
|
xiao12feng8
|
5614b48ac8
|
功能：支付+粉丝团+用户点赞关注好友
|
2026-01-04 16:34:10 +08:00 |
|
cxytw
|
87674d736e
|
feat: 实现管理端与移动端历史记录功能互通
|
2026-01-04 10:13:32 +08:00 |
|
cxytw
|
4890c98f85
|
fix: remove duplicate wishTree.js (keep wishtree.js with more features)
|
2026-01-04 09:36:27 +08:00 |
|
ShiQi
|
909d1994a1
|
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/request/UserEditRequest.java
# Zhibo/zhibo-h/crmeb-front/src/main/java/com/zbkj/front/controller/LiveRoomController.java
# Zhibo/zhibo-h/crmeb-service/src/main/java/com/zbkj/service/service/impl/FriendServiceImpl.java
# Zhibo/zhibo-h/crmeb-service/src/main/java/com/zbkj/service/service/impl/UserServiceImpl.java
# Zhibo/zhibo-h/crmeb-service/src/main/resources/mapper/FollowRecordDao.xml
# android-app/app/src/main/java/com/example/livestreaming/EditProfileActivity.java
# android-app/app/src/main/java/com/example/livestreaming/ProfileActivity.java
# android-app/app/src/main/java/com/example/livestreaming/net/UserEditRequest.java
# android-app/app/src/main/java/com/example/livestreaming/net/UserInfoResponse.java
|
2026-01-04 08:59:19 +08:00 |
|
xiao12feng8
|
b08765e035
|
功能：礼物功能基本搭建好
|
2026-01-03 19:22:42 +08:00 |
|
xiao12feng8
|
8b377c53e2
|
更新：点赞功能完善
|
2026-01-03 17:01:58 +08:00 |
|
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
|
f6aeb8e01f
|
Merge branch 'master' of http://115.190.64.57:8000/xiaozhang/zhibo
|
2025-12-31 19:57:54 +08:00 |
|
xiao12feng8
|
0655b6c8fe
|
Merge remote changes
|
2025-12-31 19:55:18 +08:00 |
|
xiao12feng8
|
3209a6b1bc
|
feat: 添加主播管理、群组管理功能及Android端相关页面
|
2025-12-31 19:41:22 +08:00 |
|
cxytw
|
49acc684bf
|
更新许愿树API和安全配置
|
2025-12-31 19:31:41 +08:00 |
|
ShiQi
|
c2e2684f52
|
Merge branch 'master' of http://115.190.64.57:8000/xiaozhang/zhibo into IM-gift
# Conflicts:
# Zhibo/zhibo-h/crmeb-admin/src/main/java/com/zbkj/admin/task/live/LiveStatusSyncTask.java
# android-app/app/src/main/java/com/example/livestreaming/RoomDetailActivity.java
# android-app/app/src/main/res/layout/dialog_make_wish.xml
# android-app/app/src/main/res/layout/dialog_view_wish.xml
|
2025-12-31 18:07:54 +08:00 |
|
ShiQi
|
9f6b72dfcc
|
接口的编写和接入
|
2025-12-31 18:05:04 +08:00 |
|
xiao12feng8
|
f7a0291b8c
|
修复：所有许愿树视图文件API引用路径统一为小写wishtree
|
2025-12-31 15:02:54 +08:00 |
|
xiao12feng8
|
077e4613bd
|
修复：统一许愿树模块路径大小写
|
2025-12-31 14:59:17 +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 |
|
ShiQi
|
162b44bf4f
|
修复了is_live自动变为0的bug
|
2025-12-31 11:16:54 +08:00 |
|