You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by bo...@apache.org on 2017/04/21 10:03:13 UTC
[1/4] incubator-weex git commit: + [ios] support timeline
Repository: incubator-weex
Updated Branches:
refs/heads/0.12-dev 2a862c90b -> 099add0eb
+ [ios] support timeline
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/0bff42e2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/0bff42e2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/0bff42e2
Branch: refs/heads/0.12-dev
Commit: 0bff42e2fa1813d2ee12dd32fc7870f8fc09672b
Parents: bcb5e89
Author: \u9f50\u5c71 <su...@163.com>
Authored: Thu Apr 20 23:47:08 2017 +0800
Committer: \u9f50\u5c71 <su...@163.com>
Committed: Thu Apr 20 23:47:08 2017 +0800
----------------------------------------------------------------------
ios/sdk/WeexSDK/Sources/Loader/WXResourceLoader.m | 6 ++++++
ios/sdk/WeexSDK/Sources/Network/WXResourceRequestHandler.h | 3 +++
.../Sources/Network/WXResourceRequestHandlerDefaultImpl.m | 6 ++++++
3 files changed, 15 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/0bff42e2/ios/sdk/WeexSDK/Sources/Loader/WXResourceLoader.m
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Loader/WXResourceLoader.m b/ios/sdk/WeexSDK/Sources/Loader/WXResourceLoader.m
index 815f8e3..592cb3a 100644
--- a/ios/sdk/WeexSDK/Sources/Loader/WXResourceLoader.m
+++ b/ios/sdk/WeexSDK/Sources/Loader/WXResourceLoader.m
@@ -182,4 +182,10 @@
_response = nil;
}
+- (void)request:(WXResourceRequest *)request didFinishCollectingMetrics:(NSURLSessionTaskMetrics *)metrics
+{
+ WXLogDebug(@"request:%@ didFinishCollectingMetrics", request);
+}
+
+
@end
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/0bff42e2/ios/sdk/WeexSDK/Sources/Network/WXResourceRequestHandler.h
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Network/WXResourceRequestHandler.h b/ios/sdk/WeexSDK/Sources/Network/WXResourceRequestHandler.h
index 72241bf..2ec4110 100644
--- a/ios/sdk/WeexSDK/Sources/Network/WXResourceRequestHandler.h
+++ b/ios/sdk/WeexSDK/Sources/Network/WXResourceRequestHandler.h
@@ -38,6 +38,9 @@
// Tells the delegate that the request failed to load successfully.
- (void)request:(WXResourceRequest *)request didFailWithError:(NSError *)error;
+
+// Tells the delegate that when complete statistics information has been collected for the task.
+- (void)request:(WXResourceRequest *)request didFinishCollectingMetrics:(NSURLSessionTaskMetrics *)metrics API_AVAILABLE(macosx(10.12), ios(10.0), watchos(3.0), tvos(10.0));
@end
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/0bff42e2/ios/sdk/WeexSDK/Sources/Network/WXResourceRequestHandlerDefaultImpl.m
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Network/WXResourceRequestHandlerDefaultImpl.m b/ios/sdk/WeexSDK/Sources/Network/WXResourceRequestHandlerDefaultImpl.m
index 596bdc3..77a346e 100644
--- a/ios/sdk/WeexSDK/Sources/Network/WXResourceRequestHandlerDefaultImpl.m
+++ b/ios/sdk/WeexSDK/Sources/Network/WXResourceRequestHandlerDefaultImpl.m
@@ -100,5 +100,11 @@ didReceiveResponse:(NSURLResponse *)response
}
[_delegates removeObjectForKey:task];
}
+
+- (void)URLSession:(NSURLSession *)session task:(NSURLSessionTask *)task didFinishCollectingMetrics:(NSURLSessionTaskMetrics *)metrics
+{
+ id<WXResourceRequestDelegate> delegate = [_delegates objectForKey:task];
+ [delegate request:(WXResourceRequest *)task.originalRequest didFinishCollectingMetrics:metrics];
+}
@end
[2/4] incubator-weex git commit: + [ios] update to newest gcanvas
Posted by bo...@apache.org.
+ [ios] update to newest gcanvas
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/6a79dd23
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/6a79dd23
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/6a79dd23
Branch: refs/heads/0.12-dev
Commit: 6a79dd239b7ba10b820a348fbbb92760f8938df0
Parents: 0bff42e
Author: \u9f50\u5c71 <su...@163.com>
Authored: Fri Apr 21 17:44:03 2017 +0800
Committer: \u9f50\u5c71 <su...@163.com>
Committed: Fri Apr 21 17:44:03 2017 +0800
----------------------------------------------------------------------
ios/playground/Podfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/6a79dd23/ios/playground/Podfile
----------------------------------------------------------------------
diff --git a/ios/playground/Podfile b/ios/playground/Podfile
index 8c47e78..bda8b39 100644
--- a/ios/playground/Podfile
+++ b/ios/playground/Podfile
@@ -10,7 +10,7 @@ def common
pod 'ATSDK-Weex', '0.0.1'
# WeexGcanvas is added by Weex Plugin, more info at https://market.dotwe.org/ext/list.htm
- pod 'WeexGcanvas', '0.0.1.5'
+ pod 'WeexGcanvas'
end
target 'WeexDemo' do
[4/4] incubator-weex git commit: Merge branch 'ios-network-0.12-dev'
of https://github.com/kfeagle/incubator-weex into 0.12-dev
Posted by bo...@apache.org.
Merge branch 'ios-network-0.12-dev' of https://github.com/kfeagle/incubator-weex into 0.12-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/099add0e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/099add0e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/099add0e
Branch: refs/heads/0.12-dev
Commit: 099add0eb8e3e6da96b216d0d50354e423505437
Parents: 2a862c9 ffb816e
Author: bobning <ni...@163.com>
Authored: Fri Apr 21 18:02:58 2017 +0800
Committer: bobning <ni...@163.com>
Committed: Fri Apr 21 18:02:58 2017 +0800
----------------------------------------------------------------------
ios/playground/Podfile | 2 +-
ios/sdk/WeexSDK/Sources/Loader/WXResourceLoader.m | 6 ++++++
ios/sdk/WeexSDK/Sources/Network/WXResourceRequestHandler.h | 3 +++
.../Sources/Network/WXResourceRequestHandlerDefaultImpl.m | 6 ++++++
4 files changed, 16 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
[3/4] incubator-weex git commit: + [ios] bug fix: update podfile
Posted by bo...@apache.org.
+ [ios] bug fix: update podfile
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/ffb816eb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/ffb816eb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/ffb816eb
Branch: refs/heads/0.12-dev
Commit: ffb816eb9a5f0ed81e8840cb0c0f01fd59953200
Parents: 6a79dd2
Author: \u9f50\u5c71 <su...@163.com>
Authored: Fri Apr 21 17:53:54 2017 +0800
Committer: \u9f50\u5c71 <su...@163.com>
Committed: Fri Apr 21 17:53:54 2017 +0800
----------------------------------------------------------------------
ios/playground/Podfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/ffb816eb/ios/playground/Podfile
----------------------------------------------------------------------
diff --git a/ios/playground/Podfile b/ios/playground/Podfile
index bda8b39..2bde41c 100644
--- a/ios/playground/Podfile
+++ b/ios/playground/Podfile
@@ -10,7 +10,7 @@ def common
pod 'ATSDK-Weex', '0.0.1'
# WeexGcanvas is added by Weex Plugin, more info at https://market.dotwe.org/ext/list.htm
- pod 'WeexGcanvas'
+ pod 'WeexGcanvas', '0.0.1.9'
end
target 'WeexDemo' do