fix some bug
fix some bug
fix some bug
Merge branch 'master' of https://github.com/tungha/DiamondTest into resultScreen