iOS Team / LiveVideoCloud · Commits

28 Mar, 2017

2 commits

Merge branch 'master' of bj.gitlab.cnlive.com:ios-team/LiveVideoCloud
aea4fd7d

王军波 authored
2017-03-28 10:50:39 +0800
Browse Code »
开始collectionView
1a6759d4

王军波 authored
2017-03-28 10:50:32 +0800
Browse Code »

27 Mar, 2017

14 commits

Merge branch 'master' of bj.gitlab.cnlive.com:ios-team/LiveVideoCloud
ebb60740

张旭 authored
2017-03-27 18:14:35 +0800
Browse Code »
Merge branch 'master' of bj.gitlab.cnlive.com:ios-team/LiveVideoCloud ...
c5978c8e
```
# Conflicts:
#	LiveVideoCloud/LiveVideoCloud.xcodeproj/project.pbxproj
```
张旭 authored
2017-03-27 18:14:27 +0800
Browse Code »
Merge branch 'master' of bj.gitlab.cnlive.com:ios-team/LiveVideoCloud
1294b520

王军波 authored
2017-03-27 17:29:44 +0800
Browse Code »
结束界面
a07077e0

王军波 authored
2017-03-27 17:29:38 +0800
Browse Code »
no message
efed3d62

朱林 authored
2017-03-27 16:59:35 +0800
Browse Code »
Merge branch 'master' of bj.gitlab.cnlive.com:ios-team/LiveVideoCloud
546f1a6e

王军波 authored
2017-03-27 15:50:39 +0800
Browse Code »
准备页面完成
ffa98ca7

王军波 authored
2017-03-27 15:50:30 +0800
Browse Code »
Merge branch 'master' of bj.gitlab.cnlive.com:ios-team/LiveVideoCloud ...
da8f31b8
```
Conflicts:
	LiveVideoCloud/LiveVideoCloud.xcodeproj/project.pbxproj
```
朱林 authored
2017-03-27 15:46:54 +0800
Browse Code »
电视台列表
463923d4

朱林 authored
2017-03-27 15:45:09 +0800
Browse Code »
私聊页面
57e31e4a

张旭 authored
2017-03-27 15:41:16 +0800
Browse Code »
更换SDK
f7db071f

王军波 authored
2017-03-27 15:39:52 +0800
Browse Code »
功能按钮更换
1bd7c2c2

王军波 authored
2017-03-27 15:37:28 +0800
Browse Code »
添加准备界面素材
64f045c6

王军波 authored
2017-03-27 15:02:27 +0800
Browse Code »
准备界面
f514989a

王军波 authored
2017-03-27 15:01:05 +0800
Browse Code »

24 Mar, 2017

2 commits

Merge branch 'master' of bj.gitlab.cnlive.com:ios-team/LiveVideoCloud ...
f325df79
```
# Conflicts:
#	LiveVideoCloud/LiveVideoCloud.xcodeproj/project.pbxproj
```
张旭 authored
2017-03-24 18:37:36 +0800
Browse Code »
完善聊天室和弹幕交互的逻辑
319a2c13

张旭 authored
2017-03-24 18:35:43 +0800
Browse Code »

23 Mar, 2017

3 commits

no message
05694338

朱林 authored
2017-03-23 09:49:07 +0800
Browse Code »
Merge branch 'master' of bj.gitlab.cnlive.com:ios-team/LiveVideoCloud ...
cba0d728
```
Conflicts:
	LiveVideoCloud/LiveVideoCloud/PrefixHeader.pch
```
朱林 authored
2017-03-23 09:41:58 +0800
Browse Code »
解决聊天室cell显示问题
48160bb5

朱林 authored
2017-03-23 09:40:32 +0800
Browse Code »

21 Mar, 2017

8 commits

添加聊天室初始化方法
5a02b24c

张旭 authored
2017-03-21 18:16:11 +0800
Browse Code »
no message
57b55bff

张旭 authored
2017-03-21 17:01:03 +0800
Browse Code »
Merge branch 'master' of bj.gitlab.cnlive.com:ios-team/LiveVideoCloud
466297be

张旭 authored
2017-03-21 16:59:33 +0800
Browse Code »
聊天室页面搭建
72fef683

张旭 authored
2017-03-21 16:59:25 +0800
Browse Code »
结束界面
4a519fe3

王军波 authored
2017-03-21 16:58:19 +0800
Browse Code »
Merge branch 'master' of bj.gitlab.cnlive.com:ios-team/LiveVideoCloud ...
b850bf2b
```
Conflicts:
	LiveVideoCloud/LiveVideoCloud.xcodeproj/project.pbxproj
```
朱林 authored
2017-03-21 13:55:00 +0800
Browse Code »
聊天室输入框
1d5064a8

朱林 authored
2017-03-21 13:54:17 +0800
Browse Code »
添加图片分类,模糊图片
0782c6e7

王军波 authored
2017-03-21 10:26:36 +0800
Browse Code »

20 Mar, 2017

7 commits

Merge branch 'master' of bj.gitlab.cnlive.com:ios-team/LiveVideoCloud
bb25bc8c

王军波 authored
2017-03-20 18:07:18 +0800
Browse Code »
test文件警告
44131d5e

王军波 authored
2017-03-20 18:07:12 +0800
Browse Code »
no message
a4a54f89

张旭 authored
2017-03-20 18:07:06 +0800
Browse Code »
Merge branch 'master' of bj.gitlab.cnlive.com:ios-team/LiveVideoCloud
05954dd7

王军波 authored
2017-03-20 18:04:14 +0800
Browse Code »
直播播放,添加聊天SDK
e7e53d1d

王军波 authored
2017-03-20 18:04:07 +0800
Browse Code »
添加聊天室UI
5565674b

张旭 authored
2017-03-20 18:03:54 +0800
Browse Code »
完善礼物UI,添加歼灭机
24a0a2ac

张旭 authored
2017-03-20 15:44:02 +0800
Browse Code »

17 Mar, 2017

4 commits

Merge branch 'master' of bj.gitlab.cnlive.com:ios-team/LiveVideoCloud
cf9d0686

张旭 authored
2017-03-17 18:06:43 +0800
Browse Code »
完善豪华礼物,连击礼物
43b0a017

张旭 authored
2017-03-17 18:06:35 +0800
Browse Code »
添加UGC直播播放
12f615a1

王军波 authored
2017-03-17 16:46:58 +0800
Browse Code »
错误信息
0b9e891a

王军波 authored
2017-03-17 15:32:40 +0800
Browse Code »