Commits · e4236ffd6565359ef8e1069155f31d994641cb98 · pidan / FuSiLive

05 Feb, 2026 3 commits
- Merge branch 'feature/v57版本pk迁移' of http://git.yabolive.net:88/pidan/FuSiLive… · e4236ffd
```
Merge branch 'feature/v57版本pk迁移' of http://git.yabolive.net:88/pidan/FuSiLive into feature/v57版本pk迁移
```
  ludi committed Feb 05, 2026
  e4236ffd Browse Files
- 初步完成ffpkhelper对接 · 6e9aadd8
  ludi committed Feb 05, 2026
  
  6e9aadd8 Browse Files
- 连买的底层介入 · cd04eabd
  suolong committed Feb 05, 2026
  
  cd04eabd Browse Files
27 Jan, 2026 1 commit
- 补充下正常开播 · cf41be93
  suolong committed Jan 27, 2026
  
  cf41be93 Browse Files
23 Jan, 2026 3 commits
- Merge branch 'feature/v57版本pk迁移' of http://git.yabolive.net:88/pidan/FuSiLive… · f4c2941f
```
Merge branch 'feature/v57版本pk迁移' of http://git.yabolive.net:88/pidan/FuSiLive into feature/v57版本pk迁移

# Conflicts:
#	Pods/Pods.xcodeproj/project.pbxproj
```
  ludi committed Jan 23, 2026
  f4c2941f Browse Files
- 循环引用问题 · f6fd1040
  suolong committed Jan 23, 2026
  
  f6fd1040 Browse Files
- 能运行版本 · c5f52706
  suolong committed Jan 23, 2026
  
  c5f52706 Browse Files
22 Jan, 2026 2 commits
- 修改bug · faf5f9ca
  suolong committed Jan 22, 2026
  
  faf5f9ca Browse Files
- 清完所有的报错，初步合并到代码中，所有的外来代码都是ff开头 · 1863f444
  ludi committed Jan 22, 2026
  
  1863f444 Browse Files
21 Jan, 2026 1 commit
- 底层迁移 · 4a0f0c7c
  suolong committed Jan 21, 2026
  
  4a0f0c7c Browse Files
19 Jan, 2026 1 commit
- Merge branch 'feature/私享房需求' into develop · 496810af
  ludi committed Jan 19, 2026
  
  496810af Browse Files
19 Dec, 2025 1 commit
- 修复谷歌和line登录 · 9a79f11d
  ludi committed Dec 19, 2025
  
  9a79f11d Browse Files
17 Dec, 2025 1 commit
- 1.加上取消注销的逻辑。 · 89b2d797
```
2.禁止截图逻辑。
```
  ludi committed Dec 17, 2025
  89b2d797 Browse Files
28 Sep, 2025 1 commit
- fixed bugs · 3fbef179
  pidan committed Sep 28, 2025
  
  3fbef179 Browse Files
27 Sep, 2025 1 commit
- 1、适配iOS 26 · d6550f93
```
2、fixed 上麦断断续续的问题
3、UI修改
```
  pidan committed Sep 27, 2025
  d6550f93 Browse Files
19 Sep, 2025 1 commit
- 修复cid绑定的逻辑 · 35b46755
  pidan committed Sep 19, 2025
  
  35b46755 Browse Files
28 Jul, 2025 1 commit
- 修复审核私享房不显示的问题 · 2012201b
  pidan committed Jul 28, 2025
  
  2012201b Browse Files
25 Jul, 2025 1 commit
- 1、修复用户空间签名播放的问题 · 624572f3
```
2、修复用户公屏欢迎消息的问题
```
  pidan committed Jul 25, 2025
  624572f3 Browse Files
21 Jul, 2025 4 commits
- 接入Crashlytics · 918b707e
  pidan committed Jul 21, 2025
  
  918b707e Browse Files
- 补充删除TenjinSDK · af19c8aa
  pidan committed Jul 21, 2025
  
  af19c8aa Browse Files
- 删除TenjinSDK · daa51990
  pidan committed Jul 21, 2025
  
  daa51990 Browse Files
- 修复线上闪退 · 3058fb14
  pidan committed Jul 21, 2025
  
  3058fb14 Browse Files
09 Jul, 2025 10 commits
- Merge branch 'feature/私享房需求' of http://git.yabolive.net:88/pidan/FuSiLive into feature/私享房需求 · 53528c31
  ludi committed Jul 09, 2025
  
  53528c31 Browse Files
- 修复一个储值点的问题 · 3e817dfc
  ludi committed Jul 09, 2025
  
  3e817dfc Browse Files
- 开播失败使用后台的msg · cf59cc51
  pidan committed Jul 09, 2025
  
  cf59cc51 Browse Files
- Merge branch 'feature/私享房需求' of http://git.yabolive.net:88/pidan/FuSiLive into feature/私享房需求 · 4d0bcdcd
```
* 'feature/私享房需求' of http://git.yabolive.net:88/pidan/FuSiLive:
  调整一个注册后完善信息的ui
```
  pidan committed Jul 09, 2025
  4d0bcdcd Browse Files
- 修复在聊天室内收到图片不显示的问题 · 4debd6cf
  pidan committed Jul 09, 2025
  
  4debd6cf Browse Files
- Merge branch 'feature/私享房需求' of http://git.yabolive.net:88/pidan/FuSiLive into feature/私享房需求 · 483757fa
  ludi committed Jul 09, 2025
  
  483757fa Browse Files
- 调整一个注册后完善信息的ui · 581bfd79
  ludi committed Jul 09, 2025
  
  581bfd79 Browse Files
- Merge branch 'feature/私享房需求' of http://git.yabolive.net:88/pidan/FuSiLive into feature/私享房需求 · a5703a44
```
* 'feature/私享房需求' of http://git.yabolive.net:88/pidan/FuSiLive:
  修复一个相册崩溃问题
```
  pidan committed Jul 09, 2025
  a5703a44 Browse Files
- 首页关注toast弹出逻辑修改 · 74e74f06
  pidan committed Jul 09, 2025
  
  74e74f06 Browse Files
- 修复一个相册崩溃问题 · 847793dd
  ludi committed Jul 09, 2025
  
  847793dd Browse Files
08 Jul, 2025 7 commits

Merge branch 'feature/私享房需求' of http://git.yabolive.net:88/pidan/FuSiLive into feature/私享房需求 · a0f386bf
```
* 'feature/私享房需求' of http://git.yabolive.net:88/pidan/FuSiLive:
  修复一些bug
  修复一个第一次与陌生人拨打私房的时候，会断线的bug
```
pidan committed Jul 08, 2025
a0f386bf Browse Files
修改首页推荐关注的UI · c4cb46f2
pidan committed Jul 08, 2025

c4cb46f2 Browse Files
修复一些bug · cdcac92b
ludi committed Jul 08, 2025

cdcac92b Browse Files
Merge branch 'feature/私享房需求' of http://git.yabolive.net:88/pidan/FuSiLive into feature/私享房需求 · a62f18a2
ludi committed Jul 08, 2025

a62f18a2 Browse Files
修复一个第一次与陌生人拨打私房的时候，会断线的bug · 415434b1
ludi committed Jul 08, 2025

415434b1 Browse Files

Merge branch 'feature/私享房需求' of http://git.yabolive.net:88/pidan/FuSiLive into feature/私享房需求 · a8d27260

* 'feature/私享房需求' of http://git.yabolive.net:88/pidan/FuSiLive:
  1.修改使者码文案变成邀请码。 2.修改绑定使者信息vip格式。 3.调整一些ui。

# Conflicts:
#	DevelopmentPods/FUSFoundation/FUSFoundation/Assets/LocalizationString/Fusi_Chinese.strings
#	DevelopmentPods/FUSFoundation/FUSFoundation/Assets/LocalizationString/Fusi_Chinese_Traditional.strings
#	DevelopmentPods/FUSFoundation/FUSFoundation/Assets/LocalizationString/Fusi_English.strings
#	DevelopmentPods/FUSFoundation/FUSFoundation/Assets/LocalizationString/Fusi_Japanese.strings
#	DevelopmentPods/FUSFoundation/FUSFoundation/Assets/LocalizationString/Fusi_Thai.strings
#	DevelopmentPods/FUSFoundation/FUSFoundation/Assets/LocalizationString/Fusi_vietnamese.strings

committed Jul 08, 2025

a8d27260 Browse Files

1、ui相关的bugs fixed · be1ae3f9
```
2、替换资源
```
pidan committed Jul 08, 2025
be1ae3f9 Browse Files

07 Jul, 2025 1 commit
- 1.修改使者码文案变成邀请码。 · 2631fab5
```
2.修改绑定使者信息vip格式。
3.调整一些ui。
```
  ludi committed Jul 07, 2025
  2631fab5 Browse Files