Merge branch 'dev_huanleduanju_0815' of...

Merge branch 'dev_huanleduanju_0815' of http://gitlab.mints-id.com/android/android_vedio into dev_huanleduanju_0815

# Conflicts:
#	video/app/src/main/java/com/duben/happyplaylet/ui/activitys/VipActivity.kt