改进视图与控制器类

Change-Id: I01695136da559d48af3aed970d04b4e06356a870