[修改布局，优化代码]
[清理bin]
[deleted some no need files]
resolved conflict