Merge pull request #37 from whuthm/master

huangming:unify the PreferencesProvider.java code.
Merge pull request #29 from heyongjian/master

huangming:merge the main branch to native branch.