You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by cx...@apache.org on 2017/04/20 08:36:06 UTC
[1/3] incubator-weex git commit: * [ios] use old text render logic
which the os version less than 10.0
Repository: incubator-weex
Updated Branches:
refs/heads/0.12-dev 1aa4ec01a -> afad8d287
* [ios] use old text render logic which the os version less than 10.0
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/6fa910f5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/6fa910f5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/6fa910f5
Branch: refs/heads/0.12-dev
Commit: 6fa910f5ee51668c99584095c42ceea23f3ebfec
Parents: a6b0767
Author: acton393 <zh...@gmail.com>
Authored: Thu Apr 20 16:16:27 2017 +0800
Committer: acton393 <zh...@gmail.com>
Committed: Thu Apr 20 16:16:27 2017 +0800
----------------------------------------------------------------------
ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.m | 2 +-
ios/sdk/WeexSDK/Sources/Component/WXTextComponent.m | 11 ++++++++++-
2 files changed, 11 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/6fa910f5/ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.m
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.m b/ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.m
index 5f837cc..7d58cf3 100644
--- a/ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.m
+++ b/ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.m
@@ -236,7 +236,7 @@
_jsContext[@"WXEnvironment"] = data;
}
-typedef void (*WXJSCGarbageCollect)(JSContextRef);
+//typedef void (*WXJSCGarbageCollect)(JSContextRef);
- (void)garbageCollect
{
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/6fa910f5/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 09b255d..56c158a 100644
--- a/ios/sdk/WeexSDK/Sources/Component/WXTextComponent.m
+++ b/ios/sdk/WeexSDK/Sources/Component/WXTextComponent.m
@@ -75,7 +75,10 @@
return self.wx_component->_ariaLabel;
}
}
- return _textStorage.string;
+ if (![(WXTextComponent*)self.wx_component useCoreText]) {
+ return _textStorage.string;
+ }
+ return [(WXTextComponent*)self.wx_component valueForKey:@"_text"];
}
@end
@@ -146,12 +149,18 @@ CGFloat WXTextDefaultLineThroughWidth = 1.2;
- (BOOL)useCoreText
{
+ if (WX_SYS_VERSION_LESS_THAN(@"10.0")) {
+ // there is something wrong with coreText drawing lineHeight, trying to fix this, or anyone who can help me to fix this.
+ return NO;
+ }
+
if ([_useCoreTextAttr isEqualToString:@"yes"]) {
return YES;
}
if ([_useCoreTextAttr isEqualToString:@"false"]) {
return NO;
}
+
if ([WXTextComponent textRenderUsingCoreText]) {
return YES;
}
[3/3] incubator-weex git commit: Merge branch '0.12-dev' of
https://github.com/acton393/incubator-weex into 0.12-dev
Posted by cx...@apache.org.
Merge branch '0.12-dev' of https://github.com/acton393/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/afad8d28
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/afad8d28
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/afad8d28
Branch: refs/heads/0.12-dev
Commit: afad8d287d7da92000835eefc2bfba9d0daa7233
Parents: 1aa4ec0 8b9cf60
Author: cxfeng <cx...@apache.org>
Authored: Thu Apr 20 16:35:48 2017 +0800
Committer: cxfeng <cx...@apache.org>
Committed: Thu Apr 20 16:35:48 2017 +0800
----------------------------------------------------------------------
ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.m | 2 +-
ios/sdk/WeexSDK/Sources/Component/WXListComponent.m | 13 +++++++------
ios/sdk/WeexSDK/Sources/Component/WXTextComponent.m | 11 ++++++++++-
3 files changed, 18 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
[2/3] incubator-weex git commit: * [ios] try to fix list crash on
some occasion
Posted by cx...@apache.org.
* [ios] try to fix list crash on some occasion
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/8b9cf602
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/8b9cf602
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/8b9cf602
Branch: refs/heads/0.12-dev
Commit: 8b9cf6027d14161e6ce49f2e2ec0cbb471242137
Parents: 6fa910f
Author: acton393 <zh...@gmail.com>
Authored: Thu Apr 20 16:28:00 2017 +0800
Committer: acton393 <zh...@gmail.com>
Committed: Thu Apr 20 16:28:00 2017 +0800
----------------------------------------------------------------------
ios/sdk/WeexSDK/Sources/Component/WXListComponent.m | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/8b9cf602/ios/sdk/WeexSDK/Sources/Component/WXListComponent.m
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Component/WXListComponent.m b/ios/sdk/WeexSDK/Sources/Component/WXListComponent.m
index 45137ef..99f6f54 100644
--- a/ios/sdk/WeexSDK/Sources/Component/WXListComponent.m
+++ b/ios/sdk/WeexSDK/Sources/Component/WXListComponent.m
@@ -276,16 +276,17 @@
}
[self.weexInstance.componentManager _addUITask:^{
- WXLogDebug(@"Insert section:%ld", insertIndex);
- [_completedSections insertObject:completedInsertSection atIndex:insertIndex];
- if (completedReloadSection) {
- WXLogDebug(@"Reload section:%ld", insertIndex - 1);
- _completedSections[insertIndex - 1] = completedReloadSection;
- }
+ WXLogDebug(@"Insert section:%ld", (unsigned long)insertIndex);
[UIView performWithoutAnimation:^{
[_tableView beginUpdates];
+ [_completedSections insertObject:completedInsertSection atIndex:insertIndex];
+ if (completedReloadSection) {
+ WXLogDebug(@"Reload section:%u", insertIndex - 1);
+ _completedSections[insertIndex - 1] = completedReloadSection;
+ }
+
[self _insertTableViewSectionAtIndex:insertIndex keepScrollPosition:keepScrollPosition animation:UITableViewRowAnimationNone];
if (completedReloadSection) {