Merge pull request #2 from heyongjian/master

merger
update the desktop settings
Merge pull request #6 from lwanghaol/master

wanghao：update the desktop settings
Merge pull request #5 from heyongjian/master

huangming:merge the main branch to native branch.