.
Merge branch 'master' of https://github.com/zhangxigithub/TV

Conflicts:

电视助手.xcodeproj/project.xcworkspace/xcuserdata/zhangxi.xcuserdatad/UserIn
terfaceState.xcuserstate