Commits | 26d467de4f1614fdc7b4d47dd5b052dace57b80b | iOS Team / LiveVideoCloud

30 Mar, 2017

1 commit

修复bug
26d467de

朱林 authored
2017-03-30 17:55:22 +0800
Browse Code »

29 Mar, 2017

13 commits

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

朱林 authored
2017-03-29 19:11:22 +0800
Browse Code »
添加首页切换view
05aa016e

朱林 authored
2017-03-29 19:11:15 +0800
Browse Code »
Merge branch 'master' of bj.gitlab.cnlive.com:ios-team/LiveVideoCloud
73e31a2d

王军波 authored
2017-03-29 17:14:16 +0800
Browse Code »
列表修改
a8c82fe0

王军波 authored
2017-03-29 17:14:10 +0800
Browse Code »

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

Conflicts:
	LiveVideoCloud/LiveVideoCloud/AppDelegate/AppDelegate.m
	LiveVideoCloud/LiveVideoCloud/Classes/Sections/LiveSections/Controller/LVCLiveViewController.m

authored

2017-03-29 17:13:31 +0800

Browse Code »

完成弹幕逻辑，修改AppId
45591957

朱林 authored
2017-03-29 17:11:57 +0800
Browse Code »
Merge branch 'master' of bj.gitlab.cnlive.com:ios-team/LiveVideoCloud
7e4f59a6

王军波 authored
2017-03-29 16:17:49 +0800
Browse Code »
上下切换及加载视图
b9af0a70

王军波 authored
2017-03-29 16:17:41 +0800
Browse Code »
取消监听歼灭机动画通知
309568ae

张旭 authored
2017-03-29 15:01:58 +0800
Browse Code »
替换成View实现
54dda7ae

王军波 authored
2017-03-29 11:53:56 +0800
Browse Code »
转移UICollectionview
f8678cc1

王军波 authored
2017-03-29 10:42:35 +0800
Browse Code »
Merge branch 'master' of bj.gitlab.cnlive.com:ios-team/LiveVideoCloud
ddcd8641

王军波 authored
2017-03-29 10:24:40 +0800
Browse Code »
尝试UICollectionview
3d860694

王军波 authored
2017-03-29 10:24:08 +0800
Browse Code »

28 Mar, 2017

9 commits

no message
e98d288e

朱林 authored
2017-03-28 17:27:29 +0800
Browse Code »
Merge branch 'master' of bj.gitlab.cnlive.com:ios-team/LiveVideoCloud ...
82321daa
```
Conflicts:
	LiveVideoCloud/LiveVideoCloud/Classes/Sections/homeSections/Controller/HomeViewController.m
```
朱林 authored
2017-03-28 17:15:20 +0800
Browse Code »
no message
c5309b94

朱林 authored
2017-03-28 17:14:41 +0800
Browse Code »

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

2d64d84c

# Conflicts:
#	LiveVideoCloud/LiveVideoCloud/Classes/Sections/LiveSections/Controller/LVCLiveViewController.m
#	LiveVideoCloud/LiveVideoCloud/Classes/Sections/homeSections/Controller/HomeViewController.m

authored

2017-03-28 17:06:22 +0800

Browse Code »

整合推流和交互页面
69c0eaec

张旭 authored
2017-03-28 17:04:10 +0800
Browse Code »
加载数据
40a8c565

王军波 authored
2017-03-28 15:37:18 +0800
Browse Code »
cell添加加载视图,播放器,创建model
5ef3a431

王军波 authored
2017-03-28 11:03:13 +0800
Browse Code »
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