update
Signed-off-by: gongsi <gongsi@163.com>
Merge branch 'gongsi' into develop

Conflicts:
	gen/com/weipai/R.java
修改获取视频地址
Signed-off-by: gongsi <gongsi@163.com>
sss
Signed-off-by: li <li@163.com>