test
调整setResult逻辑
取消长按变黑
Merge remote-tracking branch 'origin/liuyang_dev' into liuyang_dev