bugs fixed

Signed-off-by: songyang <waoywssy@gmail.com>
Merge branch 'master' of https://github.com/huanggang/boryi.mobile