+ [ios] add super view for scrollcomponent
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/af8c97d7 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/af8c97d7 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/af8c97d7 Branch: refs/heads/0.16-dev Commit: af8c97d7b2d8b128ca7f36c2e5133fa3d3b01186 Parents: 5cbb83e Author: é½å±± <[email protected]> Authored: Thu Jul 20 12:06:41 2017 +0800 Committer: é½å±± <[email protected]> Committed: Thu Jul 20 12:06:41 2017 +0800 ---------------------------------------------------------------------- ios/sdk/WeexSDK/Sources/Component/WXScrollerComponent.m | 1 + ios/sdk/WeexSDK/Sources/Manager/WXTracingManager.m | 10 +++++----- ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/af8c97d7/ios/sdk/WeexSDK/Sources/Component/WXScrollerComponent.m ---------------------------------------------------------------------- diff --git a/ios/sdk/WeexSDK/Sources/Component/WXScrollerComponent.m b/ios/sdk/WeexSDK/Sources/Component/WXScrollerComponent.m index 9798b41..c4c324a 100644 --- a/ios/sdk/WeexSDK/Sources/Component/WXScrollerComponent.m +++ b/ios/sdk/WeexSDK/Sources/Component/WXScrollerComponent.m @@ -135,6 +135,7 @@ WX_EXPORT_METHOD(@selector(resetLoadmore)) - (void)viewDidLoad { + [super viewDidLoad]; [self setContentSize:_contentSize]; UIScrollView* scrollView = (UIScrollView *)self.view; scrollView.delegate = self; http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/af8c97d7/ios/sdk/WeexSDK/Sources/Manager/WXTracingManager.m ---------------------------------------------------------------------- diff --git a/ios/sdk/WeexSDK/Sources/Manager/WXTracingManager.m b/ios/sdk/WeexSDK/Sources/Manager/WXTracingManager.m index 653c192..e5bfb65 100644 --- a/ios/sdk/WeexSDK/Sources/Manager/WXTracingManager.m +++ b/ios/sdk/WeexSDK/Sources/Manager/WXTracingManager.m @@ -223,7 +223,7 @@ tracing.className = [self getclassName:tracing]; } if([WXTNetworkHanding isEqualToString:task.tag]){ - if([WXTDataHanding isEqualToString:tracing.name]){ + if([WXTExecJS isEqualToString:tracing.name]){ NSMutableArray *tracings = task.tracings; [tracings enumerateObjectsWithOptions:NSEnumerationReverse usingBlock:^(WXTracing *bTracing, NSUInteger idx, BOOL *stop) { if(([WXTNetworkHanding isEqualToString:bTracing.name] || [bTracing.ref isEqualToString:tracing.ref])&&[WXTracingBegin isEqualToString:bTracing.ph]){ @@ -234,19 +234,18 @@ newTracing.duration = newTracing.ts - bTracing.ts ; bTracing.duration = newTracing.duration; [task.tracings addObject:newTracing]; - NSLog(@"jerry0 %f,%f",bTracing.ts,bTracing.duration); *stop = YES; } }]; - task.tag = WXTDataHanding; + task.tag = WXTExecJS; } } - if([WXTDataHanding isEqualToString:task.tag]){ + if([WXTExecJS isEqualToString:task.tag]){ if([WXTJSCall isEqualToString:tracing.name]){ NSMutableArray *tracings = task.tracings; [tracings enumerateObjectsWithOptions:NSEnumerationReverse usingBlock:^(WXTracing *bTracing, NSUInteger idx, BOOL *stop) { - if(([WXTDataHanding isEqualToString:bTracing.name] || [bTracing.ref isEqualToString:tracing.ref])&&[WXTracingBegin isEqualToString:bTracing.ph]){ + if(([WXTExecJS isEqualToString:bTracing.name] || [bTracing.ref isEqualToString:tracing.ref])&&[WXTracingBegin isEqualToString:bTracing.ph]){ WXTracing *newTracing = [self copyTracing:bTracing]; newTracing.iid = tracing.iid; newTracing.ph = WXTracingEnd; @@ -269,6 +268,7 @@ WXComponent *com = [instance componentForRef:tracing.ref]; if(com.supercomponent){ tracing.parentRef = com.supercomponent.ref; + task.bundleUrl = [instance.scriptURL absoluteString]; } }); http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/af8c97d7/ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m ---------------------------------------------------------------------- diff --git a/ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m b/ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m index 4e2b8a7..d81e4a7 100644 --- a/ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m +++ b/ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m @@ -202,7 +202,7 @@ typedef enum : NSUInteger { [[WXSDKManager bridgeMgr] createInstance:self.instanceId template:mainBundleString options:dictionary data:_jsData]; - [WXTracingManager startTracing:self.instanceId ref:nil parentRef:nil className:nil name:WXTDataHanding ph:WXTracingBegin fName:@"renderWithMainBundleString" parentId:nil]; + [WXTracingManager startTracing:self.instanceId ref:nil parentRef:nil className:nil name:WXTExecJS ph:WXTracingBegin fName:@"renderWithMainBundleString" parentId:nil]; WX_MONITOR_PERF_SET(WXPTBundleSize, [mainBundleString lengthOfBytesUsingEncoding:NSUTF8StringEncoding], self); }
