CNLive Android Team / CNStreamDemo · Commits

30 Nov, 2016

2 commits

Merge branch 'master' of bj.gitlab.cnlive.com:cnlive-team/CNStreamDemo ...
f54df245
```
Conflicts:
	app/libs/libcnlivestream.jar
	app/libs/libcnliveutil.jar
```
朱显松 authored
2016-11-30 16:35:43 +0800
Browse Dir »
取消方法 stopStream(ActivityConfig) 统一调用 stopStream()
e344f133

朱显松 authored
2016-11-30 16:34:00 +0800
Browse Dir »

28 Nov, 2016

1 commit

修改传参
d3231b3e

王琳 authored
2016-11-28 11:34:34 +0800
Browse Dir »

24 Nov, 2016

1 commit

更新jar包
e9471c37

王琳 authored
2016-11-24 11:48:01 +0800
Browse Dir »

23 Nov, 2016

2 commits

Merge remote-tracking branch 'origin/master' ...
df373f60
```
Conflicts:
	app/libs/libcnlivestream.jar
```
王琳 authored
2016-11-23 19:51:14 +0800
Browse Code »
添加推流SDK说明文档
58eb42ee

王琳 authored
2016-11-23 19:47:10 +0800
Browse Dir »

18 Nov, 2016

1 commit

添加日志输出
ea8dcf88

朱显松 authored
2016-11-18 17:58:35 +0800
Browse Code »

15 Nov, 2016

1 commit

修改推流demo
6e73e81b

王琳 authored
2016-11-15 09:25:09 +0800
Browse Code »

14 Nov, 2016

1 commit

修改水印图片不显示问题
712a075f

王琳 authored
2016-11-14 09:10:37 +0800
Browse Dir »

11 Nov, 2016

1 commit

更新推流Jar包
6f8847bd

王琳 authored
2016-11-11 19:36:22 +0800
Browse File »

22 Sep, 2016

1 commit

更新Jar
7158a8f8

朱显松 authored
2016-09-22 15:09:38 +0800
Browse Dir »

14 Sep, 2016

1 commit

添加活动创建完成事件
e43bd087

朱显松 authored
2016-09-14 18:57:27 +0800
Browse File »

07 Sep, 2016

2 commits

修改打印log日志格式
31c2f5b4

王琳 authored
2016-09-07 13:39:18 +0800
Browse Code »
推流Demo
a1f9adf4

王琳 authored
2016-09-07 12:37:36 +0800
Browse Code »