[WEEX-311] [iOS] use new layoutEngin to replace yoga * [iOS] support new flex-layout engine
* [iOS] update layout engin * [iOS] fix recycleList copy node error * [iOS] rm useless code * [iOS] rtl old layout engin * [iOS] rm uselse code * [iOS] format log * [iOS] rm useless code close #1135 Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/b77b4259 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/b77b4259 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/b77b4259 Branch: refs/heads/master Commit: b77b42599e763b2e25a63d6a9c576eeb388494dd Parents: bf14bcd Author: MrRaindrop <tekk...@gmail.com> Authored: Tue Oct 31 22:15:05 2017 +0800 Committer: acton393 <zhangxing610...@gmail.com> Committed: Thu Apr 26 20:38:59 2018 +0800 ---------------------------------------------------------------------- WeexSDK.podspec | 2 +- ios/playground/WeexDemo/WXExtModule.m | 7 + ios/sdk/WeexSDK.xcodeproj/project.pbxproj | 327 ++-- .../WeexSDK/Sources/Bridge/WXBridgeContext.m | 38 + .../Component/RecycleList/WXCellSlotComponent.m | 94 - .../RecycleList/WXCellSlotComponent.mm | 117 ++ .../RecycleList/WXRecycleListComponent.m | 618 ------ .../RecycleList/WXRecycleListComponent.mm | 619 ++++++ .../Component/Recycler/WXRecyclerComponent.m | 738 ------- .../Component/Recycler/WXRecyclerComponent.mm | 768 ++++++++ .../WeexSDK/Sources/Component/WXCellComponent.m | 145 -- .../Sources/Component/WXCellComponent.mm | 174 ++ .../Sources/Component/WXComponent_internal.h | 11 +- .../Sources/Component/WXCycleSliderComponent.m | 681 ------- .../Sources/Component/WXCycleSliderComponent.mm | 692 +++++++ .../WeexSDK/Sources/Component/WXEditComponent.m | 918 --------- .../Sources/Component/WXEditComponent.mm | 971 ++++++++++ .../Sources/Component/WXHeaderComponent.m | 87 - .../Sources/Component/WXHeaderComponent.mm | 110 ++ .../WeexSDK/Sources/Component/WXListComponent.m | 975 ---------- .../Sources/Component/WXListComponent.mm | 997 ++++++++++ .../Sources/Component/WXLoadingComponent.m | 152 -- .../Sources/Component/WXLoadingComponent.mm | 164 ++ .../Sources/Component/WXRefreshComponent.m | 207 -- .../Sources/Component/WXRefreshComponent.mm | 224 +++ .../Sources/Component/WXScrollerComponent.h | 2 - .../Sources/Component/WXScrollerComponent.m | 884 --------- .../Sources/Component/WXScrollerComponent.mm | 951 +++++++++ .../Component/WXSliderNeighborComponent.m | 1803 ----------------- .../Component/WXSliderNeighborComponent.mm | 1812 ++++++++++++++++++ .../Sources/Component/WXSwitchComponent.m | 151 -- .../Sources/Component/WXSwitchComponent.mm | 162 ++ .../Sources/Component/WXTextAreaComponent.m | 233 --- .../Sources/Component/WXTextAreaComponent.mm | 261 +++ .../WeexSDK/Sources/Component/WXTextComponent.m | 1076 ----------- .../Sources/Component/WXTextComponent.mm | 1170 +++++++++++ ios/sdk/WeexSDK/Sources/Engine/WXSDKEngine.m | 2 + .../WeexSDK/Sources/Layout/WXComponent+Layout.h | 60 +- .../Sources/Layout/WXComponent+Layout.mm | 963 ++++++++++ ios/sdk/WeexSDK/Sources/Layout/WXCoreFlexEnum.h | 107 ++ ios/sdk/WeexSDK/Sources/Layout/WXCoreLayout.cpp | 1038 ++++++++++ ios/sdk/WeexSDK/Sources/Layout/WXCoreLayout.h | 1073 +++++++++++ ios/sdk/WeexSDK/Sources/Layout/WXCoreStyle.cpp | 247 +++ ios/sdk/WeexSDK/Sources/Layout/WXCoreStyle.h | 285 +++ ios/sdk/WeexSDK/Sources/Layout/WXLayoutDefine.h | 6 + .../Sources/Layout/WXScrollerComponent+Layout.h | 42 + .../Layout/WXScrollerComponent+Layout.mm | 53 + .../Sources/Manager/WXComponentManager.m | 958 --------- .../Sources/Manager/WXComponentManager.mm | 1158 +++++++++++ ios/sdk/WeexSDK/Sources/Model/WXComponent.h | 13 +- ios/sdk/WeexSDK/Sources/Model/WXComponent.m | 842 -------- ios/sdk/WeexSDK/Sources/Model/WXComponent.mm | 953 +++++++++ ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m | 16 +- ios/sdk/WeexSDK/Sources/Module/WXTransition.m | 519 ----- ios/sdk/WeexSDK/Sources/Module/WXTransition.mm | 519 +++++ ios/sdk/WeexSDK/Sources/Utility/WXConvert.m | 23 + ios/sdk/WeexSDK/Sources/Utility/WXUtility.h | 17 +- .../Sources/View/WXComponent+ViewManagement.m | 346 ---- .../Sources/View/WXComponent+ViewManagement.mm | 347 ++++ ios/sdk/WeexSDK/Sources/View/WXRootView.m | 2 +- ios/sdk/WeexSDK/Sources/WeexSDK.h | 4 + 61 files changed, 16358 insertions(+), 11576 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/b77b4259/WeexSDK.podspec ---------------------------------------------------------------------- diff --git a/WeexSDK.podspec b/WeexSDK.podspec index 21f80ee..53f0a17 100644 --- a/WeexSDK.podspec +++ b/WeexSDK.podspec @@ -27,7 +27,7 @@ Pod::Spec.new do |s| s.platform = :ios s.ios.deployment_target = '8.0' s.source = { :path => '.' } - s.source_files = 'ios/sdk/WeexSDK/Sources/**/*.{h,m,mm,c}' + s.source_files = 'ios/sdk/WeexSDK/Sources/**/*.{h,m,mm,c,cpp}' s.resources = 'pre-build/*.js','ios/sdk/WeexSDK/Resources/wx_load_er...@3x.png' s.user_target_xcconfig = { 'FRAMEWORK_SEARCH_PATHS' => "'$(PODS_ROOT)/WeexSDK'" } http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/b77b4259/ios/playground/WeexDemo/WXExtModule.m ---------------------------------------------------------------------- diff --git a/ios/playground/WeexDemo/WXExtModule.m b/ios/playground/WeexDemo/WXExtModule.m index fe034e7..16b2e0a 100644 --- a/ios/playground/WeexDemo/WXExtModule.m +++ b/ios/playground/WeexDemo/WXExtModule.m @@ -32,8 +32,15 @@ WX_EXPORT_METHOD(@selector(generateCover:)) setenv("GCOV_PREFIX", [documentsDirectory cStringUsingEncoding:NSUTF8StringEncoding], 1); setenv("GCOV_PREFIX_STRIP", "6", 1); #endif + +#if defined __cplusplus + extern "C" { +#endif extern void __gcov_flush(void); __gcov_flush(); +#if defined __cplusplus + }; +#endif if (callback) { NSDictionary * result = @{@"ok": @true};