分辨率适配
Merge branch 'hotfix/resolutions-adaptation'