[incubator-weex] Git Push Summary
Repository: incubator-weex Updated Branches: refs/heads/v0.17 [created] 28d047512
[GitHub] incubator-weex issue #884: [WEEX-124][android]fix android npe bug
Github user weex-bot commented on the issue: https://github.com/apache/incubator-weex/pull/884 Warnings :warning: No Changelog changes! :warning: This PR should update related documents as well. Messages :book: danger test finished. Generated by :no_entry_sign: http://github.com/danger/danger-js/;>dangerJS ---
[GitHub] incubator-weex pull request #884: [WEEX-124][android]fix android npe bug
GitHub user gubaojian opened a pull request: https://github.com/apache/incubator-weex/pull/884 [WEEX-124][android]fix android npe bug NullPointerException in AbstractLayoutFinishAction You can merge this pull request into a Git repository by running: $ git pull https://github.com/gubaojian/incubator-weex release-0.16 Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-weex/pull/884.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #884 commit b49d3f150992573d6bd591a5937646c3e83e4c6f Author: jianbai.gbjDate: 2017-11-17T06:37:27Z [WEEX-124][android]fix android bug ---
incubator-weex git commit: * [ios] update compare png for border
Repository: incubator-weex Updated Branches: refs/heads/master 672f92a5f -> 28d047512 * [ios] update compare png for border Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/28d04751 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/28d04751 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/28d04751 Branch: refs/heads/master Commit: 28d0475127e1b8185572e5f9afc1207d73a311e2 Parents: 672f92a Author: gurisxie <279483...@qq.com> Authored: Fri Nov 17 14:16:52 2017 +0800 Committer: gurisxie <279483...@qq.com> Committed: Fri Nov 17 14:16:52 2017 +0800 -- test/screenshot/image-resize-ios.png | Bin 138103 -> 145574 bytes 1 file changed, 0 insertions(+), 0 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/28d04751/test/screenshot/image-resize-ios.png -- diff --git a/test/screenshot/image-resize-ios.png b/test/screenshot/image-resize-ios.png old mode 100755 new mode 100644 index 1a80944..95347f4 Binary files a/test/screenshot/image-resize-ios.png and b/test/screenshot/image-resize-ios.png differ
[GitHub] incubator-weex issue #883: [WEEX-124][iOS]Transform's parse problem about tr...
Github user weex-bot commented on the issue: https://github.com/apache/incubator-weex/pull/883 Messages :book: has no jsfm file changed. :book: jsfm test finished. Generated by :no_entry_sign: http://github.com/danger/danger-js/;>dangerJS ---
[GitHub] incubator-weex pull request #883: [WEEX-124][iOS]Transform's parse problem a...
GitHub user doumafang opened a pull request: https://github.com/apache/incubator-weex/pull/883 [WEEX-124][iOS]Transform's parse problem about translate We found that in AnimationModule's transform do not support examples such as ' translateX(10px) translateY(20px)',and we fix this bug about transform. http://dotwe.org/vue/9e4538ae5b14e4dbe37f94330a412a48 You can merge this pull request into a Git repository by running: $ git pull https://github.com/doumafang/incubator-weex master Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-weex/pull/883.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #883 commit f11c95369fc81ec142f2df76b83aa632ea91ded3 Author: doumafangDate: 2017-11-17T06:09:36Z * [ios] refix transform's parse bug about translate ---
[GitHub] incubator-weex pull request #882: [WEEX-127][android]Use HashSet Instead of ...
Github user gubaojian closed the pull request at: https://github.com/apache/incubator-weex/pull/882 ---
[GitHub] incubator-weex issue #882: [WEEX-127][android]Use HashSet Instead of array, ...
Github user gurisxie commented on the issue: https://github.com/apache/incubator-weex/pull/882 has merged. ---
incubator-weex git commit: [WEEX-127][android]Use HashSet Instead of array, because some app not contains arrayset
Repository: incubator-weex Updated Branches: refs/heads/master f4b819ac3 -> 672f92a5f [WEEX-127][android]Use HashSet Instead of array, because some app not contains arrayset Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/672f92a5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/672f92a5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/672f92a5 Branch: refs/heads/master Commit: 672f92a5f1434a0d9e0430e8c5da5cd8840b75d1 Parents: f4b819a Author: jianbai.gbjAuthored: Fri Nov 17 10:05:44 2017 +0800 Committer: gurisxie <279483...@qq.com> Committed: Fri Nov 17 10:49:13 2017 +0800 -- .../main/java/com/taobao/weex/dom/transition/WXTransition.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/672f92a5/android/sdk/src/main/java/com/taobao/weex/dom/transition/WXTransition.java -- diff --git a/android/sdk/src/main/java/com/taobao/weex/dom/transition/WXTransition.java b/android/sdk/src/main/java/com/taobao/weex/dom/transition/WXTransition.java index 535ef74..41fcd12 100644 --- a/android/sdk/src/main/java/com/taobao/weex/dom/transition/WXTransition.java +++ b/android/sdk/src/main/java/com/taobao/weex/dom/transition/WXTransition.java @@ -27,7 +27,6 @@ import android.animation.ValueAnimator; import android.graphics.drawable.ColorDrawable; import android.os.Handler; import android.support.v4.util.ArrayMap; -import android.support.v4.util.ArraySet; import android.support.v4.view.animation.PathInterpolatorCompat; import android.text.TextUtils; import android.util.Property; @@ -51,6 +50,7 @@ import com.taobao.weex.utils.WXUtils; import com.taobao.weex.utils.WXViewUtils; import java.util.ArrayList; +import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; @@ -84,7 +84,7 @@ public class WXTransition { /** * layout animation property * */ -private static final Set LAYOUT_PROPERTIES = new ArraySet<>(); +private static final Set LAYOUT_PROPERTIES = new HashSet<>(); static { LAYOUT_PROPERTIES.add(Constants.Name.WIDTH); LAYOUT_PROPERTIES.add(Constants.Name.HEIGHT); @@ -97,7 +97,7 @@ public class WXTransition { /** * transform animation property, use android system animaton ability * */ -private static final Set TRANSFORM_PROPERTIES = new ArraySet<>(); +private static final Set TRANSFORM_PROPERTIES = new HashSet<>(); static { TRANSFORM_PROPERTIES.add(Constants.Name.OPACITY); TRANSFORM_PROPERTIES.add(Constants.Name.BACKGROUND_COLOR);
incubator-weex git commit: * [ios] update compare png for compositing
Repository: incubator-weex Updated Branches: refs/heads/master 4e534a491 -> f4b819ac3 * [ios] update compare png for compositing Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/f4b819ac Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/f4b819ac Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/f4b819ac Branch: refs/heads/master Commit: f4b819ac30bd059a1349966f5525c5655e94bb73 Parents: 4e534a4 Author: gurisxie <279483...@qq.com> Authored: Fri Nov 17 10:39:30 2017 +0800 Committer: gurisxie <279483...@qq.com> Committed: Fri Nov 17 10:39:30 2017 +0800 -- test/screenshot/compositing-ios.png | Bin 229534 -> 236255 bytes 1 file changed, 0 insertions(+), 0 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/f4b819ac/test/screenshot/compositing-ios.png -- diff --git a/test/screenshot/compositing-ios.png b/test/screenshot/compositing-ios.png old mode 100755 new mode 100644 index 1c6276b..0fbc6f6 Binary files a/test/screenshot/compositing-ios.png and b/test/screenshot/compositing-ios.png differ
[GitHub] incubator-weex issue #882: [WEEX-127][android]Use HashSet Instead of array, ...
Github user weex-bot commented on the issue: https://github.com/apache/incubator-weex/pull/882 Warnings :warning: No Changelog changes! :warning: This PR should update related documents as well. Messages :book: danger test finished. Generated by :no_entry_sign: http://github.com/danger/danger-js/;>dangerJS ---
[GitHub] incubator-weex pull request #860: [WEEX-112][iOS] make weex playground app a...
Github user acton393 closed the pull request at: https://github.com/apache/incubator-weex/pull/860 ---
[1/3] incubator-weex git commit: Revert "[WEEX-124][iOS] bugfix transform crash about unknow selector"
Repository: incubator-weex Updated Branches: refs/heads/master 728f38bcf -> 4e534a491 Revert "[WEEX-124][iOS] bugfix transform crash about unknow selector" This reverts commit 728f38bcf61bfa56cc85c47b174bad3041d53d41. Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/f14ae274 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/f14ae274 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/f14ae274 Branch: refs/heads/master Commit: f14ae274f52505305393ee9c52e400ac5583158d Parents: 728f38b Author: acton393Authored: Fri Nov 17 00:29:00 2017 +0800 Committer: acton393 Committed: Fri Nov 17 00:29:00 2017 +0800 -- ios/sdk/WeexSDK/Sources/Component/WXTransform.m | 16 +++- 1 file changed, 7 insertions(+), 9 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/f14ae274/ios/sdk/WeexSDK/Sources/Component/WXTransform.m -- diff --git a/ios/sdk/WeexSDK/Sources/Component/WXTransform.m b/ios/sdk/WeexSDK/Sources/Component/WXTransform.m index bc3ce8e..f81af72 100644 --- a/ios/sdk/WeexSDK/Sources/Component/WXTransform.m +++ b/ios/sdk/WeexSDK/Sources/Component/WXTransform.m @@ -348,16 +348,14 @@ - (void)parseTranslate:(NSArray *)value { [self parseTranslatex:value[0]]; -if ([value count] > 1) { -[self parseTranslatey:value[1]]; -} +[self parseTranslatey:value[1]]; } -- (void)parseTranslatex:(id)value +- (void)parseTranslatex:(NSArray *)value { WXLength *translateX; -double x = [value doubleValue]; -if ([value hasSuffix:@"%"]) { +double x = [value[0] doubleValue]; +if ([value[0] hasSuffix:@"%"]) { translateX = [WXLength lengthWithFloat:x type:WXLengthTypePercent]; } else { x = WXPixelScale(x, self.weexInstance.pixelScaleFactor); @@ -366,11 +364,11 @@ _translateX = translateX; } -- (void)parseTranslatey:(id)value +- (void)parseTranslatey:(NSArray *)value { WXLength *translateY; -double y = [value doubleValue]; -if ([value hasSuffix:@"%"]) { +double y = [value[0] doubleValue]; +if ([value[0] hasSuffix:@"%"]) { translateY = [WXLength lengthWithFloat:y type:WXLengthTypePercent]; } else { y = WXPixelScale(y, self.weexInstance.pixelScaleFactor);
[3/3] incubator-weex git commit: Revert "* [ios] fix bugs about transform's parse problem"
Revert "* [ios] fix bugs about transform's parse problem" This reverts commit 66f4e8fd27a954c1cfb4a9966415e7de81956bde. Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/4e534a49 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/4e534a49 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/4e534a49 Branch: refs/heads/master Commit: 4e534a491c5f8e8a6e1dc5ae91c6f52ea9eb4fe1 Parents: b0ce55f Author: acton393Authored: Fri Nov 17 00:31:38 2017 +0800 Committer: acton393 Committed: Fri Nov 17 00:31:38 2017 +0800 -- ios/sdk/WeexSDK/Sources/Component/WXTransform.m | 31 +--- 1 file changed, 21 insertions(+), 10 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/4e534a49/ios/sdk/WeexSDK/Sources/Component/WXTransform.m -- diff --git a/ios/sdk/WeexSDK/Sources/Component/WXTransform.m b/ios/sdk/WeexSDK/Sources/Component/WXTransform.m index 60c3e3f..9e5c362 100644 --- a/ios/sdk/WeexSDK/Sources/Component/WXTransform.m +++ b/ios/sdk/WeexSDK/Sources/Component/WXTransform.m @@ -312,6 +312,7 @@ } } } + _originX = [WXLength lengthWithFloat:originX type:typeX]; _originY = [WXLength lengthWithFloat:originY type:typeY]; } @@ -345,7 +346,7 @@ } } -- (void)parseTranslatex:(NSArray *)value +- (void)parseTranslate:(NSArray *)value { WXLength *translateX; double x = [value[0] doubleValue]; @@ -355,20 +356,30 @@ x = WXPixelScale(x, self.weexInstance.pixelScaleFactor); translateX = [WXLength lengthWithFloat:x type:WXLengthTypeFixed]; } + +WXLength *translateY; +if (value.count > 1) { +double y = [value[1] doubleValue]; +if ([value[1] hasSuffix:@"%"]) { +translateY = [WXLength lengthWithFloat:y type:WXLengthTypePercent]; +} else { +y = WXPixelScale(y, self.weexInstance.pixelScaleFactor); +translateY = [WXLength lengthWithFloat:y type:WXLengthTypeFixed]; +} +} + _translateX = translateX; +_translateY = translateY; +} + +- (void)parseTranslatex:(NSArray *)value +{ +[self parseTranslate:@[value[0], @"0"]]; } - (void)parseTranslatey:(NSArray *)value { -WXLength *translateY; -double y = [value[0] doubleValue]; -if ([value[0] hasSuffix:@"%"]) { -translateY = [WXLength lengthWithFloat:y type:WXLengthTypePercent]; -} else { -y = WXPixelScale(y, self.weexInstance.pixelScaleFactor); -translateY = [WXLength lengthWithFloat:y type:WXLengthTypeFixed]; -} -_translateY = translateY; +[self parseTranslate:@[@"0", value[0]]]; } - (void)parseScale:(NSArray *)value
[2/3] incubator-weex git commit: Revert "* [ios] fix parse transform with translate(20px, 20px)"
Revert "* [ios] fix parse transform with translate(20px,20px)" This reverts commit 92d85ad4f387265bb6df392345c37eb2a3428803. Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/b0ce55f1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/b0ce55f1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/b0ce55f1 Branch: refs/heads/master Commit: b0ce55f1db21c82f3de89e426d55a4d01c0b51b6 Parents: f14ae27 Author: acton393Authored: Fri Nov 17 00:31:26 2017 +0800 Committer: acton393 Committed: Fri Nov 17 00:31:26 2017 +0800 -- ios/sdk/WeexSDK/Sources/Component/WXTransform.m | 6 -- 1 file changed, 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/b0ce55f1/ios/sdk/WeexSDK/Sources/Component/WXTransform.m -- diff --git a/ios/sdk/WeexSDK/Sources/Component/WXTransform.m b/ios/sdk/WeexSDK/Sources/Component/WXTransform.m index f81af72..60c3e3f 100644 --- a/ios/sdk/WeexSDK/Sources/Component/WXTransform.m +++ b/ios/sdk/WeexSDK/Sources/Component/WXTransform.m @@ -345,12 +345,6 @@ } } -- (void)parseTranslate:(NSArray *)value -{ -[self parseTranslatex:value[0]]; -[self parseTranslatey:value[1]]; -} - - (void)parseTranslatex:(NSArray *)value { WXLength *translateX;
[GitHub] incubator-weex issue #881: createInstance and initFramework may on different...
Github user weex-bot commented on the issue: https://github.com/apache/incubator-weex/pull/881 Warnings :warning: No Changelog changes! :warning: This PR should update related documents as well. :warning: Potential BREAK CHANGE. Modify public in android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java without metion it in commit message. You'd better add '@notdanger' in your commit log. Messages :book: danger test finished. Generated by :no_entry_sign: http://github.com/danger/danger-js/;>dangerJS ---
[GitHub] incubator-weex pull request #880: [WEEX-124][iOS] bugfix transform crash abo...
Github user asfgit closed the pull request at: https://github.com/apache/incubator-weex/pull/880 ---
incubator-weex git commit: [WEEX-124][iOS] bugfix transform crash about unknow selector
Repository: incubator-weex Updated Branches: refs/heads/master 39f539ab6 -> 728f38bcf [WEEX-124][iOS] bugfix transform crash about unknow selector Bug:124 Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/728f38bc Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/728f38bc Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/728f38bc Branch: refs/heads/master Commit: 728f38bcf61bfa56cc85c47b174bad3041d53d41 Parents: 39f539a Author: acton393Authored: Fri Nov 17 00:09:46 2017 +0800 Committer: acton393 Committed: Fri Nov 17 00:09:46 2017 +0800 -- ios/sdk/WeexSDK/Sources/Component/WXTransform.m | 16 +--- 1 file changed, 9 insertions(+), 7 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/728f38bc/ios/sdk/WeexSDK/Sources/Component/WXTransform.m -- diff --git a/ios/sdk/WeexSDK/Sources/Component/WXTransform.m b/ios/sdk/WeexSDK/Sources/Component/WXTransform.m index f81af72..bc3ce8e 100644 --- a/ios/sdk/WeexSDK/Sources/Component/WXTransform.m +++ b/ios/sdk/WeexSDK/Sources/Component/WXTransform.m @@ -348,14 +348,16 @@ - (void)parseTranslate:(NSArray *)value { [self parseTranslatex:value[0]]; -[self parseTranslatey:value[1]]; +if ([value count] > 1) { +[self parseTranslatey:value[1]]; +} } -- (void)parseTranslatex:(NSArray *)value +- (void)parseTranslatex:(id)value { WXLength *translateX; -double x = [value[0] doubleValue]; -if ([value[0] hasSuffix:@"%"]) { +double x = [value doubleValue]; +if ([value hasSuffix:@"%"]) { translateX = [WXLength lengthWithFloat:x type:WXLengthTypePercent]; } else { x = WXPixelScale(x, self.weexInstance.pixelScaleFactor); @@ -364,11 +366,11 @@ _translateX = translateX; } -- (void)parseTranslatey:(NSArray *)value +- (void)parseTranslatey:(id)value { WXLength *translateY; -double y = [value[0] doubleValue]; -if ([value[0] hasSuffix:@"%"]) { +double y = [value doubleValue]; +if ([value hasSuffix:@"%"]) { translateY = [WXLength lengthWithFloat:y type:WXLengthTypePercent]; } else { y = WXPixelScale(y, self.weexInstance.pixelScaleFactor);
[GitHub] incubator-weex pull request #881: createInstance and initFramework may on di...
GitHub user yuhun-alibaba opened a pull request: https://github.com/apache/incubator-weex/pull/881 createInstance and initFramework may on different Thread, add volati⦠createInstance and initFramework may on different Thread, on order to get right value, use volatile static boolean mInit You can merge this pull request into a Git repository by running: $ git pull https://github.com/yuhun-alibaba/incubator-weex bug_fix_multiThread Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-weex/pull/881.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #881 commit 4607aa4c21de3e1f5ee22fc1be94101d45f12545 Author: yuhun-alibabaDate: 2017-11-16T16:16:02Z createInstance and initFramework may on different Thread, add volatile static for mInit ---
[GitHub] incubator-weex issue #880: [WEEX-124][iOS] bugfix transform crash about unkn...
Github user weex-bot commented on the issue: https://github.com/apache/incubator-weex/pull/880 Messages :book: has no jsfm file changed. :book: jsfm test finished. Generated by :no_entry_sign: http://github.com/danger/danger-js/;>dangerJS ---
[GitHub] incubator-weex pull request #880: [WEEX-124][iOS] bugfix transform crash abo...
GitHub user acton393 opened a pull request: https://github.com/apache/incubator-weex/pull/880 [WEEX-124][iOS] bugfix transform crash about unknow selector bugfix transform crash about unknow selector Bug:124 You can merge this pull request into a Git repository by running: $ git pull https://github.com/acton393/incubator-weex ios-bugfix-transform-crash Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-weex/pull/880.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #880 commit 728f38bcf61bfa56cc85c47b174bad3041d53d41 Author: acton393Date: 2017-11-16T16:09:46Z [WEEX-124][iOS] bugfix transform crash about unknow selector Bug:124 ---
[GitHub] incubator-weex pull request #872: [WEEX-102][iOS]bugfix appear event will fi...
Github user asfgit closed the pull request at: https://github.com/apache/incubator-weex/pull/872 ---
[1/3] incubator-weex git commit: [WEEX-102][iOS]bugfix appear event will fire wrongly while the view has not been loaded
Repository: incubator-weex Updated Branches: refs/heads/master 75d5cd6ba -> 39f539ab6 [WEEX-102][iOS]bugfix appear event will fire wrongly while the view has not been loaded if the view has not been loaded or has not been added to its scroller view, it should not be notified appear event, because it cannot scroll to appear area as the scrollview scroll. Bug:102 Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/f77f9cc3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/f77f9cc3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/f77f9cc3 Branch: refs/heads/master Commit: f77f9cc35adc53c527853f898589fe6418ed4781 Parents: 6617a0d Author: acton393Authored: Thu Nov 16 15:33:17 2017 +0800 Committer: acton393 Committed: Thu Nov 16 15:33:17 2017 +0800 -- .../Sources/Component/WXScrollerComponent.m | 19 ++- 1 file changed, 18 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/f77f9cc3/ios/sdk/WeexSDK/Sources/Component/WXScrollerComponent.m -- diff --git a/ios/sdk/WeexSDK/Sources/Component/WXScrollerComponent.m b/ios/sdk/WeexSDK/Sources/Component/WXScrollerComponent.m index 99ae5b3..9995e89 100644 --- a/ios/sdk/WeexSDK/Sources/Component/WXScrollerComponent.m +++ b/ios/sdk/WeexSDK/Sources/Component/WXScrollerComponent.m @@ -26,6 +26,8 @@ #import "WXUtility.h" #import "WXLoadingComponent.h" #import "WXRefreshComponent.h" +#import "WXConfigCenterProtocol.h" +#import "WXSDKEngine.h" @interface WXScrollerComponnetView:UIScrollView @end @@ -78,6 +80,8 @@ NSString *_direction; BOOL _showScrollBar; BOOL _pagingEnabled; + +BOOL _shouldNotifiAppearDescendantView; css_node_t *_scrollerCSSNode; @@ -142,6 +146,12 @@ WX_EXPORT_METHOD(@selector(resetLoadmore)) self.cssNode->style.flex <= 0.0) { self.cssNode->style.flex = 1.0; } +id configCenter = [WXSDKEngine handlerForProtocol:@protocol(WXConfigCenterProtocol)]; +if ([configCenter respondsToSelector:@selector(configForKey:defaultValue:isDefault:)]) { +BOOL shouldNotifiAppearDescendantView = [[configCenter configForKey:@"iOS_weex_ext_config.shouldNotifiAppearDescendantView" defaultValue:@(YES) isDefault:NULL] boolValue]; +_shouldNotifiAppearDescendantView = shouldNotifiAppearDescendantView; + +} } return self; @@ -604,7 +614,14 @@ WX_EXPORT_METHOD(@selector(resetLoadmore)) // notify action for appear NSArray *listenerArrayCopy = [self.listenerArray copy]; for(WXScrollToTarget *target in listenerArrayCopy){ -[self scrollToTarget:target scrollRect:scrollRect]; +if (_shouldNotifiAppearDescendantView) { +// if target component is descendant of scrollerview, it should notify the appear event handler, or here will skip this appear calculation. +if ([target.target isViewLoaded] && [target.target.view isDescendantOfView:self.view]) { +[self scrollToTarget:target scrollRect:scrollRect]; +} +} else { +[self scrollToTarget:target scrollRect:scrollRect]; +} } }
[2/3] incubator-weex git commit: [WEEX-102][iOS] bug-fix default config center return value
[WEEX-102][iOS] bug-fix default config center return value if config center can not find any config key value , it should return default value but just nil value. Bug: 102 Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/539c71a1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/539c71a1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/539c71a1 Branch: refs/heads/master Commit: 539c71a13fce45dee933b8cc73beb5265ad33727 Parents: f77f9cc Author: acton393Authored: Thu Nov 16 15:37:07 2017 +0800 Committer: acton393 Committed: Thu Nov 16 15:37:07 2017 +0800 -- ios/playground/WeexDemo/WXConfigCenterDefaultImpl.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/539c71a1/ios/playground/WeexDemo/WXConfigCenterDefaultImpl.m -- diff --git a/ios/playground/WeexDemo/WXConfigCenterDefaultImpl.m b/ios/playground/WeexDemo/WXConfigCenterDefaultImpl.m index ffb8f69..d127edb 100644 --- a/ios/playground/WeexDemo/WXConfigCenterDefaultImpl.m +++ b/ios/playground/WeexDemo/WXConfigCenterDefaultImpl.m @@ -39,7 +39,7 @@ if ([keys[0] isEqualToString:@"iOS_weex_prerender_config"] && [keys[1] isEqualToString:@"max_cache_num"]){ return @2; } -return nil; +return defaultValue; } @end
[3/3] incubator-weex git commit: [WEEX-102][iOS]bugfix appear event will fire wrongly while the view has not been loaded
[WEEX-102][iOS]bugfix appear event will fire wrongly while the view has not been loaded Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/39f539ab Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/39f539ab Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/39f539ab Branch: refs/heads/master Commit: 39f539ab6a75ae464e9463868cf4a276bd26f711 Parents: 75d5cd6 539c71a Author: gurisxie <279483...@qq.com> Authored: Thu Nov 16 22:55:05 2017 +0800 Committer: gurisxie <279483...@qq.com> Committed: Thu Nov 16 22:55:21 2017 +0800 -- .../WeexDemo/WXConfigCenterDefaultImpl.m | 2 +- .../Sources/Component/WXScrollerComponent.m | 19 ++- 2 files changed, 19 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/39f539ab/ios/sdk/WeexSDK/Sources/Component/WXScrollerComponent.m --
incubator-weex git commit: * [ios] update pod version
Repository: incubator-weex Updated Branches: refs/heads/master ce7c929d4 -> 75d5cd6ba * [ios] update pod version Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/75d5cd6b Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/75d5cd6b Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/75d5cd6b Branch: refs/heads/master Commit: 75d5cd6ba26faa0e964bc0e3d7ffab2b8c035d63 Parents: ce7c929 Author: gurisxie <279483...@qq.com> Authored: Thu Nov 16 22:53:21 2017 +0800 Committer: gurisxie <279483...@qq.com> Committed: Thu Nov 16 22:53:21 2017 +0800 -- WeexSDK.podspec| 2 +- ios/sdk/WeexSDK/Sources/Utility/WXDefine.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/75d5cd6b/WeexSDK.podspec -- diff --git a/WeexSDK.podspec b/WeexSDK.podspec index 47f2085..73c8a46 100644 --- a/WeexSDK.podspec +++ b/WeexSDK.podspec @@ -3,7 +3,7 @@ Pod::Spec.new do |s| s.name = "WeexSDK" - s.version = "0.16.1" + s.version = "0.17.0" s.summary = "WeexSDK Source ." http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/75d5cd6b/ios/sdk/WeexSDK/Sources/Utility/WXDefine.h -- diff --git a/ios/sdk/WeexSDK/Sources/Utility/WXDefine.h b/ios/sdk/WeexSDK/Sources/Utility/WXDefine.h index 48fe117..64e850b 100644 --- a/ios/sdk/WeexSDK/Sources/Utility/WXDefine.h +++ b/ios/sdk/WeexSDK/Sources/Utility/WXDefine.h @@ -20,7 +20,7 @@ #ifndef __WX_DEFINE_H__ #define __WX_DEFINE_H__ -#define WX_SDK_VERSION @"0.16.1" +#define WX_SDK_VERSION @"0.17.0" #if defined(__cplusplus) #define WX_EXTERN extern "C" __attribute__((visibility("default")))
[GitHub] incubator-weex pull request #871: [WEEX-121][iOS] bug-fix draw text crash
Github user asfgit closed the pull request at: https://github.com/apache/incubator-weex/pull/871 ---
[1/2] incubator-weex git commit: [WEEX-121][iOS] bug-fix draw text crash
Repository: incubator-weex Updated Branches: refs/heads/master af911f780 -> ce7c929d4 [WEEX-121][iOS] bug-fix draw text crash there are case when text update frequently, so when main thread drawing text, here updates come, so the text value must protect here from be setting in multithread, here use lock temporarily. Bug:121 Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/76dd76d0 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/76dd76d0 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/76dd76d0 Branch: refs/heads/master Commit: 76dd76d06e0813b192a4c82ca17617601fe4760c Parents: 6617a0d Author: acton393Authored: Thu Nov 16 12:09:59 2017 +0800 Committer: acton393 Committed: Thu Nov 16 12:09:59 2017 +0800 -- ios/sdk/WeexSDK/Sources/Component/WXTextComponent.m | 10 -- 1 file changed, 8 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/76dd76d0/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 8b292d4..2fbd925 100644 --- a/ios/sdk/WeexSDK/Sources/Component/WXTextComponent.m +++ b/ios/sdk/WeexSDK/Sources/Component/WXTextComponent.m @@ -249,8 +249,8 @@ do {\ - (void)fillAttributes:(NSDictionary *)attributes { id text = attributes[@"value"]; -if (text) { -_text = [WXConvert NSString:text]; +if (text && ![[self text] isEqualToString:text]) { +[self setText:[WXConvert NSString:text]]; [self setNeedsRepaint]; [self setNeedsLayout]; } @@ -361,6 +361,12 @@ do {\ { return _text; } +- (void)setText:(NSString*)text +{ +pthread_mutex_lock(&(_ctAttributedStringMutex)); +_text = text; +pthread_mutex_unlock(&(_ctAttributedStringMutex)); +} - (NSAttributedString *)ctAttributedString {
[2/2] incubator-weex git commit: [WEEX-121][iOS] bug-fix draw text crash
[WEEX-121][iOS] bug-fix draw text crash Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/ce7c929d Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/ce7c929d Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/ce7c929d Branch: refs/heads/master Commit: ce7c929d4682e66c362f5032ade1afc7d8f51de1 Parents: af911f7 76dd76d Author: gurisxie <279483...@qq.com> Authored: Thu Nov 16 22:35:55 2017 +0800 Committer: gurisxie <279483...@qq.com> Committed: Thu Nov 16 22:36:09 2017 +0800 -- ios/sdk/WeexSDK/Sources/Component/WXTextComponent.m | 10 -- 1 file changed, 8 insertions(+), 2 deletions(-) --
[GitHub] incubator-weex pull request #870: [WEEX-122][iOS]bugfix round float pixel le...
Github user asfgit closed the pull request at: https://github.com/apache/incubator-weex/pull/870 ---
[1/2] incubator-weex git commit: [WEEX-122][iOS]bugfix round float pixel lead to the lack of pixel
Repository: incubator-weex Updated Branches: refs/heads/master ade8400f8 -> af911f780 [WEEX-122][iOS]bugfix round float pixel lead to the lack of pixel this action will let iOS decide whether it should draw float pixel. Bug:122 Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/c774c4df Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/c774c4df Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/c774c4df Branch: refs/heads/master Commit: c774c4dff285ca45c7bb865b50b718d4d3536023 Parents: 78f2312 Author: acton393Authored: Wed Nov 15 22:40:48 2017 +0800 Committer: acton393 Committed: Wed Nov 15 22:40:48 2017 +0800 -- ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m | 5 ios/sdk/WeexSDK/Sources/Utility/WXUtility.h | 3 +++ ios/sdk/WeexSDK/Sources/Utility/WXUtility.m | 31 +- 3 files changed, 33 insertions(+), 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/c774c4df/ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m -- diff --git a/ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m b/ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m index 8fc2511..3350f12 100644 --- a/ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m +++ b/ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m @@ -224,6 +224,11 @@ typedef enum : NSUInteger { if ([configCenter respondsToSelector:@selector(configForKey:defaultValue:isDefault:)]) { BOOL useCoreText = [[configCenter configForKey:@"iOS_weex_ext_config.text_render_useCoreText" defaultValue:@YES isDefault:NULL] boolValue]; [WXTextComponent setRenderUsingCoreText:useCoreText]; + +//handler pixel round +BOOL shouldRoudPixel = [[configCenter configForKey:@"iOS_weex_ext_config.utilityShouldRoundPixel" defaultValue:@(NO) isDefault:NULL] boolValue]; +[WXUtility setShouldRoudPixel:shouldRoudPixel]; + id sliderConfig = [configCenter configForKey:@"iOS_weex_ext_config.slider_class_name" defaultValue:@"WXCycleSliderComponent" isDefault:NULL]; if(sliderConfig){ NSString *sliderClassName = [WXConvert NSString:sliderConfig]; http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/c774c4df/ios/sdk/WeexSDK/Sources/Utility/WXUtility.h -- diff --git a/ios/sdk/WeexSDK/Sources/Utility/WXUtility.h b/ios/sdk/WeexSDK/Sources/Utility/WXUtility.h index dfbc303..fac6a9c 100644 --- a/ios/sdk/WeexSDK/Sources/Utility/WXUtility.h +++ b/ios/sdk/WeexSDK/Sources/Utility/WXUtility.h @@ -460,4 +460,7 @@ BOOL WXFloatGreaterThanWithPrecision(CGFloat a,CGFloat b,double precision); */ + (NSData *_Nonnull)base64DictToData:(NSDictionary *_Nullable)base64Dict; + ++ (void)setShouldRoudPixel:(BOOL)shouldRoundPixel; + @end http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/c774c4df/ios/sdk/WeexSDK/Sources/Utility/WXUtility.m -- diff --git a/ios/sdk/WeexSDK/Sources/Utility/WXUtility.m b/ios/sdk/WeexSDK/Sources/Utility/WXUtility.m index 621cf68..f96a68e 100644 --- a/ios/sdk/WeexSDK/Sources/Utility/WXUtility.m +++ b/ios/sdk/WeexSDK/Sources/Utility/WXUtility.m @@ -41,6 +41,8 @@ #define KEY_PASSWORD @"com.taobao.Weex.123456" #define KEY_USERNAME_PASSWORD @"com.taobao.Weex.weex123456" +static BOOL utilityShouldRoundPixel = NO; + void WXPerformBlockOnMainThread(void (^ _Nonnull block)()) { if (!block) return; @@ -117,20 +119,29 @@ CGFloat WXPixelScale(CGFloat value, CGFloat scaleFactor) CGFloat WXRoundPixelValue(CGFloat value) { -CGFloat scale = WXScreenScale(); -return round(value * scale) / scale; +if (utilityShouldRoundPixel) { +CGFloat scale = WXScreenScale(); +return round(value * scale) / scale; +} +return value; } CGFloat WXCeilPixelValue(CGFloat value) { -CGFloat scale = WXScreenScale(); -return ceil(value * scale) / scale; +if (utilityShouldRoundPixel) { +CGFloat scale = WXScreenScale(); +return ceil(value * scale) / scale; +} +return value; } CGFloat WXFloorPixelValue(CGFloat value) { -CGFloat scale = WXScreenScale(); -return floor(value * scale) / scale; +if (utilityShouldRoundPixel) { +CGFloat scale = WXScreenScale(); +return floor(value * scale) / scale; +} +return value; } @implementation WXUtility @@ -154,6 +165,14 @@ CGFloat WXFloorPixelValue(CGFloat value) block(); } ++ (void)setShouldRoudPixel:(BOOL)shouldRoundPixel +{ +utilityShouldRoundPixel = shouldRoundPixel; +} ++ (BOOL)shouldRoudPixel +{ +
[GitHub] incubator-weex pull request #868: [WEEX-120][iOS]try to optimize unload weex...
Github user asfgit closed the pull request at: https://github.com/apache/incubator-weex/pull/868 ---
[GitHub] incubator-weex pull request #869: [WEEX-101][iOS] specify voice-over navigat...
Github user asfgit closed the pull request at: https://github.com/apache/incubator-weex/pull/869 ---
[3/4] incubator-weex git commit: [WEEX-101][iOS] specify voice-over navigation order is column or vertical
[WEEX-101][iOS] specify voice-over navigation order is column or vertical Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/224cdb82 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/224cdb82 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/224cdb82 Branch: refs/heads/master Commit: 224cdb82c63f68990439d64a1c272622e5070bf6 Parents: 05a32d8 7f49963 Author: gurisxie <279483...@qq.com> Authored: Thu Nov 16 22:22:26 2017 +0800 Committer: gurisxie <279483...@qq.com> Committed: Thu Nov 16 22:22:56 2017 +0800 -- .../WeexSDK/Sources/Component/WXComponent_internal.h| 1 + ios/sdk/WeexSDK/Sources/Model/WXComponent.m | 12 2 files changed, 13 insertions(+) --
[1/4] incubator-weex git commit: [WEEX-120][iOS]try to optimize unload weex component
Repository: incubator-weex Updated Branches: refs/heads/master 05a32d881 -> ade8400f8 [WEEX-120][iOS]try to optimize unload weex component try to reduce context switch when unload component. Bug:120 Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/90f535d8 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/90f535d8 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/90f535d8 Branch: refs/heads/master Commit: 90f535d86e1a234383fac202a4cd92d5aba2e9f7 Parents: 4269d24 Author: acton393Authored: Wed Nov 15 17:08:20 2017 +0800 Committer: acton393 Committed: Wed Nov 15 17:08:20 2017 +0800 -- .../Sources/Manager/WXComponentManager.m| 24 1 file changed, 9 insertions(+), 15 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/90f535d8/ios/sdk/WeexSDK/Sources/Manager/WXComponentManager.m -- diff --git a/ios/sdk/WeexSDK/Sources/Manager/WXComponentManager.m b/ios/sdk/WeexSDK/Sources/Manager/WXComponentManager.m index 691f713..4f6c06c 100644 --- a/ios/sdk/WeexSDK/Sources/Manager/WXComponentManager.m +++ b/ios/sdk/WeexSDK/Sources/Manager/WXComponentManager.m @@ -711,25 +711,19 @@ static css_node_t * rootNodeGetChild(void *context, int i) - (void)unload { WXAssertComponentThread(); - -NSEnumerator *enumerator = [_indexDict objectEnumerator]; -WXComponent *component; -while ((component = [enumerator nextObject])) { -dispatch_async(dispatch_get_main_queue(), ^{ +[self invalidate]; +[self _stopDisplayLink]; +NSEnumerator *enumerator = [[_indexDict copy] objectEnumerator]; +dispatch_async(dispatch_get_main_queue(), ^{ +WXComponent *component; +while ((component = [enumerator nextObject])) { [component _unloadViewWithReusing:NO]; -}); -} +} +_rootComponent = nil; +}); [_indexDict removeAllObjects]; [_uiTaskQueue removeAllObjects]; - -dispatch_async(dispatch_get_main_queue(), ^{ - _rootComponent = nil; -}); - -[self _stopDisplayLink]; - -_isValid = NO; } - (void)invalidate
[2/4] incubator-weex git commit: [WEEX-101][iOS] specify voice-over navigation order is column or vertical
[WEEX-101][iOS] specify voice-over navigation order is column or vertical Consider an app that shows items in vertical columns. Normally, voiceOver would navigate through these items in horizontal rows. Setting the value of this property to YES on the parent element of the items in the vertical columns causes VoiceOver to respect the appâs grouping and navigate them.And the default of this property is NO. Bug:101 Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/7f49963f Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/7f49963f Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/7f49963f Branch: refs/heads/master Commit: 7f49963f80b63ce0ee2aff78c76e4bd20611b43f Parents: 78f2312 Author: acton393Authored: Wed Nov 15 20:56:47 2017 +0800 Committer: acton393 Committed: Wed Nov 15 20:56:47 2017 +0800 -- .../WeexSDK/Sources/Component/WXComponent_internal.h| 1 + ios/sdk/WeexSDK/Sources/Model/WXComponent.m | 12 2 files changed, 13 insertions(+) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/7f49963f/ios/sdk/WeexSDK/Sources/Component/WXComponent_internal.h -- diff --git a/ios/sdk/WeexSDK/Sources/Component/WXComponent_internal.h b/ios/sdk/WeexSDK/Sources/Component/WXComponent_internal.h index f1163a9..dc9772b 100644 --- a/ios/sdk/WeexSDK/Sources/Component/WXComponent_internal.h +++ b/ios/sdk/WeexSDK/Sources/Component/WXComponent_internal.h @@ -70,6 +70,7 @@ typedef id (^WXDataBindingBlock)(NSDictionary *data, BOOL *needUpdate); NSString * _ariaHidden; // accessibilityElementsHidden NSString * _accessible; // accessible NSString * _accessibilityHintContent; // hint for the action +NSString * _groupAccessibilityChildren; // voice-over navigation order NSString * _testId;// just for auto-test BOOL _accessibilityMagicTapEvent; http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/7f49963f/ios/sdk/WeexSDK/Sources/Model/WXComponent.m -- diff --git a/ios/sdk/WeexSDK/Sources/Model/WXComponent.m b/ios/sdk/WeexSDK/Sources/Model/WXComponent.m index 7ad52f3..a924176 100644 --- a/ios/sdk/WeexSDK/Sources/Model/WXComponent.m +++ b/ios/sdk/WeexSDK/Sources/Model/WXComponent.m @@ -126,6 +126,9 @@ if(attributes[@"accessibilityHint"]) { _accessibilityHintContent = [WXConvert NSString:attributes[@"accessibilityHint"]]; } +if (attributes[@"groupAccessibilityChildren"]) { +_groupAccessibilityChildren = [WXConvert NSString:attributes[@"groupAccessibilityChildren"]]; +} if (attributes[@"testId"]) { _testId = [WXConvert NSString:attributes[@"testId"]]; @@ -366,6 +369,9 @@ if (_ariaHidden) { [_view setAccessibilityElementsHidden:[WXConvert BOOL:_ariaHidden]]; } +if (_groupAccessibilityChildren) { +[_view setShouldGroupAccessibilityChildren:[WXConvert BOOL:_groupAccessibilityChildren]]; +} [self _initEvents:self.events]; [self _initPseudoEvents:_isListenPseudoTouch]; @@ -736,6 +742,12 @@ [self.view setAccessibilityHint:_accessibilityHintContent]; } +if (attributes[@"groupAccessibilityChildren"]) { +_groupAccessibilityChildren = [WXConvert NSString:attributes[@"groupAccessibilityChildren"]]; +[self.view setShouldGroupAccessibilityChildren:[WXConvert BOOL:_groupAccessibilityChildren]]; +} + + if (attributes[@"testId"]) { [self.view setAccessibilityIdentifier:[WXConvert NSString:attributes[@"testId"]]]; }
[4/4] incubator-weex git commit: [WEEX-120][iOS]try to optimize unload weex component
[WEEX-120][iOS]try to optimize unload weex component Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/ade8400f Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/ade8400f Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/ade8400f Branch: refs/heads/master Commit: ade8400f8028b59f54845882c77528dbd40dba40 Parents: 224cdb8 90f535d Author: gurisxie <279483...@qq.com> Authored: Thu Nov 16 22:23:40 2017 +0800 Committer: gurisxie <279483...@qq.com> Committed: Thu Nov 16 22:24:03 2017 +0800 -- .../Sources/Manager/WXComponentManager.m| 24 1 file changed, 9 insertions(+), 15 deletions(-) --
[2/2] incubator-weex git commit: [WEEX-119][iOS] disable tableview estimation row or section height.
[WEEX-119][iOS] disable tableview estimation row or section height. Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/05a32d88 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/05a32d88 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/05a32d88 Branch: refs/heads/master Commit: 05a32d8811671a2994d7f7734145d8baff43261a Parents: dd8b7e1 ada7945 Author: gurisxie <279483...@qq.com> Authored: Thu Nov 16 22:13:37 2017 +0800 Committer: gurisxie <279483...@qq.com> Committed: Thu Nov 16 22:14:25 2017 +0800 -- ios/sdk/WeexSDK/Sources/Component/WXListComponent.m | 4 1 file changed, 4 insertions(+) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/05a32d88/ios/sdk/WeexSDK/Sources/Component/WXListComponent.m --
[1/2] incubator-weex git commit: [WEEX-119][iOS] disable tableview estimation row or section height.
Repository: incubator-weex Updated Branches: refs/heads/master dd8b7e1a8 -> 05a32d881 [WEEX-119][iOS] disable tableview estimation row or section height. according to https://stackoverflow.com/questions/46445661/ios-11-uitableview-behaviour-changed/46447370#46447370 https://forums.developer.apple.com/message/245686 this estimation action will make tableview edit abnormal, crash sometimes so disable it from iOS 11. Bug: 119 Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/ada7945e Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/ada7945e Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/ada7945e Branch: refs/heads/master Commit: ada7945ec8b4c4e1b3c73ef47a41c1ef08d29c54 Parents: 4269d24 Author: acton393Authored: Wed Nov 15 16:22:01 2017 +0800 Committer: acton393 Committed: Wed Nov 15 16:22:01 2017 +0800 -- ios/sdk/WeexSDK/Sources/Component/WXListComponent.m | 4 1 file changed, 4 insertions(+) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/ada7945e/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 7c4fe68..1e3e5e5 100644 --- a/ios/sdk/WeexSDK/Sources/Component/WXListComponent.m +++ b/ios/sdk/WeexSDK/Sources/Component/WXListComponent.m @@ -155,6 +155,10 @@ _tableView.delegate = self; _tableView.dataSource = self; _tableView.userInteractionEnabled = YES; + +_tableView.estimatedRowHeight = 0; +_tableView.estimatedSectionFooterHeight = 0; +_tableView.estimatedSectionHeaderHeight = 0; } - (void)viewWillUnload
[2/2] incubator-weex git commit: [WEEX-105][iOS] bug-fix about setting nan frame crash
[WEEX-105][iOS] bug-fix about setting nan frame crash Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/dd8b7e1a Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/dd8b7e1a Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/dd8b7e1a Branch: refs/heads/master Commit: dd8b7e1a846915395de8de957a53ebf5a1d5d541 Parents: 9009671 784fd75 Author: gurisxie <279483...@qq.com> Authored: Thu Nov 16 22:10:53 2017 +0800 Committer: gurisxie <279483...@qq.com> Committed: Thu Nov 16 22:10:59 2017 +0800 -- ios/sdk/WeexSDK/Sources/Component/WXListComponent.m | 6 ++ ios/sdk/WeexSDK/Sources/Layout/WXComponent+Layout.m | 8 2 files changed, 10 insertions(+), 4 deletions(-) --
[GitHub] incubator-weex pull request #853: [WEEX-105][iOS] bug-fix about setting nan ...
Github user asfgit closed the pull request at: https://github.com/apache/incubator-weex/pull/853 ---
[1/2] incubator-weex git commit: [WEEX-105][iOS] bug-fix about setting nan frame crash
Repository: incubator-weex Updated Branches: refs/heads/master 900967124 -> dd8b7e1a8 [WEEX-105][iOS] bug-fix about setting nan frame crash try to protect nan crash when set frame containing nan value. Last Exception Backtrace: 0 CoreFoundation 0x0001830301c0 __exceptionPreprocess :124 (in CoreFoundation) 1 libobjc.A.dylib 0x000181a6855c _objc_exception_throw :56 (in libobjc.A.dylib) 2 CoreFoundation 0x000183030108 +[NSException raise:format:] :116 (in CoreFoundation) 3 QuartzCore 0x000186335db8 CA::Layer::set_position(CA::Vec2 const&, bool) :152 (in QuartzCore) 4 QuartzCore 0x000186335f2c -[CALayer setPosition:] :40 (in QuartzCore) 5 QuartzCore 0x0001863364c4 -[CALayer setFrame:] :448 (in QuartzCore) 6 UIKit 0x000188e71e2c -[UIView(Geometry) setFrame:] :784 (in UIKit) 7 Taobao4iPhone 0x000102d6ad4c _43-[WXComponent(Layout) _frameDidCalculated:]_block_invoke WXComponent+Layout.m:136 Last Exception Backtrace 2: 0 CoreFoundation 0x000185b12fe0 __exceptionPreprocess :124 (in CoreFoundation) 1 libobjc.A.dylib 0x000184574538 _objc_exception_throw :56 (in libobjc.A.dylib) 2 CoreFoundation 0x000185b12f28 +[NSException raise:format:] :116 (in CoreFoundation) 3 QuartzCore 0x000188e29798 CA::Layer::set_bounds(CA::Rect const&, bool) :204 (in QuartzCore) 4 QuartzCore 0x000188e299e0 -[CALayer setBounds:] :100 (in QuartzCore) 5 UIKit 0x00018bc908c8 -[UIView(Geometry) setBounds:] :404 (in UIKit) 6 UIKit 0x00018bc9eacc -[UIScrollView setBounds:] :988 (in UIKit) 7 UIKit 0x00018bd271c8 -[UITableView setBounds:] :224 (in UIKit) 8 UIKit 0x00018bc62828 -[UIScrollView setContentOffset:] :400 (in UIKit) 9 UIKit 0x00018bd191dc -[UITableView setContentOffset:] :272 (in UIKit) 10 Taobao4iPhone 0x000102d7b6e8 -[WXTableView setContentOffset:] WXListComponent.m:63 (in Taobao4iPhone) 11 UIKit 0x00018bde6d08 -[UIScrollView _updatePanGesture] :1988 (in UIKit) 12 UIKit 0x00018c2168d0 -[UIGestureRecognizerTarget _sendActionWithGestureRecognizer:] :64 (in UIKit) 13 UIKit 0x00018c21a104 _UIGestureRecognizerSendTargetActions :124 (in UIKit) 14 UIKit 0x00018bdd40b4 _UIGestureRecognizerSendActions :252 (in UIKit) Bug: 105 Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/784fd75d Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/784fd75d Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/784fd75d Branch: refs/heads/master Commit: 784fd75d324c2034a362a79251a87c295eb9fbea Parents: d731f4d Author: acton393Authored: Mon Nov 13 15:08:15 2017 +0800 Committer: acton393 Committed: Mon Nov 13 15:08:15 2017 +0800 -- ios/sdk/WeexSDK/Sources/Component/WXListComponent.m | 6 ++ ios/sdk/WeexSDK/Sources/Layout/WXComponent+Layout.m | 8 2 files changed, 10 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/784fd75d/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 7c4fe68..ddfaf6f 100644 --- a/ios/sdk/WeexSDK/Sources/Component/WXListComponent.m +++ b/ios/sdk/WeexSDK/Sources/Component/WXListComponent.m @@ -58,6 +58,12 @@ if (fabs(contentOffset.y) < 0.5) { contentOffset.y = 0; } +if (isnan(contentOffset.x)) { +contentOffset.x = 0; +} +if(isnan(contentOffset.y)) { +contentOffset.y = 0; +} [super setContentOffset:contentOffset]; } http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/784fd75d/ios/sdk/WeexSDK/Sources/Layout/WXComponent+Layout.m -- diff --git a/ios/sdk/WeexSDK/Sources/Layout/WXComponent+Layout.m b/ios/sdk/WeexSDK/Sources/Layout/WXComponent+Layout.m index adf1652..44aef1c 100644 --- a/ios/sdk/WeexSDK/Sources/Layout/WXComponent+Layout.m +++ b/ios/sdk/WeexSDK/Sources/Layout/WXComponent+Layout.m @@ -166,10 +166,10 @@ _cssNode->layout.should_update = false; _isLayoutDirty = NO; -CGRect
[GitHub] incubator-weex pull request #879: [WEEX-126][iOS] protect for pagename when ...
Github user asfgit closed the pull request at: https://github.com/apache/incubator-weex/pull/879 ---
[GitHub] incubator-weex pull request #878: [WEEX-126][iOS] protect for pagename when ...
Github user gurisxie closed the pull request at: https://github.com/apache/incubator-weex/pull/878 ---
[GitHub] incubator-weex pull request #879: [WEEX-126][iOS] protect for pagename when ...
GitHub user gurisxie opened a pull request: https://github.com/apache/incubator-weex/pull/879 [WEEX-126][iOS] protect for pagename when need send jserror 1. compatible old logic; 2. use instance.pageName as default for front user. First of all, thank you for your contribution! Please makes sure that these checkboxes are checked before submitting your PR, thank you! CheckList: **if** *isBugFix* **:** * [ ] Make sure that you add at least one unit test for the bug which you had fixed. **elif** *isNewFeature* **:** * [ ] Update API docs for the component. * [ ] Update/Add demo to demonstrate new feature. * [ ] Update test scripts for the feature. * [ ] Add unit tests for the feature. You can merge this pull request into a Git repository by running: $ git pull https://github.com/gurisxie/incubator-weex ios-bugfix-projectToPageName2 Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-weex/pull/879.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #879 commit 900967124608822df69a7697b556a46a5496e90b Author: gurisxie <279483...@qq.com> Date: 2017-11-16T13:55:02Z [WEEX-126][iOS] protect for pagename when need send jserror 1. compatible old logic; 2. use instance.pageName as default for front user. ---
[4/6] incubator-weex git commit: * [ios] fix bugs and add examples for scrollstart and scrollend
* [ios] fix bugs and add examples for scrollstart and scrollend Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/3071cb0f Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/3071cb0f Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/3071cb0f Branch: refs/heads/master Commit: 3071cb0f20366d2ed1ad6c39f146f00aa8495740 Parents: 67efb8f Author: doumafangAuthored: Thu Nov 16 18:03:06 2017 +0800 Committer: doumafang Committed: Thu Nov 16 18:03:06 2017 +0800 -- .../Sources/Component/WXScrollerComponent.m | 21 +--- 1 file changed, 14 insertions(+), 7 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/3071cb0f/ios/sdk/WeexSDK/Sources/Component/WXScrollerComponent.m -- diff --git a/ios/sdk/WeexSDK/Sources/Component/WXScrollerComponent.m b/ios/sdk/WeexSDK/Sources/Component/WXScrollerComponent.m index 63acfaa..368234d 100644 --- a/ios/sdk/WeexSDK/Sources/Component/WXScrollerComponent.m +++ b/ios/sdk/WeexSDK/Sources/Component/WXScrollerComponent.m @@ -65,6 +65,7 @@ BOOL _scrollEvent; BOOL _scrollStartEvent; BOOL _scrollEndEvent; +BOOL _isScrolling; CGFloat _loadMoreOffset; CGFloat _previousLoadMoreContentHeight; CGFloat _offsetAccuracy; @@ -544,7 +545,6 @@ WX_EXPORT_METHOD(@selector(resetLoadmore)) @"type":@"pullingdown" }]; _lastContentOffset = scrollView.contentOffset; - // check sticky [self adjustSticky]; [self handleAppear]; @@ -592,16 +592,20 @@ WX_EXPORT_METHOD(@selector(resetLoadmore)) } else { inset.bottom = 0; } - [scrollView setContentInset:inset]; +} + +- (void)scrollViewDidEndDecelerating:(UIScrollView *)scrollView +{ if (_scrollEndEvent) { -CGFloat scaleFactor = self.weexInstance.pixelScaleFactor; -NSDictionary *contentSizeData = @{@"width":[NSNumber numberWithFloat:scrollView.contentSize.width / scaleFactor],@"height":[NSNumber numberWithFloat:scrollView.contentSize.height / scaleFactor]}; -NSDictionary *contentOffsetData = @{@"x":[NSNumber numberWithFloat:-scrollView.contentOffset.x / scaleFactor],@"y":[NSNumber numberWithFloat:-scrollView.contentOffset.y / scaleFactor]}; -[self fireEvent:@"scrollend" params:@{@"contentSize":contentSizeData,@"contentOffset":contentOffsetData} domChanges:nil]; +if (!_isScrolling) { +CGFloat scaleFactor = self.weexInstance.pixelScaleFactor; +NSDictionary *contentSizeData = @{@"width":[NSNumber numberWithFloat:scrollView.contentSize.width / scaleFactor],@"height":[NSNumber numberWithFloat:scrollView.contentSize.height / scaleFactor]}; +NSDictionary *contentOffsetData = @{@"x":[NSNumber numberWithFloat:-scrollView.contentOffset.x / scaleFactor],@"y":[NSNumber numberWithFloat:-scrollView.contentOffset.y / scaleFactor]}; +[self fireEvent:@"scrollend" params:@{@"contentSize":contentSizeData,@"contentOffset":contentOffsetData} domChanges:nil]; +} } } - - (void)scrollViewDidEndDragging:(UIScrollView *)scrollView willDecelerate:(BOOL)decelerate { [_loadingComponent.view setHidden:NO]; @@ -617,6 +621,9 @@ WX_EXPORT_METHOD(@selector(resetLoadmore)) scrollView.contentOffset.y + scrollView.frame.size.height > _loadingComponent.view.frame.origin.y + _loadingComponent.calculatedFrame.size.height) { [_loadingComponent loading]; } +if (!decelerate) { +_isScrolling = NO; +} } - (void)handleAppear
[5/6] incubator-weex git commit: Merge branch 'ios-feature-layoutanimation-0.16dev' of https://github.com/doumafang/incubator-weex into merge-pull-request-master
Merge branch 'ios-feature-layoutanimation-0.16dev' of https://github.com/doumafang/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/32f975e5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/32f975e5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/32f975e5 Branch: refs/heads/master Commit: 32f975e57a657535cda8f8054fe29a4164b0122e Parents: 6617a0d 3071cb0 Author: acton393Authored: Thu Nov 16 21:37:53 2017 +0800 Committer: acton393 Committed: Thu Nov 16 21:37:53 2017 +0800 -- .../Sources/Component/WXScrollerComponent.m | 42 +++- 1 file changed, 40 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/32f975e5/ios/sdk/WeexSDK/Sources/Component/WXScrollerComponent.m --
[1/6] incubator-weex git commit: * [ios] scroller list recycler supported scrollstart and scrollend event
Repository: incubator-weex Updated Branches: refs/heads/master fb6673727 -> 7ee08d5c1 * [ios] scroller list recycler supported scrollstart and scrollend event Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/2891c7e2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/2891c7e2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/2891c7e2 Branch: refs/heads/master Commit: 2891c7e23332e0a1e3b93db7a16e8459e7e8d65c Parents: aaa1bdb Author: doumafangAuthored: Mon Nov 13 16:41:46 2017 +0800 Committer: doumafang Committed: Mon Nov 13 16:41:46 2017 +0800 -- ios/sdk/WeexSDK/Sources/Component/WXScrollerComponent.m | 6 ++ 1 file changed, 6 insertions(+) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/2891c7e2/ios/sdk/WeexSDK/Sources/Component/WXScrollerComponent.m -- diff --git a/ios/sdk/WeexSDK/Sources/Component/WXScrollerComponent.m b/ios/sdk/WeexSDK/Sources/Component/WXScrollerComponent.m index b7a522a..16f5e8e 100644 --- a/ios/sdk/WeexSDK/Sources/Component/WXScrollerComponent.m +++ b/ios/sdk/WeexSDK/Sources/Component/WXScrollerComponent.m @@ -488,6 +488,10 @@ WX_EXPORT_METHOD(@selector(resetLoadmore)) } #pragma mark UIScrollViewDelegate +- (void)scrollViewWillBeginDragging:(UIScrollView *)scrollView +{ +[self fireEvent:@"scrollstart" params:nil domChanges:nil]; +} - (void)scrollViewDidScroll:(UIScrollView *)scrollView { @@ -569,6 +573,8 @@ WX_EXPORT_METHOD(@selector(resetLoadmore)) } [scrollView setContentInset:inset]; +[self fireEvent:@"scrollend" params:nil domChanges:nil]; + } - (void)scrollViewDidEndDragging:(UIScrollView *)scrollView willDecelerate:(BOOL)decelerate
[2/6] incubator-weex git commit: * [ios] fix some parameters with fireEvent of scrollstart and scrollend
* [ios] fix some parameters with fireEvent of scrollstart and scrollend Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/180b9748 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/180b9748 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/180b9748 Branch: refs/heads/master Commit: 180b9748d39b698d44e9a0bd64897f3ef42c18b9 Parents: 2891c7e Author: doumafangAuthored: Mon Nov 13 17:09:16 2017 +0800 Committer: doumafang Committed: Mon Nov 13 17:09:16 2017 +0800 -- .../Sources/Component/WXScrollerComponent.m | 31 ++-- 1 file changed, 28 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/180b9748/ios/sdk/WeexSDK/Sources/Component/WXScrollerComponent.m -- diff --git a/ios/sdk/WeexSDK/Sources/Component/WXScrollerComponent.m b/ios/sdk/WeexSDK/Sources/Component/WXScrollerComponent.m index 16f5e8e..2eb74c9 100644 --- a/ios/sdk/WeexSDK/Sources/Component/WXScrollerComponent.m +++ b/ios/sdk/WeexSDK/Sources/Component/WXScrollerComponent.m @@ -63,6 +63,8 @@ CGSize _contentSize; BOOL _listenLoadMore; BOOL _scrollEvent; +BOOL _scrollStartEvent; +BOOL _scrollEndEvent; CGFloat _loadMoreOffset; CGFloat _previousLoadMoreContentHeight; CGFloat _offsetAccuracy; @@ -116,6 +118,8 @@ WX_EXPORT_METHOD(@selector(resetLoadmore)) _stickyArray = [NSMutableArray array]; _listenerArray = [NSMutableArray array]; _scrollEvent = NO; +_scrollStartEvent = NO; +_scrollEndEvent = NO; _lastScrollEventFiredOffset = CGPointMake(0, 0); _scrollDirection = attributes[@"scrollDirection"] ? [WXConvert WXScrollDirection:attributes[@"scrollDirection"]] : WXScrollDirectionVertical; _showScrollBar = attributes[@"showScrollbar"] ? [WXConvert BOOL:attributes[@"showScrollbar"]] : YES; @@ -260,6 +264,12 @@ WX_EXPORT_METHOD(@selector(resetLoadmore)) if ([eventName isEqualToString:@"scroll"]) { _scrollEvent = YES; } +if ([eventName isEqualToString:@"scrollStart"]) { +_scrollStartEvent = YES; +} +if ([eventName isEqualToString:@"scrollEnd"]) { +_scrollEndEvent = YES; +} } - (void)removeEvent:(NSString *)eventName @@ -270,6 +280,12 @@ WX_EXPORT_METHOD(@selector(resetLoadmore)) if ([eventName isEqualToString:@"scroll"]) { _scrollEvent = NO; } +if ([eventName isEqualToString:@"scrollStart"]) { +_scrollStartEvent = NO; +} +if ([eventName isEqualToString:@"scrollEnd"]) { +_scrollEndEvent = NO; +} } #pragma mark WXScrollerProtocol @@ -490,7 +506,12 @@ WX_EXPORT_METHOD(@selector(resetLoadmore)) #pragma mark UIScrollViewDelegate - (void)scrollViewWillBeginDragging:(UIScrollView *)scrollView { -[self fireEvent:@"scrollstart" params:nil domChanges:nil]; +if (_scrollStartEvent) { +CGFloat scaleFactor = self.weexInstance.pixelScaleFactor; +NSDictionary *contentSizeData = @{@"width":[NSNumber numberWithFloat:scrollView.contentSize.width / scaleFactor],@"height":[NSNumber numberWithFloat:scrollView.contentSize.height / scaleFactor]}; +NSDictionary *contentOffsetData = @{@"x":[NSNumber numberWithFloat:-scrollView.contentOffset.x / scaleFactor],@"y":[NSNumber numberWithFloat:-scrollView.contentOffset.y / scaleFactor]}; +[self fireEvent:@"scrollstart" params:@{@"contentSize":contentSizeData,@"contentOffset":contentOffsetData} domChanges:nil]; +} } - (void)scrollViewDidScroll:(UIScrollView *)scrollView @@ -573,8 +594,12 @@ WX_EXPORT_METHOD(@selector(resetLoadmore)) } [scrollView setContentInset:inset]; -[self fireEvent:@"scrollend" params:nil domChanges:nil]; - +if (_scrollEndEvent) { +CGFloat scaleFactor = self.weexInstance.pixelScaleFactor; +NSDictionary *contentSizeData = @{@"width":[NSNumber numberWithFloat:scrollView.contentSize.width / scaleFactor],@"height":[NSNumber numberWithFloat:scrollView.contentSize.height / scaleFactor]}; +NSDictionary *contentOffsetData = @{@"x":[NSNumber numberWithFloat:-scrollView.contentOffset.x / scaleFactor],@"y":[NSNumber numberWithFloat:-scrollView.contentOffset.y / scaleFactor]}; +[self fireEvent:@"scrollend" params:@{@"contentSize":contentSizeData,@"contentOffset":contentOffsetData} domChanges:nil]; +} } - (void)scrollViewDidEndDragging:(UIScrollView *)scrollView willDecelerate:(BOOL)decelerate
[3/6] incubator-weex git commit: * [ios] fix typos with scrollend and scrollstart
* [ios] fix typos with scrollend and scrollstart Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/67efb8fe Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/67efb8fe Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/67efb8fe Branch: refs/heads/master Commit: 67efb8fe9e7944bda13f4cfe0cbe8036fdbfc66c Parents: 180b974 Author: doumafangAuthored: Tue Nov 14 10:57:56 2017 +0800 Committer: doumafang Committed: Tue Nov 14 10:57:56 2017 +0800 -- ios/sdk/WeexSDK/Sources/Component/WXScrollerComponent.m | 8 1 file changed, 4 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/67efb8fe/ios/sdk/WeexSDK/Sources/Component/WXScrollerComponent.m -- diff --git a/ios/sdk/WeexSDK/Sources/Component/WXScrollerComponent.m b/ios/sdk/WeexSDK/Sources/Component/WXScrollerComponent.m index 2eb74c9..63acfaa 100644 --- a/ios/sdk/WeexSDK/Sources/Component/WXScrollerComponent.m +++ b/ios/sdk/WeexSDK/Sources/Component/WXScrollerComponent.m @@ -264,10 +264,10 @@ WX_EXPORT_METHOD(@selector(resetLoadmore)) if ([eventName isEqualToString:@"scroll"]) { _scrollEvent = YES; } -if ([eventName isEqualToString:@"scrollStart"]) { +if ([eventName isEqualToString:@"scrollstart"]) { _scrollStartEvent = YES; } -if ([eventName isEqualToString:@"scrollEnd"]) { +if ([eventName isEqualToString:@"scrollend"]) { _scrollEndEvent = YES; } } @@ -280,10 +280,10 @@ WX_EXPORT_METHOD(@selector(resetLoadmore)) if ([eventName isEqualToString:@"scroll"]) { _scrollEvent = NO; } -if ([eventName isEqualToString:@"scrollStart"]) { +if ([eventName isEqualToString:@"scrollstart"]) { _scrollStartEvent = NO; } -if ([eventName isEqualToString:@"scrollEnd"]) { +if ([eventName isEqualToString:@"scrollend"]) { _scrollEndEvent = NO; } }
[6/6] incubator-weex git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-weex into merge-pull-request-master
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/7ee08d5c Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/7ee08d5c Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/7ee08d5c Branch: refs/heads/master Commit: 7ee08d5c1f8fda7e36c0355af5312944c77a5d5f Parents: 32f975e fb66737 Author: acton393Authored: Thu Nov 16 21:38:18 2017 +0800 Committer: acton393 Committed: Thu Nov 16 21:38:18 2017 +0800 -- .../taobao/weex/dom/transition/WXTransition.java | 1 + .../com/taobao/weex/ui/component/WXComponent.java | 2 +- .../java/com/taobao/weex/utils/WXViewUtils.java| 17 ++--- 3 files changed, 4 insertions(+), 16 deletions(-) --
[GitHub] incubator-weex pull request #874: [WEEX-124][iOS]Transform's parse problem a...
Github user asfgit closed the pull request at: https://github.com/apache/incubator-weex/pull/874 ---
[3/3] incubator-weex git commit: Merge branch 'iOS-bugfix-transformparse' of https://github.com/doumafang/incubator-weex into merge-pull-request-master
Merge branch 'iOS-bugfix-transformparse' of https://github.com/doumafang/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/06878392 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/06878392 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/06878392 Branch: refs/heads/master Commit: 06878392ee614dfe118e3081f8d6b8fdf7ce6069 Parents: 58fe018 92d85ad Author: acton393Authored: Thu Nov 16 21:47:11 2017 +0800 Committer: acton393 Committed: Thu Nov 16 21:47:11 2017 +0800 -- ios/sdk/WeexSDK/Sources/Component/WXTransform.m | 35 +--- 1 file changed, 15 insertions(+), 20 deletions(-) --
[2/3] incubator-weex git commit: * [ios] fix parse transform with translate(20px, 20px)
* [ios] fix parse transform with translate(20px,20px) Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/92d85ad4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/92d85ad4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/92d85ad4 Branch: refs/heads/master Commit: 92d85ad4f387265bb6df392345c37eb2a3428803 Parents: 66f4e8f Author: doumafangAuthored: Thu Nov 16 20:34:15 2017 +0800 Committer: doumafang Committed: Thu Nov 16 20:34:15 2017 +0800 -- ios/sdk/WeexSDK/Sources/Component/WXTransform.m | 6 ++ 1 file changed, 6 insertions(+) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/92d85ad4/ios/sdk/WeexSDK/Sources/Component/WXTransform.m -- diff --git a/ios/sdk/WeexSDK/Sources/Component/WXTransform.m b/ios/sdk/WeexSDK/Sources/Component/WXTransform.m index 60c3e3f..f81af72 100644 --- a/ios/sdk/WeexSDK/Sources/Component/WXTransform.m +++ b/ios/sdk/WeexSDK/Sources/Component/WXTransform.m @@ -345,6 +345,12 @@ } } +- (void)parseTranslate:(NSArray *)value +{ +[self parseTranslatex:value[0]]; +[self parseTranslatey:value[1]]; +} + - (void)parseTranslatex:(NSArray *)value { WXLength *translateX;
[1/3] incubator-weex git commit: * [ios] fix bugs about transform's parse problem
Repository: incubator-weex Updated Branches: refs/heads/master 58fe01855 -> 06878392e * [ios] fix bugs about transform's parse problem Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/66f4e8fd Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/66f4e8fd Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/66f4e8fd Branch: refs/heads/master Commit: 66f4e8fd27a954c1cfb4a9966415e7de81956bde Parents: 6617a0d Author: doumafangAuthored: Thu Nov 16 17:12:02 2017 +0800 Committer: doumafang Committed: Thu Nov 16 17:12:02 2017 +0800 -- ios/sdk/WeexSDK/Sources/Component/WXTransform.m | 31 +++- 1 file changed, 10 insertions(+), 21 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/66f4e8fd/ios/sdk/WeexSDK/Sources/Component/WXTransform.m -- diff --git a/ios/sdk/WeexSDK/Sources/Component/WXTransform.m b/ios/sdk/WeexSDK/Sources/Component/WXTransform.m index 9e5c362..60c3e3f 100644 --- a/ios/sdk/WeexSDK/Sources/Component/WXTransform.m +++ b/ios/sdk/WeexSDK/Sources/Component/WXTransform.m @@ -312,7 +312,6 @@ } } } - _originX = [WXLength lengthWithFloat:originX type:typeX]; _originY = [WXLength lengthWithFloat:originY type:typeY]; } @@ -346,7 +345,7 @@ } } -- (void)parseTranslate:(NSArray *)value +- (void)parseTranslatex:(NSArray *)value { WXLength *translateX; double x = [value[0] doubleValue]; @@ -356,30 +355,20 @@ x = WXPixelScale(x, self.weexInstance.pixelScaleFactor); translateX = [WXLength lengthWithFloat:x type:WXLengthTypeFixed]; } - -WXLength *translateY; -if (value.count > 1) { -double y = [value[1] doubleValue]; -if ([value[1] hasSuffix:@"%"]) { -translateY = [WXLength lengthWithFloat:y type:WXLengthTypePercent]; -} else { -y = WXPixelScale(y, self.weexInstance.pixelScaleFactor); -translateY = [WXLength lengthWithFloat:y type:WXLengthTypeFixed]; -} -} - _translateX = translateX; -_translateY = translateY; -} - -- (void)parseTranslatex:(NSArray *)value -{ -[self parseTranslate:@[value[0], @"0"]]; } - (void)parseTranslatey:(NSArray *)value { -[self parseTranslate:@[@"0", value[0]]]; +WXLength *translateY; +double y = [value[0] doubleValue]; +if ([value[0] hasSuffix:@"%"]) { +translateY = [WXLength lengthWithFloat:y type:WXLengthTypePercent]; +} else { +y = WXPixelScale(y, self.weexInstance.pixelScaleFactor); +translateY = [WXLength lengthWithFloat:y type:WXLengthTypeFixed]; +} +_translateY = translateY; } - (void)parseScale:(NSArray *)value
[GitHub] incubator-weex pull request #856: [WEEX-109][iOS] add scrollstart and scroll...
Github user asfgit closed the pull request at: https://github.com/apache/incubator-weex/pull/856 ---
[2/2] incubator-weex git commit: Merge branch 'master' of https://github.com/doumafang/incubator-weex into merge-pull-request-master
Merge branch 'master' of https://github.com/doumafang/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/58fe0185 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/58fe0185 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/58fe0185 Branch: refs/heads/master Commit: 58fe018552e949cfc4836aeabd9ef644493052a7 Parents: 7ee08d5 40e5cef Author: acton393Authored: Thu Nov 16 21:41:13 2017 +0800 Committer: acton393 Committed: Thu Nov 16 21:41:13 2017 +0800 -- ios/sdk/WeexSDK/Sources/Module/WXTransition.h | 2 +- ios/sdk/WeexSDK/Sources/Module/WXTransition.m | 106 +++-- 2 files changed, 57 insertions(+), 51 deletions(-) --
[GitHub] incubator-weex pull request #876: [WEEX-125][iOS]Transition Animation Suppor...
Github user asfgit closed the pull request at: https://github.com/apache/incubator-weex/pull/876 ---
[1/2] incubator-weex git commit: * [ios] improve transition's stability
Repository: incubator-weex Updated Branches: refs/heads/master 7ee08d5c1 -> 58fe01855 * [ios] improve transition's stability Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/40e5cef5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/40e5cef5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/40e5cef5 Branch: refs/heads/master Commit: 40e5cef58cd4dbad1cb1a7a6c2580bbbec7dbc6b Parents: 67ba6da Author: doumafangAuthored: Thu Nov 16 17:28:47 2017 +0800 Committer: doumafang Committed: Thu Nov 16 17:28:47 2017 +0800 -- ios/sdk/WeexSDK/Sources/Module/WXTransition.h | 2 +- ios/sdk/WeexSDK/Sources/Module/WXTransition.m | 106 +++-- 2 files changed, 57 insertions(+), 51 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/40e5cef5/ios/sdk/WeexSDK/Sources/Module/WXTransition.h -- diff --git a/ios/sdk/WeexSDK/Sources/Module/WXTransition.h b/ios/sdk/WeexSDK/Sources/Module/WXTransition.h index bb33067..b822718 100644 --- a/ios/sdk/WeexSDK/Sources/Module/WXTransition.h +++ b/ios/sdk/WeexSDK/Sources/Module/WXTransition.h @@ -38,7 +38,7 @@ typedef NS_OPTIONS(NSUInteger, WXTransitionOptions) { }; -@interface WXLayoutAnimationInfo : NSObject +@interface WXTransitionInfo : NSObject @property (nonatomic, strong) id fromValue; @property (nonatomic, strong) id toValue; @property (nonatomic, strong) id perValue; http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/40e5cef5/ios/sdk/WeexSDK/Sources/Module/WXTransition.m -- diff --git a/ios/sdk/WeexSDK/Sources/Module/WXTransition.m b/ios/sdk/WeexSDK/Sources/Module/WXTransition.m index 2994c1a..9cae7e5 100644 --- a/ios/sdk/WeexSDK/Sources/Module/WXTransition.m +++ b/ios/sdk/WeexSDK/Sources/Module/WXTransition.m @@ -31,7 +31,7 @@ #import "WXSDKInstance_private.h" #import "WXLength.h" -@implementation WXLayoutAnimationInfo +@implementation WXTransitionInfo @end @@ -64,20 +64,20 @@ @implementation WXTransition -- (instancetype) initWithStyles:(NSDictionary *)styles +- (instancetype)initWithStyles:(NSDictionary *)styles { if (self = [super init]) { NSString *property = styles[kWXTransitionProperty]; if (property) { -self.transitionOptions |= [property containsString:@"width"]? WXTransitionOptionsWidth:0; -self.transitionOptions |= [property containsString:@"height"]? WXTransitionOptionsHeight:0; -self.transitionOptions |= [property containsString:@"right"]? WXTransitionOptionsRight:0; -self.transitionOptions |= [property containsString:@"left"]? WXTransitionOptionsLeft:0; -self.transitionOptions |= [property containsString:@"bottom"]? WXTransitionOptionsBottom:0; -self.transitionOptions |= [property containsString:@"top"]? WXTransitionOptionsTop:0; -self.transitionOptions |= [property containsString:@"backgroundColor"]? WXTransitionOptionsBackgroundColor:0; -self.transitionOptions |= [property containsString:@"transform"]? WXTransitionOptionsTransform:0; -self.transitionOptions |= [property containsString:@"opacity"]? WXTransitionOptionsOpacity:0; +_transitionOptions |= [property containsString:@"width"]? WXTransitionOptionsWidth:0; +_transitionOptions |= [property containsString:@"height"]? WXTransitionOptionsHeight:0; +_transitionOptions |= [property containsString:@"right"]? WXTransitionOptionsRight:0; +_transitionOptions |= [property containsString:@"left"]? WXTransitionOptionsLeft:0; +_transitionOptions |= [property containsString:@"bottom"]? WXTransitionOptionsBottom:0; +_transitionOptions |= [property containsString:@"top"]? WXTransitionOptionsTop:0; +_transitionOptions |= [property containsString:@"backgroundColor"]? WXTransitionOptionsBackgroundColor:0; +_transitionOptions |= [property containsString:@"transform"]? WXTransitionOptionsTransform:0; +_transitionOptions |= [property containsString:@"opacity"]? WXTransitionOptionsOpacity:0; } else { @@ -110,7 +110,6 @@ _toStyles = [NSMutableDictionary dictionaryWithDictionary:_fromStyles]; [_toStyles addEntriesFromDictionary:_addStyles]; - _layoutAnimationDuration = _fromStyles[kWXTransitionDuration] ? [WXConvert CGFloat:_fromStyles[kWXTransitionDuration]] : 0; _layoutAnimationDelay = _fromStyles[kWXTransitionDelay] ? [WXConvert CGFloat:_fromStyles[kWXTransitionDelay]] : 0; _layoutAnimationTimingFunction =
[GitHub] incubator-weex pull request #873: [WEEX-107] [android] layer type none has s...
Github user gubaojian closed the pull request at: https://github.com/apache/incubator-weex/pull/873 ---
[GitHub] incubator-weex issue #878: [WEEX-126][iOS] protect for pagename when need se...
Github user weex-bot commented on the issue: https://github.com/apache/incubator-weex/pull/878 Warnings :warning: No Changelog changes! :warning: This PR should update related documents as well. Messages :book: danger test finished. Generated by :no_entry_sign: http://github.com/danger/danger-js/;>dangerJS ---
[GitHub] incubator-weex pull request #878: [WEEX-126][iOS] protect for pagename when ...
GitHub user gurisxie opened a pull request: https://github.com/apache/incubator-weex/pull/878 [WEEX-126][iOS] protect for pagename when need send jserror â¦pageName insteadï¼ 1. compatible old logic; 2. use instance.pageName as default for front user. First of all, thank you for your contribution! Please makes sure that these checkboxes are checked before submitting your PR, thank you! CheckList: **if** *isBugFix* **:** * [ ] Make sure that you add at least one unit test for the bug which you had fixed. **elif** *isNewFeature* **:** * [ ] Update API docs for the component. * [ ] Update/Add demo to demonstrate new feature. * [ ] Update test scripts for the feature. * [ ] Add unit tests for the feature. You can merge this pull request into a Git repository by running: $ git pull https://github.com/gurisxie/incubator-weex ios-bugfix-protectToPageName1 Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-weex/pull/878.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #878 commit cd38f3bb34d007218ae24629b833418dfc41903e Author: gurisxie <279483...@qq.com> Date: 2017-11-16T10:34:04Z [WEEX-126][iOS] scripturl will have no value in some way,we need use pageName insteadï¼ 1. compatible old logic; 2. use instance.pageName as default for front user. ---
[2/2] incubator-weex git commit: * [android] revert clip path targetview judge.
* [android] revert clip path targetview judge. Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/fb667372 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/fb667372 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/fb667372 Branch: refs/heads/master Commit: fb6673727774421e38aef9f2138b47a5583f Parents: 6561069 d1af84c Author: gurisxie <279483...@qq.com> Authored: Thu Nov 16 18:11:52 2017 +0800 Committer: gurisxie <279483...@qq.com> Committed: Thu Nov 16 18:12:29 2017 +0800 -- .../java/com/taobao/weex/utils/WXViewUtils.java| 17 ++--- 1 file changed, 2 insertions(+), 15 deletions(-) --
[GitHub] incubator-weex pull request #877: revert clip path targetview judge.
Github user asfgit closed the pull request at: https://github.com/apache/incubator-weex/pull/877 ---
[GitHub] incubator-weex issue #877: revert clip path targetview judge.
Github user weex-bot commented on the issue: https://github.com/apache/incubator-weex/pull/877 Warnings :warning: No Changelog changes! :warning: This PR should update related documents as well. Messages :book: danger test finished. Generated by :no_entry_sign: http://github.com/danger/danger-js/;>dangerJS ---
[GitHub] incubator-weex pull request #877: revert clip path targetview judge.
GitHub user wispy316 opened a pull request: https://github.com/apache/incubator-weex/pull/877 revert clip path targetview judge. revert to only judge on android version. keep the param of targetView for future try. You can merge this pull request into a Git repository by running: $ git pull https://github.com/wispy316/incubator-weex feature-clip-fix Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-weex/pull/877.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #877 commit d1af84c41402c5671aaa03644afcc33689f765c4 Author: è¡ä¹Date: 2017-11-16T09:44:19Z revert clip path targetview judge. ---
[GitHub] incubator-weex issue #876: [WEEX-125][iOS]Transition Animation Support
Github user weex-bot commented on the issue: https://github.com/apache/incubator-weex/pull/876 Warnings :warning: No Changelog changes! :warning: This PR should update related documents as well. Messages :book: danger test finished. Generated by :no_entry_sign: http://github.com/danger/danger-js/;>dangerJS ---
[GitHub] incubator-weex pull request #876: [WEEX-125][iOS]Transition Animation Suppor...
GitHub user doumafang opened a pull request: https://github.com/apache/incubator-weex/pull/876 [WEEX-125][iOS]Transition Animation Support Improve transition's stability and fix some bugs about various transform. Also, make some variable names become nice. You can merge this pull request into a Git repository by running: $ git pull https://github.com/doumafang/incubator-weex master Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-weex/pull/876.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #876 commit 40e5cef58cd4dbad1cb1a7a6c2580bbbec7dbc6b Author: doumafangDate: 2017-11-16T09:28:47Z * [ios] improve transition's stability ---
[GitHub] incubator-weex pull request #875: * [android] avoid crash on some device cau...
Github user asfgit closed the pull request at: https://github.com/apache/incubator-weex/pull/875 ---
[2/2] incubator-weex git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-weex into apache-master
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-weex into apache-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/6561069f Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/6561069f Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/6561069f Branch: refs/heads/master Commit: 6561069f7fb7a1861863c52f9da88934ce6fbd76 Parents: 1f7a309 67ba6da Author: misakuoAuthored: Thu Nov 16 17:32:02 2017 +0800 Committer: misakuo Committed: Thu Nov 16 17:32:02 2017 +0800 -- .../src/main/java/com/taobao/weex/dom/transition/WXTransition.java | 1 + 1 file changed, 1 insertion(+) --
[1/2] incubator-weex git commit: * [android] avoid crash on some device caused by RippleDrawable
Repository: incubator-weex Updated Branches: refs/heads/master 67ba6dacf -> 6561069f7 * [android] avoid crash on some device caused by RippleDrawable Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/1f7a3099 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/1f7a3099 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/1f7a3099 Branch: refs/heads/master Commit: 1f7a30991462fb86db25dbdeca14c76c006c07bf Parents: 6617a0d Author: misakuoAuthored: Thu Nov 16 17:25:32 2017 +0800 Committer: misakuo Committed: Thu Nov 16 17:25:32 2017 +0800 -- .../src/main/java/com/taobao/weex/ui/component/WXComponent.java| 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/1f7a3099/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java -- diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java index 825bc7f..9dc2091 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java +++ b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java @@ -1349,7 +1349,7 @@ public abstract class WXComponent implements IWXObject, IWXActi } } - private RippleDrawable prepareBackgroundRipple() { + private Drawable prepareBackgroundRipple() { try { if (getDomObject().getStyles() != null && getDomObject().getStyles().getPesudoResetStyles() != null) { Map resetStyles = getDomObject().getStyles().getPesudoResetStyles();
[GitHub] incubator-weex issue #875: * [android] avoid crash on some device caused by ...
Github user weex-bot commented on the issue: https://github.com/apache/incubator-weex/pull/875 Warnings :warning: No Changelog changes! :warning: This PR should update related documents as well. Messages :book: danger test finished. Generated by :no_entry_sign: http://github.com/danger/danger-js/;>dangerJS ---
[GitHub] incubator-weex pull request #875: * [android] avoid crash on some device cau...
GitHub user misakuo opened a pull request: https://github.com/apache/incubator-weex/pull/875 * [android] avoid crash on some device caused by RippleDrawable replace RippleDrawable to Drawable You can merge this pull request into a Git repository by running: $ git pull https://github.com/misakuo/incubator-weex android-bugfix-avorid-ripple-crash Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-weex/pull/875.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #875 commit 1f7a30991462fb86db25dbdeca14c76c006c07bf Author: misakuoDate: 2017-11-16T09:25:32Z * [android] avoid crash on some device caused by RippleDrawable ---
[1/2] incubator-weex git commit: [WEEX-107] [android] layer type none has some bug on some platform. force layer type soft for render text right
Repository: incubator-weex Updated Branches: refs/heads/master 6617a0dda -> 67ba6dacf [WEEX-107] [android] layer type none has some bug on some platform. force layer type soft for render text right Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/8f4b7bf9 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/8f4b7bf9 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/8f4b7bf9 Branch: refs/heads/master Commit: 8f4b7bf9d2eb46115bcd9bcfb3efb9cb318229ce Parents: 3c3536a Author: jianbai.gbjAuthored: Thu Nov 16 15:44:50 2017 +0800 Committer: jianbai.gbj Committed: Thu Nov 16 15:44:50 2017 +0800 -- .../src/main/java/com/taobao/weex/dom/transition/WXTransition.java | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/8f4b7bf9/android/sdk/src/main/java/com/taobao/weex/dom/transition/WXTransition.java -- diff --git a/android/sdk/src/main/java/com/taobao/weex/dom/transition/WXTransition.java b/android/sdk/src/main/java/com/taobao/weex/dom/transition/WXTransition.java index fc477bb..535ef74 100644 --- a/android/sdk/src/main/java/com/taobao/weex/dom/transition/WXTransition.java +++ b/android/sdk/src/main/java/com/taobao/weex/dom/transition/WXTransition.java @@ -315,6 +315,7 @@ public class WXTransition { switch (property){ case Constants.Name.OPACITY:{ holders.add(PropertyValuesHolder.ofFloat(View.ALPHA, taregtView.getAlpha(), WXUtils.getFloat(value, 1.0f))); +taregtView.setLayerType(View.LAYER_TYPE_SOFTWARE, null); //hardware or none has bug on some platform } break; case Constants.Name.BACKGROUND_COLOR:{
[2/2] incubator-weex git commit: [WEEX-107] [android] layer type none has some bug on some platform.
[WEEX-107] [android] layer type none has some bug on some platform. Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/67ba6dac Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/67ba6dac Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/67ba6dac Branch: refs/heads/master Commit: 67ba6dacf9c4b9e4fb658e11e8d9065da5b31070 Parents: 8f4b7bf 6617a0d Author: jianbai.gbjAuthored: Thu Nov 16 17:06:44 2017 +0800 Committer: gurisxie <279483...@qq.com> Committed: Thu Nov 16 17:16:30 2017 +0800 -- android/playground/app/build.gradle | 1 - android/playground/app/proguard-rules.pro | 3 +- .../playground/app/src/main/AndroidManifest.xml | 23 - .../java/com/alibaba/weex/WXApplication.java| 2 - .../java/com/alibaba/weex/WXDebugActivity.java | 109 .../alibaba/weex/extend/PlayDebugAdapter.java | 154 -- .../zxing/client/android/CaptureActivity.java | 30 +- .../src/main/res/layout/activity_dynamic.xml| 45 -- .../app/src/main/res/layout/content_dynamic.xml | 42 -- .../main/java/com/taobao/weex/InitConfig.java | 13 - .../java/com/taobao/weex/WXEnvironment.java | 2 - .../main/java/com/taobao/weex/WXSDKEngine.java | 37 +- .../java/com/taobao/weex/WXSDKInstance.java | 23 +- .../main/java/com/taobao/weex/WXSDKManager.java | 7 - .../taobao/weex/adapter/IWXDebugAdapter.java| 41 -- .../weex/appfram/pickers/DatePickerImpl.java| 33 +- .../weex/appfram/pickers/WXPickersModule.java | 7 +- .../com/taobao/weex/bridge/WXBridgeManager.java | 4 +- .../java/com/taobao/weex/common/Constants.java | 6 + .../com/taobao/weex/common/WXPerformance.java | 32 +- .../com/taobao/weex/dom/WXTextDomObject.java| 17 +- .../taobao/weex/ui/component/WXComponent.java | 92 +++- .../taobao/weex/ui/component/WXScroller.java| 43 +- .../component/helper/ScrollStartEndHelper.java | 116 + .../ui/component/helper/WXTimeInputHelper.java | 6 +- .../ui/component/list/BasicListComponent.java | 35 +- .../weex/ui/component/list/WXListComponent.java | 10 +- .../list/template/WXRecyclerTemplateList.java | 44 +- .../pesudo/OnActivePseudoListener.java | 26 + .../component/pesudo/OnActivePseudoListner.java | 26 - .../pesudo/TouchActivePseudoListener.java | 12 +- .../taobao/weex/ui/module/WXLocalModule.java| 93 .../ui/view/refresh/core/WXSwipeLayout.java | 214 ++-- .../taobao/weex/utils/StaticLayoutProxy.java| 72 +++ .../java/com/taobao/weex/utils/WXLogUtils.java | 91 ++-- android/settings.gradle | 1 - android/weex_debug/.gitignore | 2 - android/weex_debug/NOTICE | 7 - android/weex_debug/build.gradle | 39 -- android/weex_debug/libs/classes.jar | Bin 112153 -> 0 bytes android/weex_debug/proguard-rules.pro | 17 - .../java/com/taobao/weex/ApplicationTest.java | 32 -- android/weex_debug/src/main/AndroidManifest.xml | 52 -- .../main/java/com/taobao/weex/WXDebugTool.java | 70 --- .../java/com/taobao/weex/WXPFComponent.java | 82 --- .../main/java/com/taobao/weex/WXPrettyFish.java | 50 -- .../taobao/weex/adapter/DefautDebugAdapter.java | 127 - .../taobao/weex/bridge/WXWebsocketBridge.java | 295 --- .../taobao/weex/scalpel/ScalpelFrameLayout.java | 519 --- .../weex/websocket/WXWebSocketManager.java | 226 .../main/res/drawable-xhdpi/ic_action_3d.png| Bin 3429 -> 0 bytes .../main/res/drawable-xhdpi/ic_action_weex.png | Bin 7284 -> 0 bytes .../res/drawable-xhdpi/prettyfish_boundary.png | Bin 5731 -> 0 bytes .../res/drawable-xhdpi/prettyfish_coord.png | Bin 6396 -> 0 bytes .../main/res/drawable-xhdpi/prettyfish_cpu.png | Bin 7505 -> 0 bytes .../main/res/drawable-xhdpi/prettyfish_fps.png | Bin 21422 -> 0 bytes .../main/res/drawable-xhdpi/prettyfish_grid.png | Bin 5494 -> 0 bytes .../res/drawable-xhdpi/prettyfish_icon_back.png | Bin 732 -> 0 bytes .../drawable-xhdpi/prettyfish_icon_close.png| Bin 347 -> 0 bytes .../prettyfish_icon_deletefile.png | Bin 247 -> 0 bytes .../res/drawable-xhdpi/prettyfish_icon_fab.png | Bin 1667 -> 0 bytes .../res/drawable-xhdpi/prettyfish_icon_perf.png | Bin 6152 -> 0 bytes .../res/drawable-xhdpi/prettyfish_icon_sp.png | Bin 9689 -> 0 bytes .../drawable-xhdpi/prettyfish_icon_tools.png| Bin 6874 -> 0 bytes .../res/drawable-xhdpi/prettyfish_icon_ued.png | Bin 7029 -> 0 bytes .../res/drawable-xhdpi/prettyfish_memory.png| Bin 5910 -> 0 bytes .../res/drawable-xhdpi/prettyfish_traffic.png | Bin 6083 -> 0 bytes .../drawable/leak_canary_toast_background.xml | 23 - .../res/drawable/prettyfish_bg_floatmenu.xml| 23 -
[GitHub] incubator-weex issue #874: [WEEX-124][iOS]Transform's parse problem about tr...
Github user weex-bot commented on the issue: https://github.com/apache/incubator-weex/pull/874 Warnings :warning: No Changelog changes! :warning: This PR should update related documents as well. Messages :book: danger test finished. Generated by :no_entry_sign: http://github.com/danger/danger-js/;>dangerJS ---
[GitHub] incubator-weex pull request #874: [WEEX-124] [iOS]Transform's parse problem ...
GitHub user doumafang opened a pull request: https://github.com/apache/incubator-weex/pull/874 [WEEX-124] [iOS]Transform's parse problem about translate We found that in AnimationModule's transform do not support examples such as ' translateX(10px) translateY(20px)',and we fix this bug in 0.17.0. You can merge this pull request into a Git repository by running: $ git pull https://github.com/doumafang/incubator-weex iOS-bugfix-transformparse Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-weex/pull/874.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #874 commit 66f4e8fd27a954c1cfb4a9966415e7de81956bde Author: doumafangDate: 2017-11-16T09:12:02Z * [ios] fix bugs about transform's parse problem ---
[GitHub] incubator-weex pull request #873: [WEEX-107] [android] layer type none has s...
Github user gubaojian closed the pull request at: https://github.com/apache/incubator-weex/pull/873 ---