ContentView added by wangliang
Merge branch 'develop-stb' of https://github.com/FutureTV/logSys into develop-stb