Merge branch 'ios-feature-layoutanimation-0.16dev' of https://github.com/doumafang/incubator-weex into wip-us-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/ee94722c Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/ee94722c Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/ee94722c Branch: refs/heads/0.16-dev Commit: ee94722cf22a97778011a7dff3d02b16002ff3f1 Parents: 46b98bb 7a4ee93 Author: acton393 <zhangxing610...@gmail.com> Authored: Tue Aug 15 10:49:12 2017 +0800 Committer: acton393 <zhangxing610...@gmail.com> Committed: Tue Aug 15 10:49:12 2017 +0800 ---------------------------------------------------------------------- ios/sdk/WeexSDK.xcodeproj/project.pbxproj | 24 +- .../Sources/Component/WXComponent_internal.h | 12 + .../Sources/Display/WXComponent+Display.m | 16 +- .../WeexSDK/Sources/Layout/WXComponent+Layout.m | 3 +- ios/sdk/WeexSDK/Sources/Model/WXComponent.m | 67 +++- .../WeexSDK/Sources/Module/WXAnimationLayout.h | 49 --- .../WeexSDK/Sources/Module/WXAnimationLayout.m | 115 ------- .../WeexSDK/Sources/Module/WXAnimationModule.h | 2 + .../WeexSDK/Sources/Module/WXAnimationModule.m | 88 ++++-- ios/sdk/WeexSDK/Sources/Module/WXTransition.h | 43 +++ ios/sdk/WeexSDK/Sources/Module/WXTransition.m | 311 +++++++++++++++++++ ios/sdk/WeexSDK/Sources/Utility/WXConvert.m | 3 +- 12 files changed, 516 insertions(+), 217 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/ee94722c/ios/sdk/WeexSDK.xcodeproj/project.pbxproj ---------------------------------------------------------------------- diff --cc ios/sdk/WeexSDK.xcodeproj/project.pbxproj index 809c2a6,db577c6..4f9d6fd --- a/ios/sdk/WeexSDK.xcodeproj/project.pbxproj +++ b/ios/sdk/WeexSDK.xcodeproj/project.pbxproj @@@ -1662,9 -1632,9 +1662,10 @@@ DCA445B91EFA579D00D0CFA8 /* WXErrorView.h in Headers */, DCA445A01EFA56F400D0CFA8 /* WXType.h in Headers */, DCA445B21EFA576D00D0CFA8 /* WXListComponent.h in Headers */, + 333D9A281F41507A007CED39 /* WXTransition.h in Headers */, DCA445A51EFA571600D0CFA8 /* WXSDKError.h in Headers */, DCA445AD1EFA575100D0CFA8 /* WXNavigationProtocol.h in Headers */, + C42E8FAF1F3C7C4B001EBE9D /* WXRecyclerDragController.h in Headers */, DCA445B01EFA576200D0CFA8 /* WXModalUIModule.h in Headers */, DCA445A61EFA571E00D0CFA8 /* WXSDKEngine.h in Headers */, DCA445AA1EFA573900D0CFA8 /* WXResourceRequest.h in Headers */, @@@ -2211,9 -2173,7 +2211,8 @@@ DCA445661EFA55B300D0CFA8 /* WXNavigatorModule.m in Sources */, DCA445671EFA55B300D0CFA8 /* WXStorageModule.m in Sources */, DCA445681EFA55B300D0CFA8 /* WXStreamModule.m in Sources */, + C42E8FAC1F3C7C3B001EBE9D /* WXExtendCallNativeManager.m in Sources */, DCA445691EFA55B300D0CFA8 /* WXAnimationModule.m in Sources */, - DCA4456A1EFA55B300D0CFA8 /* WXAnimationLayout.m in Sources */, DCA4456B1EFA55B300D0CFA8 /* WXInstanceWrap.m in Sources */, DCA4456C1EFA55B300D0CFA8 /* WXDomModule.m in Sources */, DCA4456D1EFA55B300D0CFA8 /* WXTimerModule.m in Sources */, http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/ee94722c/ios/sdk/WeexSDK/Sources/Model/WXComponent.m ----------------------------------------------------------------------
