iOS Team / LiveVideoCloud · Commits

29 Jun, 2017

15 commits

接受礼物的展示逻辑,不接受历史消息
5be2c6d4

张旭 authored
2017-06-29 19:15:21 +0800
Browse Code »
接受礼物展示动画
3a27b875

张旭 authored
2017-06-29 18:58:15 +0800
Browse Code »
sfdsf
34eba323

王军波 authored
2017-06-29 18:42:30 +0800
Browse Code »
Merge branch 'master' of bj.gitlab.cnlive.com:ios-team/LiveVideoCloud ...
9578757d
```
# Conflicts:
#	LiveVideoCloud/AppDelegate/AppDelegate.m
```
张旭 authored
2017-06-29 18:21:03 +0800
Browse Code »
Merge branch 'master' of bj.gitlab.cnlive.com:ios-team/LiveVideoCloud ...
d5031810
```
# Conflicts:
#	LiveVideoCloud/AppDelegate/AppDelegate.m
```
张旭 authored
2017-06-29 18:20:20 +0800
Browse Code »
接口调整
d451b0f3

王军波 authored
2017-06-29 18:19:35 +0800
Browse Code »
发礼物走聊天室
4d52ddc8

张旭 authored
2017-06-29 18:19:02 +0800
Browse Code »
修改直播推流的头像和名称,以及加入聊天室设置
80f706e3

王军波 authored
2017-06-29 13:46:07 +0800
Browse Code »
直播推流修改
351b0e4c

王军波 authored
2017-06-29 11:13:59 +0800
Browse Code »
Merge branch 'master' of bj.gitlab.cnlive.com:ios-team/LiveVideoCloud
05ef50d3

王军波 authored
2017-06-29 10:39:30 +0800
Browse Code »
点播列表更换接口
9e9ffc43

王军波 authored
2017-06-29 10:39:23 +0800
Browse Code »
Merge branch 'master' of bj.gitlab.cnlive.com:ios-team/LiveVideoCloud
70c942db

张旭 authored
2017-06-29 10:27:09 +0800
Browse Code »
liveBaseView增加roomId
e0ccedc1

张旭 authored
2017-06-29 10:27:04 +0800
Browse Code »
Merge branch 'master' of bj.gitlab.cnlive.com:ios-team/LiveVideoCloud
90ae6bf0

王军波 authored
2017-06-29 09:36:15 +0800
Browse Code »
评论
fabe44c5

王军波 authored
2017-06-29 09:36:05 +0800
Browse Code »

28 Jun, 2017

23 commits

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

朱林 authored
2017-06-28 19:00:55 +0800
Browse Code »
删除
f67aacb0

朱林 authored
2017-06-28 19:00:49 +0800
Browse Code »
Merge branch 'master' of bj.gitlab.cnlive.com:ios-team/LiveVideoCloud
aa09b669

王军波 authored
2017-06-28 17:31:41 +0800
Browse Code »
评论
7ee04658

王军波 authored
2017-06-28 17:31:35 +0800
Browse Code »
no message
c3e40e02

朱林 authored
2017-06-28 17:29:01 +0800
Browse Code »
Merge branch 'master' of bj.gitlab.cnlive.com:ios-team/LiveVideoCloud
507b96f6

张旭 authored
2017-06-28 17:11:30 +0800
Browse Code »
修改认证Url传参
c0dcdcad

张旭 authored
2017-06-28 17:11:23 +0800
Browse Code »
更换测试统计聊天SDK
4aa2d729

王军波 authored
2017-06-28 15:30:48 +0800
Browse Code »
Merge branch 'master' of bj.gitlab.cnlive.com:ios-team/LiveVideoCloud
1cb2a9eb

王军波 authored
2017-06-28 15:03:00 +0800
Browse Code »
hah
35955189

王军波 authored
2017-06-28 15:02:54 +0800
Browse Code »
serverUrl
67182f12

张旭 authored
2017-06-28 15:02:10 +0800
Browse Code »
更改HttpServer域名,增加统一测试接口
53d314f5

张旭 authored
2017-06-28 14:38:16 +0800
Browse Code »
Merge branch 'master' of bj.gitlab.cnlive.com:ios-team/LiveVideoCloud ...
a10978c7
```
# Conflicts:
#	LiveVideoCloud.xcodeproj/xcuserdata/cnlive.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
```
张旭 authored
2017-06-28 13:40:52 +0800
Browse Code »
no message
818e3f0e

张旭 authored
2017-06-28 13:39:24 +0800
Browse Code »
Merge branch 'master' of bj.gitlab.cnlive.com:ios-team/LiveVideoCloud ...
a806b970
```
# Conflicts:
#	LiveVideoCloud/AppDelegate/AppDelegate.m
```
王军波 authored
2017-06-28 13:36:32 +0800
Browse Code »
控件
95e8023c

王军波 authored
2017-06-28 13:34:43 +0800
Browse Code »
Merge branch 'master' of bj.gitlab.cnlive.com:ios-team/LiveVideoCloud
7d4c4b5f

张旭 authored
2017-06-28 13:31:26 +0800
Browse Code »
修改用户代码和tabbar
6137bf4a

张旭 authored
2017-06-28 13:31:20 +0800
Browse Code »
Merge branch 'master' of bj.gitlab.cnlive.com:ios-team/LiveVideoCloud
fe5ffd1c

朱林 authored
2017-06-28 13:21:57 +0800
Browse Code »
no message
c3c408e1

朱林 authored
2017-06-28 13:21:51 +0800
Browse Code »
no message
1508a4ff

朱林 authored
2017-06-28 13:21:28 +0800
Browse Code »

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

# Conflicts:
#	LiveVideoCloud.xcodeproj/project.pbxproj
#	LiveVideoCloud.xcodeproj/xcuserdata/cnlive.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

authored

2017-06-28 09:53:08 +0800

播放,全屏
59cf3b1c

王军波 authored
2017-06-28 09:29:34 +0800
Browse Code »

27 Jun, 2017

2 commits

Merge branch 'master' of bj.gitlab.cnlive.com:ios-team/LiveVideoCloud ...
65cd56af
```
# Conflicts:
#	LiveVideoCloud.xcodeproj/project.pbxproj
#	LiveVideoCloud/PrefixHeader.pch
```
张旭 authored
2017-06-27 18:41:40 +0800
Browse Code »
更新三方SDK,更新用户SDK测试开关
05a8b790

张旭 authored
2017-06-27 18:18:01 +0800
Browse Code »