更新gui

更新gui
解决warning
Merge remote-tracking branch 'remotes/origin/master' into newSkin