Merge branch '0.16-dev' of https://github.com/kfeagle/incubator-weex into ios-feature-0.16-dev
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/d0edeeae Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/d0edeeae Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/d0edeeae Branch: refs/heads/0.16-dev Commit: d0edeeaecde26f46a2d4538a14d4640b03ab743f Parents: 68f279a 09fc591 Author: acton393 <zhangxing610...@gmail.com> Authored: Tue Aug 29 13:23:57 2017 +0800 Committer: acton393 <zhangxing610...@gmail.com> Committed: Tue Aug 29 13:23:57 2017 +0800 ---------------------------------------------------------------------- .../Sources/Controller/WXBaseViewController.m | 4 +- ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m | 4 +- .../WeexSDK/Sources/Module/WXPrerenderManager.h | 15 +++++ .../WeexSDK/Sources/Module/WXPrerenderManager.m | 62 ++++++++++++++++---- 4 files changed, 71 insertions(+), 14 deletions(-) ----------------------------------------------------------------------
