Refactor the mockapp code
Merge branch 'development' of https://github.com/DIdiHL/plugin_android_library into zhaoyue

"Refactor the Mockapp code"
Merge pull request #21 from DIdiHL/zhaoyue

Refactor