CNLive Android Team / CNLiveApp · Commits

29 Jun, 2017

17 commits

Merge branch 'master' of bj.gitlab.cnlive.com:cnlive-team/CNLiveApp
05ffc32d

朱显松 authored
2017-06-29 20:42:11 +0800
Browse Code »
6.0 用户管理配置补全
3f7e8d94

朱显松 authored
2017-06-29 20:41:58 +0800
Browse File »
Merge branch 'master' of bj.gitlab.cnlive.com:cnlive-team/CNLiveApp
4fd76e52

朱显松 authored
2017-06-29 18:34:06 +0800
Browse Code »
更换首页启动模式，增加Presenter View弱引用
998b6613

朱显松 authored
2017-06-29 18:30:32 +0800
Browse File »
修改资源图
863d764c

谷俊 authored
2017-06-29 18:16:17 +0800
Browse Code »
ugc列表页面添加扩展属性
925595f3

谷俊 authored
2017-06-29 17:45:08 +0800
Browse Code »
直播列表添加状态标签
796eae6b

谷俊 authored
2017-06-29 17:11:02 +0800
Browse Code »
添加手机流量播放设置
a0c67993

谷俊 authored
2017-06-29 16:48:14 +0800
Browse Code »
ugc页面隐藏statusbar
36456b89

谷俊 authored
2017-06-29 16:42:33 +0800
Browse Code »
Merge branch 'master' of bj.gitlab.cnlive.com:cnlive-team/CNLiveApp
3e9adb61

谷俊 authored
2017-06-29 16:37:32 +0800
Browse Code »
修改用户信息编辑页面和修复播放器权限问题
0f74eae9

谷俊 authored
2017-06-29 16:37:14 +0800
Browse File »
更新静态对象，代码整理
22fc6da6

朱显松 authored
2017-06-29 16:21:08 +0800
Browse File »
去除测试Log
e3c2f052

朱显松 authored
2017-06-29 14:41:22 +0800
Browse Code »
Merge branch 'master' of bj.gitlab.cnlive.com:cnlive-team/CNLiveApp ...
0909b53a
```
Conflicts:
	app/src/main/java/com/cnlive/gundam/main/application/CNLiveApplication.java
```
朱显松 authored
2017-06-29 14:34:47 +0800
Browse Code »
区分接口地址
01643e3d

朱显松 authored
2017-06-29 14:32:58 +0800
Browse Code »
修改及测试接口
15f895b0

谷俊 authored
2017-06-29 10:16:44 +0800
Browse Code »
添加融云
ce07866a

陈硕 authored
2017-06-29 09:36:25 +0800
Browse File »

28 Jun, 2017

23 commits

Merge branch 'master' of bj.gitlab.cnlive.com:cnlive-team/CNLiveApp
4392346d

陈硕 authored
2017-06-28 21:23:25 +0800
Browse Code »
添加聊天
db9c45f0

陈硕 authored
2017-06-28 21:23:12 +0800
Browse Code »
Merge branch 'master' of bj.gitlab.cnlive.com:cnlive-team/CNLiveApp
8729902d

朱显松 authored
2017-06-28 20:20:02 +0800
Browse File »
增加推流鉴权
86228b37

朱显松 authored
2017-06-28 20:19:54 +0800
Browse File »
合并
576a7725

谷俊 authored
2017-06-28 18:24:49 +0800
Browse File »
合并
bebbeaf2

谷俊 authored
2017-06-28 18:17:50 +0800
Browse File »
添加编辑用户信息页面及接口
9921f315

谷俊 authored
2017-06-28 18:15:33 +0800
Browse File »
修改页面布局
54453777

陈硕 authored
2017-06-28 17:54:49 +0800
Browse Code »
修改页面布局
dee81be7

陈硕 authored
2017-06-28 17:42:51 +0800
Browse Code »
删除多余的文件
c7a02c33

陈硕 authored
2017-06-28 17:41:14 +0800
Browse File »
代码整理
83292208

朱显松 authored
2017-06-28 17:24:26 +0800
Browse Code »
代码整理
970c6223

朱显松 authored
2017-06-28 17:23:35 +0800
Browse Dir »
修改页面布局
c77a0d75

陈硕 authored
2017-06-28 16:22:23 +0800
Browse File »
资源文件整理
1dbeaaec

朱显松 authored
2017-06-28 16:15:08 +0800
Browse Code »
资源文件整理
d0605ec1

朱显松 authored
2017-06-28 16:00:24 +0800
Browse Dir »
Merge branch 'master' of bj.gitlab.cnlive.com:cnlive-team/CNLiveApp ...
dfae0dfa
```
Conflicts:
	app/src/main/res/values/colors.xml
	app/src/main/res/values/dimens.xml
	app/src/main/res/values/styles.xml
```
朱显松 authored
2017-06-28 15:13:43 +0800
Browse File »
去掉无用类
f436290c

谷俊 authored
2017-06-28 14:54:36 +0800
Browse Code »
提交gradle文件
01c7920a

陈硕 authored
2017-06-28 14:49:11 +0800
Browse Dir »
提交资源文件
d7ab9500

陈硕 authored
2017-06-28 14:48:07 +0800
Browse Code »
合并代码
95d458e1

陈硕 authored
2017-06-28 14:44:57 +0800
Browse Dir »
修改user
b0c461a7

陈硕 authored
2017-06-28 14:40:01 +0800
Browse Dir »
创建 user
d547ff71

陈硕 authored
2017-06-28 14:38:43 +0800
Browse Code »
Merge branch 'master' of bj.gitlab.cnlive.com:cnlive-team/CNLiveApp
e9ea17b5

朱显松 authored
2017-06-28 14:37:23 +0800
Browse Code »