You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by kf...@apache.org on 2017/07/25 08:23:27 UTC
[1/4] incubator-weex git commit: + [ios] delete ,
Repository: incubator-weex
Updated Branches:
refs/heads/0.15-dev 7ca3a1e37 -> faaa8f893
+ [ios] delete ,
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/c2d11a47
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/c2d11a47
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/c2d11a47
Branch: refs/heads/0.15-dev
Commit: c2d11a4756c6ae28ce031f5c67db26d94e4873eb
Parents: 7ca3a1e
Author: 齐山 <su...@163.com>
Authored: Tue Jul 25 14:30:18 2017 +0800
Committer: 齐山 <su...@163.com>
Committed: Tue Jul 25 14:30:18 2017 +0800
----------------------------------------------------------------------
ios/sdk/WeexSDK/Sources/Manager/WXTracingManager.h | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/c2d11a47/ios/sdk/WeexSDK/Sources/Manager/WXTracingManager.h
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Manager/WXTracingManager.h b/ios/sdk/WeexSDK/Sources/Manager/WXTracingManager.h
index 767f79f..8eb6310 100644
--- a/ios/sdk/WeexSDK/Sources/Manager/WXTracingManager.h
+++ b/ios/sdk/WeexSDK/Sources/Manager/WXTracingManager.h
@@ -90,13 +90,13 @@ typedef enum : NSUInteger {
+(void)switchTracing:(BOOL)isTracing;
/**
* @discusstion weex perfermance tracing state
- * @param iid, the instance id.
- * @param ref, the component ref
- * @param className, the module or component class name
- * @param name, the module or component name
- * @param phase, the trace phase
- * @param functionName, function name
- * @param options, the optional refer:support ts,duration,parentRef
+ * @param iid the instance id.
+ * @param ref the component ref
+ * @param className the module or component class name
+ * @param name the module or component name
+ * @param phase the trace phase
+ * @param functionName function name
+ * @param options the optional refer:support ts,duration,parentRef
*/
+(void)startTracingWithInstanceId:(NSString *)iid ref:(NSString*)ref className:(NSString *)className name:(NSString *)name phase:(NSString *)phase functionName:(NSString *)functionName options:(NSDictionary *)options;
/**
[4/4] incubator-weex git commit: + [ios] public tracing manager
Posted by kf...@apache.org.
+ [ios] public tracing manager
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/faaa8f89
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/faaa8f89
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/faaa8f89
Branch: refs/heads/0.15-dev
Commit: faaa8f893bb0a4dc96f09fc8d6dcca29ba3d9c0f
Parents: da8cf4a
Author: 齐山 <su...@163.com>
Authored: Tue Jul 25 16:21:36 2017 +0800
Committer: 齐山 <su...@163.com>
Committed: Tue Jul 25 16:21:36 2017 +0800
----------------------------------------------------------------------
ios/sdk/WeexSDK.xcodeproj/project.pbxproj | 2 +-
ios/sdk/WeexSDK/Sources/WeexSDK.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/faaa8f89/ios/sdk/WeexSDK.xcodeproj/project.pbxproj
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK.xcodeproj/project.pbxproj b/ios/sdk/WeexSDK.xcodeproj/project.pbxproj
index 898f080..4520dc1 100644
--- a/ios/sdk/WeexSDK.xcodeproj/project.pbxproj
+++ b/ios/sdk/WeexSDK.xcodeproj/project.pbxproj
@@ -250,7 +250,7 @@
C4D872261E5DDF7500E39BC1 /* WXBoxShadow.m in Sources */ = {isa = PBXBuildFile; fileRef = C4D872241E5DDF7500E39BC1 /* WXBoxShadow.m */; };
C4E375371E5FCBD3009B2D9C /* WXComponent+BoxShadow.m in Sources */ = {isa = PBXBuildFile; fileRef = C4E375351E5FCBD3009B2D9C /* WXComponent+BoxShadow.m */; };
C4E375381E5FCBD3009B2D9C /* WXComponent+BoxShadow.h in Headers */ = {isa = PBXBuildFile; fileRef = C4E375361E5FCBD3009B2D9C /* WXComponent+BoxShadow.h */; };
- C4E97D331F1EF46D00ABC314 /* WXTracingManager.h in Headers */ = {isa = PBXBuildFile; fileRef = C4E97D311F1EF46D00ABC314 /* WXTracingManager.h */; };
+ C4E97D331F1EF46D00ABC314 /* WXTracingManager.h in Headers */ = {isa = PBXBuildFile; fileRef = C4E97D311F1EF46D00ABC314 /* WXTracingManager.h */; settings = {ATTRIBUTES = (Public, ); }; };
C4E97D341F1EF46D00ABC314 /* WXTracingManager.m in Sources */ = {isa = PBXBuildFile; fileRef = C4E97D321F1EF46D00ABC314 /* WXTracingManager.m */; };
C4F012791E1502A6003378D0 /* SRWebSocket+Weex.h in Headers */ = {isa = PBXBuildFile; fileRef = C4F012721E1502A6003378D0 /* SRWebSocket+Weex.h */; };
C4F0127A1E1502A6003378D0 /* SRWebSocket+Weex.m in Sources */ = {isa = PBXBuildFile; fileRef = C4F012731E1502A6003378D0 /* SRWebSocket+Weex.m */; };
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/faaa8f89/ios/sdk/WeexSDK/Sources/WeexSDK.h
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/WeexSDK.h b/ios/sdk/WeexSDK/Sources/WeexSDK.h
index b553fce..de1a82e 100644
--- a/ios/sdk/WeexSDK/Sources/WeexSDK.h
+++ b/ios/sdk/WeexSDK/Sources/WeexSDK.h
@@ -23,6 +23,7 @@
#import "WXUtility.h"
#import "WXURLRewriteProtocol.h"
#import "WXType.h"
+#import "WXTracingManager.h"
#import "WXScrollerProtocol.h"
#import "WXScrollerComponent.h"
#import "WXSDKManager.h"
@@ -62,6 +63,5 @@
#import "WXAComponent.h"
#import "NSObject+WXSwizzle.h"
#import "Layout.h"
-#import "WXTracingManager.h"
#endif /* __OBJC__ */
[3/4] incubator-weex git commit: + [ios] delete :
Posted by kf...@apache.org.
+ [ios] delete :
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/da8cf4a9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/da8cf4a9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/da8cf4a9
Branch: refs/heads/0.15-dev
Commit: da8cf4a94959a001f12ea462639299177501727d
Parents: 949c14f
Author: 齐山 <su...@163.com>
Authored: Tue Jul 25 14:37:59 2017 +0800
Committer: 齐山 <su...@163.com>
Committed: Tue Jul 25 14:37:59 2017 +0800
----------------------------------------------------------------------
ios/sdk/WeexSDK/Sources/Manager/WXTracingManager.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/da8cf4a9/ios/sdk/WeexSDK/Sources/Manager/WXTracingManager.h
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Manager/WXTracingManager.h b/ios/sdk/WeexSDK/Sources/Manager/WXTracingManager.h
index 06a486f..632d712 100644
--- a/ios/sdk/WeexSDK/Sources/Manager/WXTracingManager.h
+++ b/ios/sdk/WeexSDK/Sources/Manager/WXTracingManager.h
@@ -112,7 +112,7 @@ typedef enum : NSUInteger {
/**
* @discusstion set bundle type
- * @param jsBundleString: the bundle source.
+ * @param jsBundleString the bundle source.
* @param iid the instance id.
*/
+(void)setBundleJSType:(NSString *)jsBundleString instanceId:(NSString *)iid;
[2/4] incubator-weex git commit: + [ios] update ,
Posted by kf...@apache.org.
+ [ios] update ,
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/949c14f9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/949c14f9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/949c14f9
Branch: refs/heads/0.15-dev
Commit: 949c14f93e6327e5a88b76f4f8c39d507a9a7793
Parents: c2d11a4
Author: 齐山 <su...@163.com>
Authored: Tue Jul 25 14:34:50 2017 +0800
Committer: 齐山 <su...@163.com>
Committed: Tue Jul 25 14:34:50 2017 +0800
----------------------------------------------------------------------
ios/sdk/WeexSDK/Sources/Manager/WXTracingManager.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/949c14f9/ios/sdk/WeexSDK/Sources/Manager/WXTracingManager.h
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Manager/WXTracingManager.h b/ios/sdk/WeexSDK/Sources/Manager/WXTracingManager.h
index 8eb6310..06a486f 100644
--- a/ios/sdk/WeexSDK/Sources/Manager/WXTracingManager.h
+++ b/ios/sdk/WeexSDK/Sources/Manager/WXTracingManager.h
@@ -85,7 +85,7 @@ typedef enum : NSUInteger {
+(BOOL)isTracing;
/**
* @discusstion set weex perfermance tracing state , you should use in debug environment
- * @param isTracing , YES weex will be traced, NO weex will not be traced .
+ * @param isTracing YES weex will be traced, NO weex will not be traced .
*/
+(void)switchTracing:(BOOL)isTracing;
/**
@@ -113,7 +113,7 @@ typedef enum : NSUInteger {
/**
* @discusstion set bundle type
* @param jsBundleString: the bundle source.
- * @param iid: the instance id.
+ * @param iid the instance id.
*/
+(void)setBundleJSType:(NSString *)jsBundleString instanceId:(NSString *)iid;
/**