修改 表情，键盘，弹框切换
Merge remote-tracking branch 'origin/master'