test
Revert "test"

This reverts commit b9140ffdad5c8fb065c4dd6dd943be44f353460f.
Merge pull request #22 from heyongjian/master

merger
modify bug when the joyfolder switch to ios
Merge pull request #48 from lwanghaol/master

wanghao:modify bug when the joyfolder switch to ios