修改了输入不合法的判断
Merge branch 'master' of http://github.com/20kg/iPhone2014