You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by ac...@apache.org on 2018/01/18 06:10:00 UTC
[1/2] incubator-weex git commit: * [iOS] fix deprecated method about
UIKit
Repository: incubator-weex
Updated Branches:
refs/heads/master c330abcaa -> 8eee198d0
* [iOS] fix deprecated method about UIKit
[WEEX-130][android] High Performance Binary Wson Supported
[WEEX-197][android]WXScroller Add Child NullPointerException
close #986
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/674070b5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/674070b5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/674070b5
Branch: refs/heads/master
Commit: 674070b560a5d591c4a4ef6cb011493b570dc1a5
Parents: 399851f
Author: acton393 <zh...@gmail.com>
Authored: Thu Jan 18 11:28:12 2018 +0800
Committer: acton393 <zh...@gmail.com>
Committed: Thu Jan 18 14:08:47 2018 +0800
----------------------------------------------------------------------
.../com/taobao/weex/dom/action/AbstractAddElementAction.java | 8 +++++++-
ios/playground/WeexDemo/UIViewController+WXDemoNaviBar.m | 8 ++++----
2 files changed, 11 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/674070b5/android/sdk/src/main/java/com/taobao/weex/dom/action/AbstractAddElementAction.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/dom/action/AbstractAddElementAction.java b/android/sdk/src/main/java/com/taobao/weex/dom/action/AbstractAddElementAction.java
index add6ee8..cbe5a53 100644
--- a/android/sdk/src/main/java/com/taobao/weex/dom/action/AbstractAddElementAction.java
+++ b/android/sdk/src/main/java/com/taobao/weex/dom/action/AbstractAddElementAction.java
@@ -64,7 +64,13 @@ public abstract class AbstractAddElementAction extends TraceableAction implement
for (int i = 0; i < count; ++i) {
child = dom.getChild(i);
if (child != null) {
- parentC.addChild(generateComponentTree(context, child, parentC));
+ WXComponent createdComponent = generateComponentTree(context, child, parentC);
+ if(createdComponent != null) {
+ parentC.addChild(createdComponent);
+ }else{
+ WXLogUtils.e("[generateComponentTree] " + getStatementName() + " create dom component failed name " + child.getType());
+ WXExceptionUtils.commitCriticalExceptionRT(context.getInstanceId(), getErrorCode().getErrorCode(), "generateComponentTree", " create dom component failed name " + child.getType(), null);
+ }
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/674070b5/ios/playground/WeexDemo/UIViewController+WXDemoNaviBar.m
----------------------------------------------------------------------
diff --git a/ios/playground/WeexDemo/UIViewController+WXDemoNaviBar.m b/ios/playground/WeexDemo/UIViewController+WXDemoNaviBar.m
index ba0a645..09b4105 100644
--- a/ios/playground/WeexDemo/UIViewController+WXDemoNaviBar.m
+++ b/ios/playground/WeexDemo/UIViewController+WXDemoNaviBar.m
@@ -51,14 +51,14 @@
}
if ([self isKindOfClass:[WXScannerVC class]]) {
UIBarButtonItem *historyItem = [[UIBarButtonItem alloc] initWithImage:[UIImage imageNamed:@"scan_history"]
- style:UIBarButtonItemStyleBordered
+ style:UIBarButtonItemStylePlain
target:self
action:@selector(historyButtonClicked:)];
self.navigationItem.rightBarButtonItems = @[historyItem];
}
if([self isKindOfClass:[WXScannerHistoryVC class]]) {
UIBarButtonItem *historyItem = [[UIBarButtonItem alloc] initWithImage:[UIImage imageNamed:@"delete"]
- style:UIBarButtonItemStyleBordered
+ style:UIBarButtonItemStylePlain
target:self
action:@selector(clearScannerHistory:)];
self.navigationItem.rightBarButtonItems = @[historyItem];
@@ -89,7 +89,7 @@
if (!leftItem) {
leftItem = [[UIBarButtonItem alloc]
initWithImage:[UIImage imageNamed:@"scan"]
- style:UIBarButtonItemStyleBordered
+ style:UIBarButtonItemStylePlain
target:self
action:@selector(scanQR:)];
leftItem.accessibilityHint = @"click to scan qr code";
@@ -104,7 +104,7 @@
UIBarButtonItem *backButtonItem = objc_getAssociatedObject(self, _cmd);
if (!backButtonItem) {
backButtonItem = [[UIBarButtonItem alloc] initWithImage:[UIImage imageNamed:@"back"]
- style:UIBarButtonItemStyleBordered
+ style:UIBarButtonItemStylePlain
target:self
action:@selector(backButtonClicked:)];
objc_setAssociatedObject(self, _cmd, backButtonItem, OBJC_ASSOCIATION_RETAIN_NONATOMIC);
[2/2] incubator-weex git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-weex into
merge-pull-request-master
Posted by ac...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-weex into merge-pull-request-master
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/8eee198d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/8eee198d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/8eee198d
Branch: refs/heads/master
Commit: 8eee198d08cb4c98bfec544c63ac00f7f48a8651
Parents: 674070b c330abc
Author: acton393 <zh...@gmail.com>
Authored: Thu Jan 18 14:09:47 2018 +0800
Committer: acton393 <zh...@gmail.com>
Committed: Thu Jan 18 14:09:47 2018 +0800
----------------------------------------------------------------------
----------------------------------------------------------------------