You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by gu...@apache.org on 2017/09/26 09:04:04 UTC
[1/7] incubator-weex git commit: Update WXWebComponent.m
Repository: incubator-weex
Updated Branches:
refs/heads/master c6d5ce57c -> 0e8f151eb
Update WXWebComponent.m
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/127b4718
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/127b4718
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/127b4718
Branch: refs/heads/master
Commit: 127b4718077ae7ff279b2e60facc7b92e8e7479d
Parents: 02ce702
Author: caozhiyong <ca...@163.com>
Authored: Fri May 19 09:37:49 2017 +0800
Committer: GitHub <no...@github.com>
Committed: Fri May 19 09:37:49 2017 +0800
----------------------------------------------------------------------
ios/sdk/WeexSDK/Sources/Component/WXWebComponent.m | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/127b4718/ios/sdk/WeexSDK/Sources/Component/WXWebComponent.m
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Component/WXWebComponent.m b/ios/sdk/WeexSDK/Sources/Component/WXWebComponent.m
index ab8b63d..b696b22 100644
--- a/ios/sdk/WeexSDK/Sources/Component/WXWebComponent.m
+++ b/ios/sdk/WeexSDK/Sources/Component/WXWebComponent.m
@@ -82,6 +82,8 @@ WX_EXPORT_METHOD(@selector(goForward))
_webview = (WXWebView *)self.view;
_webview.delegate = self;
_webview.allowsInlineMediaPlayback = YES;
+ [_webview setBackgroundColor:[UIColor clearColor]];
+ _webview.opaque = NO;
_jsContext = [_webview valueForKeyPath:@"documentView.webView.mainFrame.javaScriptContext"];
__weak typeof(self) weakSelf = self;
_jsContext[@"$notifyWeex"] = ^(JSValue *data) {
[2/7] incubator-weex git commit: * [ios] cache attributedString for
improve performance while draw Text
Posted by gu...@apache.org.
* [ios] cache attributedString for improve performance while draw Text
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/24de80e5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/24de80e5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/24de80e5
Branch: refs/heads/master
Commit: 24de80e5d8481b6b6be9e28dbbc65e72f21ac485
Parents: 005b74a
Author: acton393 <zh...@gmail.com>
Authored: Mon Jun 12 17:43:46 2017 +0800
Committer: acton393 <zh...@gmail.com>
Committed: Thu Jun 15 14:54:52 2017 +0800
----------------------------------------------------------------------
ios/sdk/WeexSDK/Sources/Component/WXTextComponent.m | 16 +++++++++++++---
1 file changed, 13 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/24de80e5/ios/sdk/WeexSDK/Sources/Component/WXTextComponent.m
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Component/WXTextComponent.m b/ios/sdk/WeexSDK/Sources/Component/WXTextComponent.m
index 721ce44..546ca03 100644
--- a/ios/sdk/WeexSDK/Sources/Component/WXTextComponent.m
+++ b/ios/sdk/WeexSDK/Sources/Component/WXTextComponent.m
@@ -118,6 +118,7 @@ CGFloat WXTextDefaultLineThroughWidth = 1.2;
BOOL _truncationLine; // support trunk tail
BOOL _needsRemoveObserver;
+ NSMutableAttributedString * _ctAttributedString;
}
+ (void)setRenderUsingCoreText:(BOOL)usingCoreText
@@ -241,6 +242,7 @@ do {\
- (void)setNeedsRepaint
{
_textStorage = nil;
+ _ctAttributedString = nil;
}
#pragma mark - Subclass
@@ -335,6 +337,14 @@ do {\
return _text;
}
+- (NSMutableAttributedString *)ctAttributedString
+{
+ if (!_ctAttributedString) {
+ _ctAttributedString = [self buildCTAttributeString];
+ }
+ return _ctAttributedString;
+}
+
- (void)repaintText:(NSNotification *)notification
{
if (![_fontFamily isEqualToString:notification.userInfo[@"fontFamily"]]) {
@@ -605,7 +615,7 @@ do {\
CGContextTranslateCTM(context, 0, textFrame.size.height);
CGContextScaleCTM(context, 1.0, -1.0);
- NSMutableAttributedString * attributedStringCopy = [self buildCTAttributeString];
+ NSMutableAttributedString * attributedStringCopy = [self ctAttributedString];
//add path
CGPathRef cgPath = NULL;
cgPath = CGPathCreateWithRect(textFrame, NULL);
@@ -749,7 +759,7 @@ do {\
if (truncationTokenLine) {
// default truncationType is kCTLineTruncationEnd
CTLineTruncationType truncationType = kCTLineTruncationEnd;
- NSAttributedString *attributedString = [self buildCTAttributeString];
+ NSAttributedString *attributedString = [self ctAttributedString];
NSAttributedString * lastLineText = nil;
NSRange lastLineTextRange = WXNSRangeFromCFRange(CTLineGetStringRange(lastLine));
NSRange attributeStringRange = NSMakeRange(0, attributedString.string.length);
@@ -817,7 +827,7 @@ do {\
CGFloat totalHeight = 0;
CGSize suggestSize = CGSizeZero;
- NSAttributedString * attributedStringCpy = [self buildCTAttributeString];
+ NSAttributedString * attributedStringCpy = [self ctAttributedString];
CTFramesetterRef framesetterRef = NULL;
framesetterRef = CTFramesetterCreateWithAttributedString((CFAttributedStringRef)attributedStringCpy);
[5/7] incubator-weex git commit: Merge branch '0.13-dev' of
https://github.com/caozhiyong/incubator-weex into 0.13-dev
Posted by gu...@apache.org.
Merge branch '0.13-dev' of https://github.com/caozhiyong/incubator-weex into 0.13-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/842c7d3b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/842c7d3b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/842c7d3b
Branch: refs/heads/master
Commit: 842c7d3bd5a24faa0d8d6fe9c15d37cd04ad1d06
Parents: 833b0da 127b471
Author: gurisxie <27...@qq.com>
Authored: Tue Sep 26 16:58:07 2017 +0800
Committer: gurisxie <27...@qq.com>
Committed: Tue Sep 26 16:58:07 2017 +0800
----------------------------------------------------------------------
ios/sdk/WeexSDK/Sources/Component/WXWebComponent.m | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
[4/7] incubator-weex git commit: Merge branch '0.13-dev' of
https://github.com/apache/incubator-weex into 0.13-dev
Posted by gu...@apache.org.
Merge branch '0.13-dev' of https://github.com/apache/incubator-weex into 0.13-dev
* '0.13-dev' of https://github.com/apache/incubator-weex:
* [ios] cache attributedString for improve performance while draw Text
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/833b0da5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/833b0da5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/833b0da5
Branch: refs/heads/master
Commit: 833b0da5b36367807b214b16716b029f21c118f9
Parents: bf30d5f 24de80e
Author: zshshr <zh...@gmail.com>
Authored: Thu Jun 15 15:23:23 2017 +0800
Committer: zshshr <zh...@gmail.com>
Committed: Thu Jun 15 15:23:23 2017 +0800
----------------------------------------------------------------------
ios/sdk/WeexSDK/Sources/Component/WXTextComponent.m | 16 +++++++++++++---
1 file changed, 13 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
[6/7] incubator-weex git commit: * [ios] Merge branch '0.13-dev' that
webview property update
Posted by gu...@apache.org.
* [ios] Merge branch '0.13-dev' that webview property 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/c2d3e3bd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/c2d3e3bd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/c2d3e3bd
Branch: refs/heads/master
Commit: c2d3e3bdc4054445558e53885e7b44d004281d31
Parents: c5d1064 842c7d3
Author: gurisxie <27...@qq.com>
Authored: Tue Sep 26 17:03:23 2017 +0800
Committer: gurisxie <27...@qq.com>
Committed: Tue Sep 26 17:03:23 2017 +0800
----------------------------------------------------------------------
ios/sdk/WeexSDK/Sources/Component/WXWebComponent.m | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/c2d3e3bd/ios/sdk/WeexSDK/Sources/Component/WXWebComponent.m
----------------------------------------------------------------------
diff --cc ios/sdk/WeexSDK/Sources/Component/WXWebComponent.m
index 62a0aba,b696b22..f66bd11
--- a/ios/sdk/WeexSDK/Sources/Component/WXWebComponent.m
+++ b/ios/sdk/WeexSDK/Sources/Component/WXWebComponent.m
@@@ -83,7 -82,8 +83,9 @@@ WX_EXPORT_METHOD(@selector(goForward)
_webview = (WXWebView *)self.view;
_webview.delegate = self;
_webview.allowsInlineMediaPlayback = YES;
+ _webview.scalesPageToFit = YES;
+ [_webview setBackgroundColor:[UIColor clearColor]];
+ _webview.opaque = NO;
_jsContext = [_webview valueForKeyPath:@"documentView.webView.mainFrame.javaScriptContext"];
__weak typeof(self) weakSelf = self;
_jsContext[@"$notifyWeex"] = ^(JSValue *data) {
[7/7] incubator-weex git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-weex
Posted by gu...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-weex
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/0e8f151e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/0e8f151e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/0e8f151e
Branch: refs/heads/master
Commit: 0e8f151ebb42f6043fed2024069eb975c8a021fc
Parents: c2d3e3b c6d5ce5
Author: gurisxie <27...@qq.com>
Authored: Tue Sep 26 17:03:38 2017 +0800
Committer: gurisxie <27...@qq.com>
Committed: Tue Sep 26 17:03:38 2017 +0800
----------------------------------------------------------------------
.../Sources/Component/RecycleList/WXComponent+DataBinding.h | 2 +-
.../Sources/Component/RecycleList/WXComponent+DataBinding.mm | 2 ++
.../Sources/Component/RecycleList/WXRecycleListComponent.m | 3 +++
.../WeexSDK/Sources/Component/Recycler/WXRecyclerComponent.m | 3 +++
ios/sdk/WeexSDK/Sources/Component/WXListComponent.m | 3 +++
ios/sdk/WeexSDK/Sources/Component/WXScrollerComponent.m | 3 +++
ios/sdk/WeexSDK/Sources/Manager/WXTracingManager.m | 6 +++---
ios/sdk/WeexSDK/Sources/Module/WXNavigatorModule.h | 3 ++-
ios/sdk/WeexSDKTests/WXStreamModuleTests.m | 2 +-
9 files changed, 21 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
[3/7] incubator-weex git commit: * [android] native crash fix
Posted by gu...@apache.org.
* [android] native crash fix
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/bf30d5f6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/bf30d5f6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/bf30d5f6
Branch: refs/heads/master
Commit: bf30d5f6133f22a05a5e2b9854d1cbf7d752b037
Parents: 005b74a
Author: zshshr <zh...@gmail.com>
Authored: Thu Jun 15 15:21:24 2017 +0800
Committer: zshshr <zh...@gmail.com>
Committed: Thu Jun 15 15:21:24 2017 +0800
----------------------------------------------------------------------
android/sdk/libs/armeabi/libweexjsc.so | Bin 7570392 -> 7570504 bytes
android/sdk/libs/x86/libweexjsc.so | Bin 12121924 -> 12121924 bytes
2 files changed, 0 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/bf30d5f6/android/sdk/libs/armeabi/libweexjsc.so
----------------------------------------------------------------------
diff --git a/android/sdk/libs/armeabi/libweexjsc.so b/android/sdk/libs/armeabi/libweexjsc.so
index cb0f6b6..41b1ee8 100755
Binary files a/android/sdk/libs/armeabi/libweexjsc.so and b/android/sdk/libs/armeabi/libweexjsc.so differ
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/bf30d5f6/android/sdk/libs/x86/libweexjsc.so
----------------------------------------------------------------------
diff --git a/android/sdk/libs/x86/libweexjsc.so b/android/sdk/libs/x86/libweexjsc.so
index 83ef452..c45672a 100755
Binary files a/android/sdk/libs/x86/libweexjsc.so and b/android/sdk/libs/x86/libweexjsc.so differ