Improve screen solution adapter
Merge branch 'master' of https://github.com/TopLittlebob/Demo0.1