fix video player
Merge branch 'chatPage' into phase1