更新了delegate回调的接口
更新了delegate回调的接口
Merge remote-tracking branch 'origin/master'