Commits · 894defe5a238634b12561dc6f39bc1abb3fbce14 · pidan / FuSiLive · GitLab

07 Mar, 2026 7 commits
- 新增心跳刷新 · 894defe5
  suolong committed Mar 07, 2026
  
  894defe5 Browse Files
- Merge branch 'feature/v57版本pk迁移' of http://git.yabolive.net:88/pidan/FuSiLive… · 51a4c3d5
```
Merge branch 'feature/v57版本pk迁移' of http://git.yabolive.net:88/pidan/FuSiLive into feature/v57版本pk迁移
```
  suolong committed Mar 07, 2026
  51a4c3d5 Browse Files
- 修改下mainviewcontroller的结构对齐firefly · 3455844c
  suolong committed Mar 07, 2026
  
  3455844c Browse Files
- Merge branch 'feature/v57版本pk迁移' of http://git.yabolive.net:88/pidan/FuSiLive… · 3a7cd110
```
Merge branch 'feature/v57版本pk迁移' of http://git.yabolive.net:88/pidan/FuSiLive into feature/v57版本pk迁移
```
  ludi committed Mar 07, 2026
  3a7cd110 Browse Files
- 完成私房通话 · 11326143
  ludi committed Mar 07, 2026
  
  11326143 Browse Files
- Merge branch 'feature/v57版本pk迁移' of http://git.yabolive.net:88/pidan/FuSiLive… · 187f7b27
```
Merge branch 'feature/v57版本pk迁移' of http://git.yabolive.net:88/pidan/FuSiLive into feature/v57版本pk迁移
```
  suolong committed Mar 07, 2026
  187f7b27 Browse Files
- 修复直播间麦克风问题 · b0a199bf
  suolong committed Mar 07, 2026
  
  b0a199bf Browse Files
06 Mar, 2026 7 commits
- Merge branch 'feature/v57版本pk迁移' of http://git.yabolive.net:88/pidan/FuSiLive… · eb0c88ef
```
Merge branch 'feature/v57版本pk迁移' of http://git.yabolive.net:88/pidan/FuSiLive into feature/v57版本pk迁移
```
  ludi committed Mar 06, 2026
  eb0c88ef Browse Files
- 修复一系列bug · c55512cf
  ludi committed Mar 06, 2026
  
  c55512cf Browse Files
- 修改点问题 · bef7c671
  suolong committed Mar 06, 2026
  
  bef7c671 Browse Files
- Merge branch 'feature/v57版本pk迁移' of http://git.yabolive.net:88/pidan/FuSiLive… · 167d57d8
```
Merge branch 'feature/v57版本pk迁移' of http://git.yabolive.net:88/pidan/FuSiLive into feature/v57版本pk迁移
```
  suolong committed Mar 06, 2026
  167d57d8 Browse Files
- 个人通话bug · 00aee5e3
  suolong committed Mar 06, 2026
  
  00aee5e3 Browse Files
- 修复直播间下面按钮顺序 · e70b84b1
  ludi committed Mar 06, 2026
  
  e70b84b1 Browse Files
- 补充一些洗代码 · c0758565
  ludi committed Mar 06, 2026
  
  c0758565 Browse Files
05 Mar, 2026 8 commits
- Merge branch 'feature/v57版本pk迁移' of http://git.yabolive.net:88/pidan/FuSiLive… · 424e9bed
```
Merge branch 'feature/v57版本pk迁移' of http://git.yabolive.net:88/pidan/FuSiLive into feature/v57版本pk迁移
```
  ludi committed Mar 05, 2026
  424e9bed Browse Files
- 初步洗完代码 · c0dd206d
  ludi committed Mar 05, 2026
  
  c0dd206d Browse Files
- 修复画中画，尺寸问题 · 80fa2f6d
  suolong committed Mar 05, 2026
  
  80fa2f6d Browse Files
- Merge branch 'feature/v57版本pk迁移' of http://git.yabolive.net:88/pidan/FuSiLive… · 65b93064
```
Merge branch 'feature/v57版本pk迁移' of http://git.yabolive.net:88/pidan/FuSiLive into feature/v57版本pk迁移

# Conflicts:
#	Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/Controller/FUSLiveMainViewController.m
```
  ludi committed Mar 05, 2026
  65b93064 Browse Files
- 正在洗代码 · c42f244b
  ludi committed Mar 05, 2026
  
  c42f244b Browse Files
- no message · b519e4ed
  suolong committed Mar 05, 2026
  
  b519e4ed Browse Files
- 修复点bug · d300a4cd
  suolong committed Mar 05, 2026
  
  d300a4cd Browse Files
- 补全大部分缺少的图片 · bca50a55
  ludi committed Mar 05, 2026
  
  bca50a55 Browse Files
04 Mar, 2026 7 commits
- 添加一些未有的动画，pk模块已经更新完最新版本 · f27a227e
  ludi committed Mar 04, 2026
  
  f27a227e Browse Files
- 补一个run的bug · 05db1b19
  ludi committed Mar 04, 2026
  
  05db1b19 Browse Files
- Merge branch 'feature/v57版本pk迁移' of http://git.yabolive.net:88/pidan/FuSiLive… · 3632b6ed
```
Merge branch 'feature/v57版本pk迁移' of http://git.yabolive.net:88/pidan/FuSiLive into feature/v57版本pk迁移

# Conflicts:
#	Modules/FUSShowRoomModule/FUSShowRoomModule.xcodeproj/project.pbxproj
```
  ludi committed Mar 04, 2026
  3632b6ed Browse Files
- 完成pkcontentview所有 · a1ee7196
  ludi committed Mar 04, 2026
  
  a1ee7196 Browse Files
- 修复播放小窗问题 · e7426994
  suolong committed Mar 04, 2026
  
  e7426994 Browse Files
- 修复连麦问题 · 3755332c
  suolong committed Mar 04, 2026
  
  3755332c Browse Files
- 修复连麦问题 · b2e801f6
  suolong committed Mar 04, 2026
  
  b2e801f6 Browse Files
03 Mar, 2026 5 commits
- 提交一些ui · dbdf522c
  ludi committed Mar 03, 2026
  
  dbdf522c Browse Files
- Merge branch 'feature/v57版本pk迁移' of http://git.yabolive.net:88/pidan/FuSiLive… · bb39a355
```
Merge branch 'feature/v57版本pk迁移' of http://git.yabolive.net:88/pidan/FuSiLive into feature/v57版本pk迁移
```
  ludi committed Mar 03, 2026
  bb39a355 Browse Files
- 完成basemodel底层兼容 · e68face1
  ludi committed Mar 03, 2026
  
  e68face1 Browse Files
- Merge branch 'feature/v57版本pk迁移' of http://git.yabolive.net:88/pidan/FuSiLive… · e34a78f9
```
Merge branch 'feature/v57版本pk迁移' of http://git.yabolive.net:88/pidan/FuSiLive into feature/v57版本pk迁移
```
  suolong committed Mar 03, 2026
  e34a78f9 Browse Files
- 更新下byteRTC配置 · 4cfd9c4f
  suolong committed Mar 03, 2026
  
  4cfd9c4f Browse Files
02 Mar, 2026 6 commits
- 调整pk面板 · 209ac1af
  ludi committed Mar 02, 2026
  
  209ac1af Browse Files
- 解决开播问题 · 566e92fc
  suolong committed Mar 02, 2026
  
  566e92fc Browse Files
- 接完连麦 · e3b71d54
  ludi committed Mar 02, 2026
  
  e3b71d54 Browse Files
- Merge branch 'feature/v57版本pk迁移' of http://git.yabolive.net:88/pidan/FuSiLive… · 7c3bba79
```
Merge branch 'feature/v57版本pk迁移' of http://git.yabolive.net:88/pidan/FuSiLive into feature/v57版本pk迁移
```
  ludi committed Mar 02, 2026
  7c3bba79 Browse Files
- 正在搞连麦，上传一下 · 8db6b419
  ludi committed Mar 02, 2026
  
  8db6b419 Browse Files
- Merge branch 'feature/v57版本pk迁移' of http://git.yabolive.net:88/pidan/FuSiLive… · 7857be52
```
Merge branch 'feature/v57版本pk迁移' of http://git.yabolive.net:88/pidan/FuSiLive into feature/v57版本pk迁移
```
  suolong committed Mar 02, 2026
  7857be52 Browse Files